|
 |
25845f |
Fix -Wundef warnings. This was addressed upstream as part of this
|
|
|
25845f |
commit:
|
|
|
25845f |
|
|
|
25845f |
commit c7aec4beb13f125948884d80158f11c34239c61f
|
|
|
25845f |
Author: Will Newton <will.newton@linaro.org>
|
|
|
25845f |
Date: Tue Jun 24 14:19:36 2014 +0100
|
|
|
25845f |
|
|
|
25845f |
sysdeps/posix/tempname.c: Merge from gnulib
|
|
|
25845f |
|
|
|
25845f |
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
|
|
|
25845f |
index 2f0bfef34fa31c28..05c88bc95e72756e 100644
|
|
|
25845f |
--- a/sysdeps/posix/tempname.c
|
|
|
25845f |
+++ b/sysdeps/posix/tempname.c
|
|
|
25845f |
@@ -40,30 +40,30 @@
|
|
|
25845f |
# define __GT_NOCREATE 2
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
-#if STDC_HEADERS || _LIBC
|
|
|
25845f |
+#if _LIBC || STDC_HEADERS
|
|
|
25845f |
# include <stddef.h>
|
|
|
25845f |
# include <stdlib.h>
|
|
|
25845f |
# include <string.h>
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
-#if HAVE_FCNTL_H || _LIBC
|
|
|
25845f |
+#if _LIBC || HAVE_FCNTL_H
|
|
|
25845f |
# include <fcntl.h>
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
-#if HAVE_SYS_TIME_H || _LIBC
|
|
|
25845f |
+#if _LIBC || HAVE_SYS_TIME_H
|
|
|
25845f |
# include <sys/time.h>
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
-#if HAVE_STDINT_H || _LIBC
|
|
|
25845f |
+#if _LIBC || HAVE_STDINT_H
|
|
|
25845f |
# include <stdint.h>
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
-#if HAVE_UNISTD_H || _LIBC
|
|
|
25845f |
+#if _LIBC || HAVE_UNISTD_H
|
|
|
25845f |
# include <unistd.h>
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
#include <sys/stat.h>
|
|
|
25845f |
-#if STAT_MACROS_BROKEN
|
|
|
25845f |
+#if !_LIBC && STAT_MACROS_BROKEN
|
|
|
25845f |
# undef S_ISDIR
|
|
|
25845f |
#endif
|
|
|
25845f |
#if !defined S_ISDIR && defined S_IFDIR
|
|
|
25845f |
@@ -101,7 +101,7 @@
|
|
|
25845f |
# define __xstat64(version, path, buf) stat (path, buf)
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
-#if ! (HAVE_SECURE_GETENV || _LIBC)
|
|
|
25845f |
+#if ! (_LIBC || HAVE_SECURE_GETENV)
|
|
|
25845f |
# ifdef HAVE___SECURE_GETENV
|
|
|
25845f |
# define __libc_secure_getenv __secure_getenv
|
|
|
25845f |
# else
|
|
|
25845f |
@@ -267,7 +267,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
|
|
|
25845f |
#ifdef RANDOM_BITS
|
|
|
25845f |
RANDOM_BITS (random_time_bits);
|
|
|
25845f |
#else
|
|
|
25845f |
-# if HAVE_GETTIMEOFDAY || _LIBC
|
|
|
25845f |
+# if _LIBC || HAVE_GETTIMEOFDAY
|
|
|
25845f |
{
|
|
|
25845f |
struct timeval tv;
|
|
|
25845f |
__gettimeofday (&tv, NULL);
|