summaryrefslogtreecommitdiff
path: root/lib/filemode.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-06-22 10:20:00 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-06-22 10:20:00 -0700
commit057306483c1c7a9216276c51946406c422d60b70 (patch)
treef1bf01008eeaf5b20ed7311e64a3fdec783c9bcf /lib/filemode.h
parentb57b344b51c06239b4f3584f9ab946dd48c60bb2 (diff)
Merge from gnulib.
* lib/filemode.h, lib/signal.in.h, lib/stat.c, lib/stdint.in.h: * lib/stdlib.in.h, lib/unistd.in.h, m4/extensions.m4, m4/getloadavg.m4: * m4/getopt.m4, m4/gnulib-common.m4, m4/largefile.m4, m4/mktime.m4: * m4/multiarch.m4, m4/nocrash.m4, m4/stdio_h.m4, m4/time_r.m4: Copy new versions from gnulib, incorporating the following changes: 2012-06-22 time_r: fix typo that always overrode localtime_r decl 2012-06-22 Write "Mac OS X" instead of "MacOS X". 2012-06-21 mktime: fix integer overflow in 'configure'-time test 2012-06-21 nonblocking: Avoid compilation error on mingw64. 2012-06-19 stat, fstat: Avoid warnings on mingw64. 2012-06-19 getopt-gnu: Fix exit code overflow in autoconf test.
Diffstat (limited to 'lib/filemode.h')
-rw-r--r--lib/filemode.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/filemode.h b/lib/filemode.h
index 9ebef47806..3ca19b8562 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