diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/filemode.h | 2 | ||||
| -rw-r--r-- | lib/signal.in.h | 12 | ||||
| -rw-r--r-- | lib/stat.c | 1 | ||||
| -rw-r--r-- | lib/stdint.in.h | 2 | ||||
| -rw-r--r-- | lib/stdlib.in.h | 4 | ||||
| -rw-r--r-- | lib/unistd.in.h | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/lib/filemode.h b/lib/filemode.h index 9ebef47806d..3ca19b85623 100644 --- a/lib/filemode.h +++ b/lib/filemode.h @@ -23,7 +23,7 @@ /* Get the declaration of strmode. */ # if HAVE_DECL_STRMODE -# include <string.h> /* MacOS X, FreeBSD, OpenBSD */ +# include <string.h> /* Mac OS X, FreeBSD, OpenBSD */ # include <unistd.h> /* NetBSD */ # endif diff --git a/lib/signal.in.h b/lib/signal.in.h index e0f0554bdbd..8fb1ad119ad 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -55,7 +55,7 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* MacOS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare +/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare pthread_sigmask in <pthread.h>, not in <signal.h>. But avoid namespace pollution on glibc systems.*/ #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ @@ -197,7 +197,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; /* Test whether a given signal is contained in a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigismember # endif @@ -210,7 +210,7 @@ _GL_CXXALIASWARN (sigismember); /* Initialize a signal set to the empty set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigemptyset # endif @@ -222,7 +222,7 @@ _GL_CXXALIASWARN (sigemptyset); /* Add a signal to a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigaddset # endif @@ -235,7 +235,7 @@ _GL_CXXALIASWARN (sigaddset); /* Remove a signal from a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigdelset # endif @@ -248,7 +248,7 @@ _GL_CXXALIASWARN (sigdelset); /* Fill a signal set with all possible signals. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on MacOS X. */ +/* This function is defined as a macro on Mac OS X. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigfillset # endif diff --git a/lib/stat.c b/lib/stat.c index 1fc633eeef0..75995408906 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -29,6 +29,7 @@ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if _GL_WINDOWS_64_BIT_ST_SIZE +# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ # define stat _stati64 # define REPLACE_FUNC_STAT_DIR 1 # undef REPLACE_FUNC_STAT_FILE diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 59c00d59c03..e2a0eb19ac0 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -83,7 +83,7 @@ /* <sys/types.h> defines some of the stdint.h types as well, on glibc, IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>). AIX 5.2 <sys/types.h> isn't needed and causes troubles. - MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but + Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but relies on the system <stdint.h> definitions, so include <sys/types.h> after @NEXT_STDINT_H@. */ #if @HAVE_SYS_TYPES_H@ && ! defined _AIX diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index b546133c3af..1d67ec64c66 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -87,8 +87,8 @@ struct random_data #endif #if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) -/* On MacOS X 10.3, only <unistd.h> declares mkstemp. */ -/* On MacOS X 10.5, only <unistd.h> declares mkstemps. */ +/* On Mac OS X 10.3, only <unistd.h> declares mkstemp. */ +/* On Mac OS X 10.5, only <unistd.h> declares mkstemps. */ /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */ /* But avoid namespace pollution on glibc systems and native Windows. */ # include <unistd.h> diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 9115486cf37..e904e512ee8 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1318,7 +1318,7 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - " _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len) _GL_ARG_NONNULL ((1))); # endif -/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5 +/* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5 and FreeBSD 6.4 the second parameter is int. On Solaris 11 2011-10, the first parameter is not const. */ _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len)); |