summaryrefslogtreecommitdiff
path: root/lib/stdint.in.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/stdint.in.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/stdint.in.h')
-rw-r--r--lib/stdint.in.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index 59c00d59c0..e2a0eb19ac 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