From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 10 Mar 2018 23:02:05 +0000 (-0500)
Subject: fix minor namespace issue in unistd.h
X-Git-Tag: v1.1.20~137
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3f7bcdeaa4cbf8258824b6be4f231ca54a7fdfc;p=oweals%2Fmusl.git

fix minor namespace issue in unistd.h

the F_* macros associated with the lockf function are XSI-shaded (like
the lockf function itself) and should only be exposed when the
function is.
---

diff --git a/include/unistd.h b/include/unistd.h
index c17eace9..9485da7a 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -128,12 +128,11 @@ long fpathconf(int, int);
 long sysconf(int);
 size_t confstr(int, char *, size_t);
 
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #define F_ULOCK 0
 #define F_LOCK  1
 #define F_TLOCK 2
 #define F_TEST  3
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 int setreuid(uid_t, uid_t);
 int setregid(gid_t, gid_t);
 int lockf(int, int, off_t);