[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: MacOS X -> Mac OS X
|
From: |
Bruno Haible |
|
Subject: |
Re: MacOS X -> Mac OS X |
|
Date: |
Fri, 22 Jun 2012 13:31:20 +0200 |
|
User-agent: |
KMail/4.7.4 (Linux/3.1.10-1.9-desktop; KDE/4.7.4; x86_64; ; ) |
> Yes, please, such a patch is welcome.
I heard no objection in 3 days, and no patch was submitted. So I am doing the
change now.
Most of the changes are in the doc/ directory, omitted here for brevity.
2012-06-22 Bruno Haible <address@hidden>
Write "Mac OS X" instead of "MacOS X".
* README: Write "Mac OS X" instead of "MacOS X".
* build-aux/bootstrap: Likewise.
* build-aux/install-reloc: Likewise.
* lib/acl-internal.h: Likewise.
* lib/acl_entries.c: Likewise.
* lib/argp-ba.c: Likewise.
* lib/argp-pv.c: Likewise.
* lib/config.charset: Likewise.
* lib/copy-acl.c: Likewise.
* lib/csharpexec.c: Likewise.
* lib/euidaccess.c: Likewise.
* lib/fbufmode.c: Likewise.
* lib/fflush.c: Likewise.
* lib/file-has-acl.c: Likewise.
* lib/filemode.h: Likewise.
* lib/fpurge.c: Likewise.
* lib/freadable.c: Likewise.
* lib/freadahead.c: Likewise.
* lib/freading.c: Likewise.
* lib/freadptr.c: Likewise.
* lib/freadseek.c: Likewise.
* lib/fseeko.c: Likewise.
* lib/fseterr.c: Likewise.
* lib/fsusage.c: Likewise.
* lib/fwritable.c: Likewise.
* lib/fwriting.c: Likewise.
* lib/get-rusage-as.c: Likewise.
* lib/get-rusage-data.c: Likewise.
* lib/getdomainname.c: Likewise.
* lib/idpriv-drop.c: Likewise.
* lib/idpriv-droptemp.c: Likewise.
* lib/localcharset.c: Likewise.
* lib/locale.in.h: Likewise.
* lib/localename.c: Likewise.
* lib/mbsrtowcs-state.c: Likewise.
* lib/nproc.c: Likewise.
* lib/passfd.c: Likewise.
* lib/posix_openpt.c: Likewise.
* lib/printf-parse.c: Likewise.
* lib/progreloc.c: Likewise.
* lib/safe-read.h: Likewise.
* lib/safe-write.h: Likewise.
* lib/sched.in.h: Likewise.
* lib/set-mode-acl.c: Likewise.
* lib/signal.in.h: Likewise.
* lib/stdint.in.h: Likewise.
* lib/stdio-impl.h: Likewise.
* lib/stdlib.in.h: Likewise.
* lib/strtod.c: Likewise.
* lib/sys_select.in.h: Likewise.
* lib/tcgetsid.c: Likewise.
* lib/unistd.in.h: Likewise.
* lib/unlockpt.c: Likewise.
* lib/vasnprintf.c: Likewise.
* lib/vma-iter.c: Likewise.
* lib/wcsrtombs-state.c: Likewise.
* m4/acl.m4: Likewise.
* m4/acosl.m4: Likewise.
* m4/asinl.m4: Likewise.
* m4/atanl.m4: Likewise.
* m4/c-stack.m4: Likewise.
* m4/cosl.m4: Likewise.
* m4/expl.m4: Likewise.
* m4/extensions.m4: Likewise.
* m4/fdatasync.m4: Likewise.
* m4/fmal.m4: Likewise.
* m4/frexp.m4: Likewise.
* m4/frexpf.m4: Likewise.
* m4/frexpl.m4: Likewise.
* m4/fsusage.m4: Likewise.
* m4/getdomainname.m4: Likewise.
* m4/getloadavg.m4: Likewise.
* m4/getopt.m4: Likewise.
* m4/gettext.m4: Likewise.
* m4/gnulib-common.m4: Likewise.
* m4/intdiv0.m4: Likewise.
* m4/intlmacosx.m4: Likewise.
* m4/largefile.m4: Likewise.
* m4/ldexpl.m4: Likewise.
* m4/link-follow.m4: Likewise.
* m4/locale-ar.m4: Likewise.
* m4/locale-fr.m4: Likewise.
* m4/locale-ja.m4: Likewise.
* m4/locale-tr.m4: Likewise.
* m4/locale-zh.m4: Likewise.
* m4/locale_h.m4: Likewise.
* m4/lock.m4: Likewise.
* m4/logl.m4: Likewise.
* m4/mathfunc.m4: Likewise.
* m4/minus-zero.m4: Likewise.
* m4/mktime.m4: Likewise.
* m4/mmap-anon.m4: Likewise.
* m4/multiarch.m4: Likewise.
* m4/nanosleep.m4: Likewise.
* m4/nocrash.m4: Likewise.
* m4/poll.m4: Likewise.
* m4/printf-frexpl.m4: Likewise.
* m4/printf.m4: Likewise.
* m4/signbit.m4: Likewise.
* m4/sinl.m4: Likewise.
* m4/sqrtl.m4: Likewise.
* m4/strerror_r.m4: Likewise.
* m4/tanl.m4: Likewise.
* m4/threadlib.m4: Likewise.
* m4/ttyname_r.m4: Likewise.
* m4/unlink.m4: Likewise.
* m4/visibility.m4: Likewise.
* m4/wcwidth.m4: Likewise.
* tests/minus-zero.h: Likewise.
* tests/test-alloca-opt.c: Likewise.
* tests/test-copy-acl.sh: Likewise.
* tests/test-copy-file.sh: Likewise.
* tests/test-fdatasync.c: Likewise.
* tests/test-file-has-acl.sh: Likewise.
* tests/test-flock.c: Likewise.
* tests/test-fsync.c: Likewise.
* tests/test-localename.c: Likewise.
* tests/test-malloca.c: Likewise.
* tests/test-nonblocking-pipe.h: Likewise.
* tests/test-nonblocking-socket.h: Likewise.
* tests/test-openpty.c: Likewise.
* tests/test-posix_openpt.c: Likewise.
* tests/test-ptsname.c: Likewise.
* tests/test-ptsname_r.c: Likewise.
* tests/test-sameacls.c: Likewise.
* tests/test-select.h: Likewise.
* tests/test-set-mode-acl.sh: Likewise.
* tests/test-snprintf-posix.h: Likewise.
* tests/test-sprintf-posix.h: Likewise.
* tests/test-strtod.c: Likewise.
* tests/test-time.c: Likewise.
* tests/test-vasnprintf-posix.c: Likewise.
* tests/test-vasprintf-posix.c: Likewise.
* doc/acl-resources.txt: Likewise.
* doc/**/*.texi: Likewise.
Reported by Max Horn <address@hidden>.
--- README.orig Fri Jun 22 13:18:04 2012
+++ README Fri Jun 22 12:45:54 2012
@@ -149,7 +149,7 @@
set noexpandtab
* For Eclipse: In the "Window|Preferences" dialog (or "Eclipse|Preferences"
- dialog on MacOS),
+ dialog on Mac OS),
1. Under "General|Editors|Text Editors", select the "Insert spaces for
tabs"
checkbox.
2. Under "C/C++|Code Style", select a code style profile that has the
--- build-aux/bootstrap.orig Fri Jun 22 13:18:04 2012
+++ build-aux/bootstrap Fri Jun 22 12:46:04 2012
@@ -215,7 +215,7 @@
eval "export $find_tool_envvar"
}
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
find_tool SHA1SUM sha1sum gsha1sum shasum
# Override the default configuration, if necessary.
Changing permissions from 100755 to 100644
--- build-aux/install-reloc.orig Fri Jun 22 13:18:04 2012
+++ build-aux/install-reloc Fri Jun 22 12:44:27 2012
@@ -183,7 +183,7 @@
strerror.o \
c-ctype.o
test $rc = 0 || exit $?
-# Clean up debugging information left over by the native C compiler on MacOS X.
+# Clean up debugging information left over by the native C compiler on Mac OS
X.
rm -rf "$destprog.wrapper$exeext.dSYM"
test $rc = 0 || exit $?
--- lib/acl-internal.h.orig Fri Jun 22 13:18:20 2012
+++ lib/acl-internal.h Fri Jun 22 12:44:22 2012
@@ -71,7 +71,7 @@
/* Recognize some common errors such as from an NFS mount that does
not support ACLs, even when local drives do. */
-#if defined __APPLE__ && defined __MACH__ /* MacOS X */
+#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
# define ACL_NOT_WELL_SUPPORTED(Err) \
((Err) == ENOTSUP || (Err) == ENOSYS || (Err) == EINVAL || (Err) == EBUSY
|| (Err) == ENOENT)
#elif defined EOPNOTSUPP /* Tru64 NFS */
@@ -86,7 +86,7 @@
# if HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
-/* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+/* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
# ifndef MIN_ACL_ENTRIES
# define MIN_ACL_ENTRIES 4
@@ -149,7 +149,7 @@
/* Set to 1 if a file's mode is implicit by the ACL.
Set to 0 if a file's mode is stored independently from the ACL. */
-# if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi
/* MacOS X, IRIX */
+# if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi
/* Mac OS X, IRIX */
# define MODE_INSIDE_ACL 0
# else
# define MODE_INSIDE_ACL 1
@@ -163,7 +163,7 @@
extern int acl_entries (acl_t);
# endif
-# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
+# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
/* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
Return 1 if the given ACL is non-trivial.
Return 0 if it is trivial. */
--- lib/acl_entries.c.orig Fri Jun 22 13:18:20 2012
+++ lib/acl_entries.c Fri Jun 22 12:44:22 2012
@@ -22,7 +22,7 @@
#include "acl-internal.h"
/* This file assumes POSIX-draft like ACLs
- (Linux, FreeBSD, MacOS X, IRIX, Tru64). */
+ (Linux, FreeBSD, Mac OS X, IRIX, Tru64). */
/* Return the number of entries in ACL.
Return -1 and set errno upon failure to determine it. */
@@ -34,8 +34,8 @@
if (acl != NULL)
{
-#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, MacOS X */
-# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
+#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */
+# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
/* acl_get_entry returns 0 when it successfully fetches an entry,
and -1/EINVAL at the end. */
acl_entry_t ace;
--- lib/argp-ba.c.orig Fri Jun 22 13:18:20 2012
+++ lib/argp-ba.c Fri Jun 22 12:44:22 2012
@@ -23,7 +23,7 @@
ADDR." */
const char *argp_program_bug_address
/* This variable should be zero-initialized. On most systems, putting it into
- BSS is sufficient. Not so on MacOS X 10.3 and 10.4, see
+ BSS is sufficient. Not so on Mac OS X 10.3 and 10.4, see
<http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>
<http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00096.html>. */
#if defined __ELF__
--- lib/argp-pv.c.orig Fri Jun 22 13:18:20 2012
+++ lib/argp-pv.c Fri Jun 22 12:44:22 2012
@@ -23,7 +23,7 @@
ARGP_NO_EXIT flag is used). Overridden by ARGP_PROGRAM_VERSION_HOOK. */
const char *argp_program_version
/* This variable should be zero-initialized. On most systems, putting it into
- BSS is sufficient. Not so on MacOS X 10.3 and 10.4, see
+ BSS is sufficient. Not so on Mac OS X 10.3 and 10.4, see
<http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>
<http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00096.html>. */
#if defined __ELF__
--- lib/config.charset.orig Fri Jun 22 13:18:20 2012
+++ lib/config.charset Fri Jun 22 12:44:22 2012
@@ -29,7 +29,7 @@
# The current list of GNU canonical charset names is as follows.
#
# name MIME? used by which systems
-# (darwin = MacOS X, woe32 = native Windows)
+# (darwin = Mac OS X, woe32 = native
Windows)
#
# ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin
# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd
openbsd darwin cygwin
--- lib/copy-acl.c.orig Fri Jun 22 13:18:20 2012
+++ lib/copy-acl.c Fri Jun 22 12:58:08 2012
@@ -44,7 +44,7 @@
{
#if USE_ACL && HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
- /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
# if !HAVE_ACL_TYPE_EXTENDED
/* Linux, FreeBSD, IRIX, Tru64 */
@@ -116,19 +116,19 @@
return 0;
# else /* HAVE_ACL_TYPE_EXTENDED */
- /* MacOS X */
+ /* Mac OS X */
- /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS)
- and acl_get_file (name, ACL_TYPE_DEFAULT)
+ /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
+ and acl_get_file (name, ACL_TYPE_DEFAULT)
always return NULL / EINVAL. You have to use
- acl_get_file (name, ACL_TYPE_EXTENDED)
- or acl_get_fd (open (name, ...))
+ acl_get_file (name, ACL_TYPE_EXTENDED)
+ or acl_get_fd (open (name, ...))
to retrieve an ACL.
On the other hand,
- acl_set_file (name, ACL_TYPE_ACCESS, acl)
- and acl_set_file (name, ACL_TYPE_DEFAULT, acl)
+ acl_set_file (name, ACL_TYPE_ACCESS, acl)
+ and acl_set_file (name, ACL_TYPE_DEFAULT, acl)
have the same effect as
- acl_set_file (name, ACL_TYPE_EXTENDED, acl):
+ acl_set_file (name, ACL_TYPE_EXTENDED, acl):
Each of these calls sets the file's ACL. */
acl_t acl;
--- lib/csharpexec.c.orig Fri Jun 22 13:18:20 2012
+++ lib/csharpexec.c Fri Jun 22 12:44:22 2012
@@ -47,7 +47,7 @@
/* Native Windows, Cygwin */
#define CLASSPATHVAR "PATH"
#elif defined __APPLE__ && defined __MACH__
- /* MacOS X */
+ /* Mac OS X */
#define CLASSPATHVAR "DYLD_LIBRARY_PATH"
#else
/* Normal Unix */
--- lib/euidaccess.c.orig Fri Jun 22 13:18:20 2012
+++ lib/euidaccess.c Fri Jun 22 12:44:22 2012
@@ -82,7 +82,7 @@
return accessx (file, mode, ACC_SELF);
#elif HAVE_EACCESS /* FreeBSD */
return eaccess (file, mode);
-#else /* MacOS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */
+#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS
*/
uid_t uid = getuid ();
gid_t gid = getgid ();
--- lib/fbufmode.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fbufmode.c Fri Jun 22 12:44:22 2012
@@ -42,7 +42,7 @@
if (fp->_flags & _IO_UNBUFFERED)
return _IONBF;
return _IOFBF;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
if (fp_->_flags & __SLBF)
return _IOLBF;
if (fp_->_flags & __SNBF)
--- lib/fflush.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fflush.c Fri Jun 22 12:44:22 2012
@@ -50,7 +50,7 @@
static inline void
clear_ungetc_buffer (FILE *fp)
{
-# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
if (HASUB (fp))
{
fp_->_p += fp_->_r;
@@ -71,7 +71,7 @@
#endif
-#if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD,
NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+#if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD,
NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
static inline int
disable_seek_optimization (FILE *fp)
@@ -93,7 +93,7 @@
update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER,
off_t pos _GL_UNUSED_PARAMETER)
{
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __CYGWIN__
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
@@ -191,7 +191,7 @@
return result;
}
-# if (defined __sferror || defined __DragonFly__) && defined __SNPT /*
FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+# if (defined __sferror || defined __DragonFly__) && defined __SNPT /*
FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
{
/* Disable seek optimization for the next fseeko call. This tells the
--- lib/file-has-acl.c.orig Fri Jun 22 13:18:20 2012
+++ lib/file-has-acl.c Fri Jun 22 12:44:22 2012
@@ -32,7 +32,7 @@
#if USE_ACL && HAVE_ACL_GET_FILE
-# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
+# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
/* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED.
Return 1 if the given ACL is non-trivial.
@@ -489,7 +489,7 @@
# if HAVE_ACL_GET_FILE
/* POSIX 1003.1e (draft 17 -- abandoned) specific version. */
- /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
int ret;
if (HAVE_ACL_EXTENDED_FILE) /* Linux */
@@ -499,10 +499,10 @@
ACL_TYPE_DEFAULT. */
ret = acl_extended_file (name);
}
- else /* FreeBSD, MacOS X, IRIX, Tru64 */
+ else /* FreeBSD, Mac OS X, IRIX, Tru64 */
{
-# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
- /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS)
+# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
+ /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
and acl_get_file (name, ACL_TYPE_DEFAULT)
always return NULL / EINVAL. There is no point in making
these two useless calls. The real ACL is retrieved through
--- lib/filemode.h.orig Fri Jun 22 13:18:20 2012
+++ lib/filemode.h Fri Jun 22 12:44:22 2012
@@ -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
--- lib/fpurge.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fpurge.c Fri Jun 22 12:44:22 2012
@@ -35,7 +35,7 @@
/* The __fpurge function does not have a return value. */
return 0;
-#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly,
MacOS X, Cygwin 1.7 */
+#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly,
Mac OS X, Cygwin 1.7 */
/* Call the system's fpurge function. */
# undef fpurge
@@ -43,7 +43,7 @@
extern int fpurge (FILE *);
# endif
int result = fpurge (fp);
-# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
if (result == 0)
/* Correct the invariants that fpurge broke.
<stdio.h> on BSD systems says:
@@ -71,7 +71,7 @@
fp->_IO_save_base = NULL;
}
return 0;
-# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_p = fp_->_bf._base;
fp_->_r = 0;
fp_->_w = ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered
and not currently reading? */
--- lib/freadable.c.orig Fri Jun 22 13:18:20 2012
+++ lib/freadable.c Fri Jun 22 12:44:22 2012
@@ -33,7 +33,7 @@
fast macros. */
#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
return (fp->_flags & _IO_NO_READS) == 0;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
return (fp_->_flags & (__SRW | __SRD)) != 0;
#elif defined __EMX__ /* emx+gcc */
return (fp->_flags & (_IORW | _IOREAD)) != 0;
--- lib/freadahead.c.orig Fri Jun 22 13:18:20 2012
+++ lib/freadahead.c Fri Jun 22 12:44:22 2012
@@ -31,7 +31,7 @@
return (fp->_IO_read_end - fp->_IO_read_ptr)
+ (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
0);
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
return 0;
# if defined __DragonFly__
--- lib/freading.c.orig Fri Jun 22 13:18:20 2012
+++ lib/freading.c Fri Jun 22 12:44:22 2012
@@ -35,7 +35,7 @@
return ((fp->_flags & _IO_NO_WRITES) != 0
|| ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
&& fp->_IO_read_base != NULL));
-# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
return (fp_->_flags & __SRD) != 0;
# elif defined __EMX__ /* emx+gcc */
return (fp->_flags & _IOREAD) != 0;
--- lib/freadptr.c.orig Fri Jun 22 13:18:20 2012
+++ lib/freadptr.c Fri Jun 22 12:44:22 2012
@@ -37,7 +37,7 @@
return NULL;
*sizep = size;
return (const char *) fp->_IO_read_ptr;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
return NULL;
size = fp_->_r;
--- lib/freadseek.c.orig Fri Jun 22 13:18:20 2012
+++ lib/freadseek.c Fri Jun 22 12:44:22 2012
@@ -38,7 +38,7 @@
__freadptrinc (fp, increment);
#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
fp->_IO_read_ptr += increment;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_p += increment;
fp_->_r -= increment;
#elif defined __EMX__ /* emx+gcc */
--- lib/fseeko.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fseeko.c Fri Jun 22 12:44:22 2012
@@ -51,7 +51,7 @@
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __SL64 && defined __SCLE /* Cygwin */
if ((fp->_flags & __SL64) == 0)
{
@@ -109,7 +109,7 @@
off_t pos = lseek (fileno (fp), offset, whence);
if (pos == -1)
{
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_flags &= ~__SOFF;
#endif
return -1;
@@ -118,7 +118,7 @@
#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __CYGWIN__
/* fp_->_offset is typed as an integer. */
fp_->_offset = pos;
--- lib/fseterr.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fseterr.c Fri Jun 22 12:44:22 2012
@@ -31,7 +31,7 @@
fast macros. */
#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
fp->_flags |= _IO_ERR_SEEN;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
fp_->_flags |= __SERR;
#elif defined __EMX__ /* emx+gcc */
fp->_flags |= _IOERR;
--- lib/fsusage.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fsusage.c Fri Jun 22 12:44:22 2012
@@ -227,7 +227,7 @@
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_frsize);
#elif defined STAT_STATFS2_BSIZE /* glibc/Linux < 2.6, 4.3BSD, SunOS 4,
\
- MacOS X < 10.4, FreeBSD < 5.0, \
+ Mac OS X < 10.4, FreeBSD < 5.0, \
NetBSD < 3.0, OpenBSD < 4.4 */
struct statfs fsd;
--- lib/fwritable.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fwritable.c Fri Jun 22 12:44:22 2012
@@ -33,7 +33,7 @@
fast macros. */
#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
return (fp->_flags & _IO_NO_WRITES) == 0;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
return (fp_->_flags & (__SRW | __SWR)) != 0;
#elif defined __EMX__ /* emx+gcc */
return (fp->_flags & (_IORW | _IOWRT)) != 0;
--- lib/fwriting.c.orig Fri Jun 22 13:18:20 2012
+++ lib/fwriting.c Fri Jun 22 12:44:22 2012
@@ -29,7 +29,7 @@
fast macros. */
#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0;
-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
return (fp_->_flags & __SWR) != 0;
#elif defined __EMX__ /* emx+gcc */
return (fp->_flags & _IOWRT) != 0;
--- lib/get-rusage-as.c.orig Fri Jun 22 13:18:20 2012
+++ lib/get-rusage-as.c Fri Jun 22 12:44:22 2012
@@ -49,7 +49,7 @@
get_rusage_as_via_iterator() is 4 KB higher than
get_rusage_as_via_setrlimit().
- MacOS X:
+ Mac OS X:
a) setrlimit with RLIMIT_AS succeeds but does not really work: The OS
ignores RLIMIT_AS. mmap() of a page always succeeds, therefore
get_rusage_as_via_setrlimit() is always 0.
@@ -355,7 +355,7 @@
uintptr_t
get_rusage_as (void)
{
-#if (defined __APPLE__ && defined __MACH__) || defined _AIX || defined
__CYGWIN__ /* MacOS X, AIX, Cygwin */
+#if (defined __APPLE__ && defined __MACH__) || defined _AIX || defined
__CYGWIN__ /* Mac OS X, AIX, Cygwin */
/* get_rusage_as_via_setrlimit() does not work.
Prefer get_rusage_as_via_iterator(). */
return get_rusage_as_via_iterator ();
--- lib/get-rusage-data.c.orig Fri Jun 22 13:18:20 2012
+++ lib/get-rusage-data.c Fri Jun 22 12:44:22 2012
@@ -50,7 +50,7 @@
Note that malloc() falls back on mmap() for large allocations and also
for small allocations if there is not enough room in the data segment.
- MacOS X:
+ Mac OS X:
a) setrlimit with RLIMIT_DATA succeeds but does not really work: The OS
ignores RLIMIT_DATA. Therefore get_rusage_data_via_setrlimit() is
always 0.
@@ -384,7 +384,7 @@
uintptr_t
get_rusage_data (void)
{
-#if (defined __APPLE__ && defined __MACH__) || defined __CYGWIN__ /* MacOS X,
Cygwin */
+#if (defined __APPLE__ && defined __MACH__) || defined __CYGWIN__ /* Mac OS X,
Cygwin */
/* get_rusage_data_via_setrlimit() does not work.
Prefer get_rusage_data_via_iterator(). */
return get_rusage_data_via_iterator ();
--- lib/getdomainname.c.orig Fri Jun 22 13:18:21 2012
+++ lib/getdomainname.c Fri Jun 22 12:44:22 2012
@@ -44,7 +44,7 @@
getdomainname (char *name, size_t len)
#undef getdomainname
{
-#if HAVE_GETDOMAINNAME /* MacOS X, FreeBSD, AIX, IRIX, OSF/1 */
+#if HAVE_GETDOMAINNAME /* Mac OS X, FreeBSD, AIX, IRIX, OSF/1
*/
extern int getdomainname (char *, int);
if (len > INT_MAX)
--- lib/idpriv-drop.c.orig Fri Jun 22 13:18:21 2012
+++ lib/idpriv-drop.c Fri Jun 22 12:44:22 2012
@@ -42,7 +42,7 @@
setresuid. */
if (setresgid (gid, gid, gid) < 0)
return -1;
-#elif HAVE_SETREGID /* MacOS X, NetBSD, AIX, IRIX, Solaris, OSF/1, Cygwin */
+#elif HAVE_SETREGID /* Mac OS X, NetBSD, AIX, IRIX, Solaris, OSF/1, Cygwin */
if (setregid (gid, gid) < 0)
return -1;
#elif HAVE_SETEGID /* Solaris 2.4 */
@@ -61,7 +61,7 @@
is used seems to vary a lot." */
if (setresuid (uid, uid, uid) < 0)
return -1;
-#elif HAVE_SETREUID /* MacOS X, NetBSD, AIX, IRIX, Solaris, OSF/1, Cygwin */
+#elif HAVE_SETREUID /* Mac OS X, NetBSD, AIX, IRIX, Solaris, OSF/1, Cygwin */
if (setreuid (uid, uid) < 0)
return -1;
#elif HAVE_SETEUID /* Solaris 2.4 */
--- lib/idpriv-droptemp.c.orig Fri Jun 22 13:18:21 2012
+++ lib/idpriv-droptemp.c Fri Jun 22 12:44:22 2012
@@ -51,7 +51,7 @@
# if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */
if (setresgid (-1, gid, saved_gid) < 0)
return -1;
-# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
if (setregid (-1, gid) < 0)
return -1;
# endif
@@ -62,7 +62,7 @@
figure 14. */
if (setresuid (-1, uid, saved_uid) < 0)
return -1;
-# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
if (setreuid (-1, uid) < 0)
return -1;
# endif
@@ -138,7 +138,7 @@
figure 14. */
if (setresuid (-1, saved_uid, -1) < 0)
return -1;
-# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
if (setreuid (-1, saved_uid) < 0)
return -1;
# endif
@@ -147,7 +147,7 @@
# if HAVE_SETRESGID /* glibc, FreeBSD, OpenBSD, HP-UX */
if (setresgid (-1, saved_gid, -1) < 0)
return -1;
-# else /* MacOS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
+# else /* Mac OS X, NetBSD, AIX, IRIX, Solaris >= 2.5, OSF/1, Cygwin */
if (setregid (-1, saved_gid) < 0)
return -1;
# endif
--- lib/localcharset.c.orig Fri Jun 22 13:18:21 2012
+++ lib/localcharset.c Fri Jun 22 12:44:22 2012
@@ -29,7 +29,7 @@
#include <stdlib.h>
#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
+# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */
#endif
#if defined _WIN32 || defined __WIN32__
--- lib/locale.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/locale.in.h Fri Jun 22 12:44:22 2012
@@ -30,7 +30,7 @@
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
-/* MacOS X 10.5 defines the locale_t type in <xlocale.h>. */
+/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */
#if @HAVE_XLOCALE_H@
# include <xlocale.h>
#endif
--- lib/localename.c.orig Fri Jun 22 13:18:21 2012
+++ lib/localename.c Fri Jun 22 12:44:22 2012
@@ -16,7 +16,7 @@
/* Written by Ulrich Drepper <address@hidden>, 1995. */
/* Native Windows code written by Tor Lillqvist <address@hidden>. */
-/* MacOS X code written by Bruno Haible <address@hidden>. */
+/* Mac OS X code written by Bruno Haible <address@hidden>. */
#include <config.h>
@@ -34,7 +34,7 @@
#include <string.h>
#if HAVE_USELOCALE
-/* MacOS X 10.5 defines the locale_t type in <xlocale.h>. */
+/* Mac OS X 10.5 defines the locale_t type in <xlocale.h>. */
# if defined __APPLE__ && defined __MACH__
# include <xlocale.h>
# endif
@@ -1128,11 +1128,11 @@
#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
-/* MacOS X 10.2 or newer */
+/* Mac OS X 10.2 or newer */
-/* Canonicalize a MacOS X locale name to a Unix locale name.
+/* Canonicalize a Mac OS X locale name to a Unix locale name.
NAME is a sufficiently large buffer.
- On input, it contains the MacOS X locale name.
+ On input, it contains the Mac OS X locale name.
On output, it contains the Unix locale name. */
# if !defined IN_LIBINTL
static
@@ -1145,9 +1145,9 @@
http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */
/* Convert legacy (NeXTstep inherited) English names to Unix (ISO 639 and
- ISO 3166) names. Prior to MacOS X 10.3, there is no API for doing this.
+ ISO 3166) names. Prior to Mac OS X 10.3, there is no API for doing this.
Therefore we do it ourselves, using a table based on the results of the
- MacOS X 10.3.8 function
+ Mac OS X 10.3.8 function
CFLocaleCreateCanonicalLocaleIdentifierFromString(). */
typedef struct { const char legacy[21+1]; const char unixy[5+1]; }
legacy_entry;
@@ -1290,26 +1290,26 @@
typedef struct { const char langtag[7+1]; const char unixy[12+1]; }
langtag_entry;
static const langtag_entry langtag_table[] = {
- /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn".
+ /* Mac OS X has "az-Arab", "az-Cyrl", "az-Latn".
The default script for az on Unix is Latin. */
{ "az-Latn", "az" },
- /* MacOS X has "ga-dots". Does not yet exist on Unix. */
+ /* Mac OS X has "ga-dots". Does not yet exist on Unix. */
{ "ga-dots", "ga" },
- /* MacOS X has "kk-Cyrl". Does not yet exist on Unix. */
- /* MacOS X has "mn-Cyrl", "mn-Mong".
+ /* Mac OS X has "kk-Cyrl". Does not yet exist on Unix. */
+ /* Mac OS X has "mn-Cyrl", "mn-Mong".
The default script for mn on Unix is Cyrillic. */
{ "mn-Cyrl", "mn" },
- /* MacOS X has "ms-Arab", "ms-Latn".
+ /* Mac OS X has "ms-Arab", "ms-Latn".
The default script for ms on Unix is Latin. */
{ "ms-Latn", "ms" },
- /* MacOS X has "tg-Cyrl".
+ /* Mac OS X has "tg-Cyrl".
The default script for tg on Unix is Cyrillic. */
{ "tg-Cyrl", "tg" },
- /* MacOS X has "tk-Cyrl". Does not yet exist on Unix. */
- /* MacOS X has "tt-Cyrl".
+ /* Mac OS X has "tk-Cyrl". Does not yet exist on Unix. */
+ /* Mac OS X has "tt-Cyrl".
The default script for tt on Unix is Cyrillic. */
{ "tt-Cyrl", "tt" },
- /* MacOS X has "zh-Hans", "zh-Hant".
+ /* Mac OS X has "zh-Hans", "zh-Hant".
Country codes are used to distinguish these on Unix. */
{ "zh-Hans", "zh_CN" },
{ "zh-Hant", "zh_TW" }
@@ -2505,7 +2505,7 @@
#endif
-#if HAVE_USELOCALE /* glibc or MacOS X */
+#if HAVE_USELOCALE /* glibc or Mac OS X */
/* Simple hash set of strings. We don't want to drag in lots of hash table
code here. */
@@ -2617,20 +2617,20 @@
name = thread_locale->__names[category];
return name;
# endif
-# if defined __APPLE__ && defined __MACH__ /* MacOS X */
+# if defined __APPLE__ && defined __MACH__ /* Mac OS X */
/* The locale name is found deep in an undocumented data structure.
Since it's stored in a buffer of size 32 and newlocale() rejects
locale names of length > 31, we can assume that it is NUL terminated
in this buffer. But we need to make a copy of the locale name, of
indefinite extent. */
- struct _xlocale_part1_v0 /* used in MacOS X 10.5 */
+ struct _xlocale_part1_v0 /* used in Mac OS X 10.5 */
{
int32_t __refcount;
void (*__free_extra)(void *);
__darwin_mbstate_t __mbs[10];
int64_t __magic;
};
- struct _xlocale_part1_v1 /* used in MacOS X >= 10.6.0 */
+ struct _xlocale_part1_v1 /* used in Mac OS X >= 10.6.0 */
{
int32_t __refcount;
void (*__free_extra)(void *);
@@ -2702,18 +2702,18 @@
struct _xlocale_part2 *tlp;
if (((struct _xlocale_part1_v0 *) thread_locale)->__magic
== 0x786C6F63616C6530LL)
- /* MacOS X 10.5 */
+ /* Mac OS X 10.5 */
tlp =
(struct _xlocale_part2 *)
&((struct _xlocale_part1_v0 *) thread_locale)->__magic;
else if (((struct _xlocale_part1_v1 *) thread_locale)->__magic
== 0x786C6F63616C6530LL)
- /* MacOS X >= 10.6.0 */
+ /* Mac OS X >= 10.6.0 */
tlp =
(struct _xlocale_part2 *)
&((struct _xlocale_part1_v1 *) thread_locale)->__magic;
else
- /* Unsupported version of MacOS X: The internals of 'struct _xlocale'
+ /* Unsupported version of Mac OS X: The internals of 'struct
_xlocale'
have changed again. */
return "";
switch (category)
@@ -2784,8 +2784,8 @@
/* On other systems we ignore what setlocale reports and instead look at the
environment variables directly. This is necessary
1. on systems which have a facility for customizing the default locale
- (MacOS X, native Windows, Cygwin) and where the system's setlocale()
- function ignores this default locale (MacOS X, Cygwin), in two cases:
+ (Mac OS X, native Windows, Cygwin) and where the system's setlocale()
+ function ignores this default locale (Mac OS X, Cygwin), in two
cases:
a. when the user missed to use the setlocale() override from libintl
(for example by not including <libintl.h>),
b. when setlocale supports only the "C" locale, such as on Cygwin
@@ -2820,7 +2820,7 @@
if (retval != NULL && retval[0] != '\0')
{
#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
- /* MacOS X 10.2 or newer.
+ /* Mac OS X 10.2 or newer.
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
@@ -2847,10 +2847,10 @@
locale, customizing it for each location. POSIX:2001 does not require
such a facility.
- The systems with such a facility are MacOS X and Windows: They provide a
+ The systems with such a facility are Mac OS X and Windows: They provide a
GUI that allows the user to choose a locale.
- - On MacOS X, by default, none of LC_* or LANG are set. Starting with
- MacOS X 10.4 or 10.5, LANG is set for processes launched by the
+ - On Mac OS X, by default, none of LC_* or LANG are set. Starting with
+ Mac OS X 10.4 or 10.5, LANG is set for processes launched by the
'Terminal' application (but sometimes to an incorrect value "UTF-8").
When no environment variable is set, setlocale (LC_ALL, "") uses the
"C" locale.
@@ -2880,7 +2880,7 @@
codeset. */
# if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
- /* MacOS X 10.2 or newer */
+ /* Mac OS X 10.2 or newer */
{
/* Cache the locale name, since CoreFoundation calls are expensive. */
static const char *cached_localename;
@@ -2888,7 +2888,7 @@
if (cached_localename == NULL)
{
char namebuf[256];
-# if HAVE_CFLOCALECOPYCURRENT /* MacOS X 10.3 or newer */
+# if HAVE_CFLOCALECOPYCURRENT /* Mac OS X 10.3 or newer */
CFLocaleRef locale = CFLocaleCopyCurrent ();
CFStringRef name = CFLocaleGetIdentifier (locale);
@@ -2899,7 +2899,7 @@
cached_localename = strdup (namebuf);
}
CFRelease (locale);
-# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */
+# elif HAVE_CFPREFERENCESCOPYAPPVALUE /* Mac OS X 10.2 or newer */
CFTypeRef value =
CFPreferencesCopyAppValue (CFSTR ("AppleLocale"),
kCFPreferencesCurrentApplication);
--- lib/mbsrtowcs-state.c.orig Fri Jun 22 13:18:21 2012
+++ lib/mbsrtowcs-state.c Fri Jun 22 12:44:22 2012
@@ -22,7 +22,7 @@
/* Internal state used by the functions mbsrtowcs() and mbsnrtowcs(). */
mbstate_t _gl_mbsrtowcs_state
/* The state must initially be in the "initial state"; so, zero-initialize it.
- On most systems, putting it into BSS is sufficient. Not so on MacOS X 10.3,
+ On most systems, putting it into BSS is sufficient. Not so on Mac OS X
10.3,
see <http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>.
When it needs an initializer, use 0 or {0} as initializer? 0 only works
when mbstate_t is a scalar type (such as when gnulib defines it, or on
--- lib/nproc.c.orig Fri Jun 22 13:18:21 2012
+++ lib/nproc.c Fri Jun 22 12:44:22 2012
@@ -256,7 +256,7 @@
}
#if defined _SC_NPROCESSORS_ONLN
- { /* This works on glibc, MacOS X 10.5, FreeBSD, AIX, OSF/1, Solaris,
+ { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, OSF/1, Solaris,
Cygwin, Haiku. */
long int nprocs = sysconf (_SC_NPROCESSORS_ONLN);
if (nprocs > 0)
@@ -267,7 +267,7 @@
else /* query == NPROC_ALL */
{
#if defined _SC_NPROCESSORS_CONF
- { /* This works on glibc, MacOS X 10.5, FreeBSD, AIX, OSF/1, Solaris,
+ { /* This works on glibc, Mac OS X 10.5, FreeBSD, AIX, OSF/1, Solaris,
Cygwin, Haiku. */
long int nprocs = sysconf (_SC_NPROCESSORS_CONF);
@@ -332,7 +332,7 @@
NPROC_CURRENT and NPROC_ALL. */
#if HAVE_SYSCTL && defined HW_NCPU
- { /* This works on MacOS X, FreeBSD, NetBSD, OpenBSD. */
+ { /* This works on Mac OS X, FreeBSD, NetBSD, OpenBSD. */
int nprocs;
size_t len = sizeof (nprocs);
static int mib[2] = { CTL_HW, HW_NCPU };
--- lib/passfd.c.orig Fri Jun 22 13:18:21 2012
+++ lib/passfd.c Fri Jun 22 12:44:22 2012
@@ -31,7 +31,7 @@
#include "cloexec.h"
/* The code that uses CMSG_FIRSTHDR is enabled on
- Linux, MacOS X, FreeBSD, OpenBSD, NetBSD, AIX, OSF/1, Cygwin.
+ Linux, Mac OS X, FreeBSD, OpenBSD, NetBSD, AIX, OSF/1, Cygwin.
The code that uses HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS is enabled on
HP-UX, IRIX, Solaris. */
--- lib/posix_openpt.c.orig Fri Jun 22 13:18:21 2012
+++ lib/posix_openpt.c Fri Jun 22 12:51:58 2012
@@ -28,12 +28,12 @@
/* posix_openpt() is already provided on
glibc >= 2.2.1 (but is a stub on GNU/Hurd),
- MacOS X >= 10.4,
+ Mac OS X >= 10.4,
FreeBSD >= 5.1 (lived in src/lib/libc/stdlib/grantpt.c before 8.0),
NetBSD >= 3.0,
AIX >= 5.2, HP-UX >= 11.31, Solaris >= 10, Cygwin >= 1.7.
Thus, this replacement function is compiled on
- MacOS X 10.3, OpenBSD 4.9, Minix 3.1.8,
+ Mac OS X 10.3, OpenBSD 4.9, Minix 3.1.8,
AIX 5.1, HP-UX 11.23, IRIX 6.5, OSF/1 5.1, Solaris 9,
Cygwin 1.5.x, mingw, MSVC 9, Interix 3.5, BeOS.
Among these:
@@ -87,19 +87,19 @@
else
master = -1;
-#else /* MacOS X, Minix, HP-UX, IRIX, OSF/1, Solaris 9, Cygwin 1.5 */
+#else /* Mac OS X, Minix, HP-UX, IRIX, OSF/1, Solaris 9, Cygwin 1.5 */
/* Most systems that lack posix_openpt() have /dev/ptmx. */
master = open ("/dev/ptmx", flags);
/* If all this does not work, we could try to open, one by one:
- - On MacOS X: /dev/pty[p-w][0-9a-f]
- - On *BSD: /dev/pty[p-sP-S][0-9a-v]
- - On Minix: /dev/pty[p-q][0-9a-f]
- - On AIX: /dev/ptyp[0-9a-f]
- - On HP-UX: /dev/pty[p-r][0-9a-f]
- - On OSF/1: /dev/pty[p-q][0-9a-f]
- - On Solaris: /dev/pty[p-r][0-9a-f]
+ - On Mac OS X: /dev/pty[p-w][0-9a-f]
+ - On *BSD: /dev/pty[p-sP-S][0-9a-v]
+ - On Minix: /dev/pty[p-q][0-9a-f]
+ - On AIX: /dev/ptyp[0-9a-f]
+ - On HP-UX: /dev/pty[p-r][0-9a-f]
+ - On OSF/1: /dev/pty[p-q][0-9a-f]
+ - On Solaris: /dev/pty[p-r][0-9a-f]
*/
#endif
--- lib/printf-parse.c.orig Fri Jun 22 13:18:21 2012
+++ lib/printf-parse.c Fri Jun 22 12:44:22 2012
@@ -401,7 +401,7 @@
cp++;
}
#if defined __APPLE__ && defined __MACH__
- /* On MacOS X 10.3, PRIdMAX is defined as "qd".
+ /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
We cannot change it to "lld" because PRIdMAX must also
be understood by the system's printf routines. */
else if (*cp == 'q')
--- lib/progreloc.c.orig Fri Jun 22 13:18:21 2012
+++ lib/progreloc.c Fri Jun 22 12:44:22 2012
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <sys/stat.h>
-/* Get declaration of _NSGetExecutablePath on MacOS X 10.2 or newer. */
+/* Get declaration of _NSGetExecutablePath on Mac OS X 10.2 or newer. */
#if HAVE_MACH_O_DYLD_H
# include <mach-o/dyld.h>
#endif
@@ -202,7 +202,7 @@
}
# endif
# if HAVE_MACH_O_DYLD_H && HAVE__NSGETEXECUTABLEPATH
- /* On MacOS X 10.2 or newer, the function
+ /* On Mac OS X 10.2 or newer, the function
int _NSGetExecutablePath (char *buf, uint32_t *bufsize);
can be used to retrieve the executable's full path. */
char location[4096];
--- lib/safe-read.h.orig Fri Jun 22 13:18:21 2012
+++ lib/safe-read.h Fri Jun 22 12:44:22 2012
@@ -17,7 +17,7 @@
/* Some system calls may be interrupted and fail with errno = EINTR in the
following situations:
- The process is stopped and restarted (signal SIGSTOP and SIGCONT, user
- types Ctrl-Z) on some platforms: MacOS X.
+ types Ctrl-Z) on some platforms: Mac OS X.
- The process receives a signal for which a signal handler was installed
with sigaction() with an sa_flags field that does not contain
SA_RESTART.
--- lib/safe-write.h.orig Fri Jun 22 13:18:21 2012
+++ lib/safe-write.h Fri Jun 22 12:44:22 2012
@@ -17,7 +17,7 @@
/* Some system calls may be interrupted and fail with errno = EINTR in the
following situations:
- The process is stopped and restarted (signal SIGSTOP and SIGCONT, user
- types Ctrl-Z) on some platforms: MacOS X.
+ types Ctrl-Z) on some platforms: Mac OS X.
- The process receives a signal for which a signal handler was installed
with sigaction() with an sa_flags field that does not contain
SA_RESTART.
--- lib/sched.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/sched.in.h Fri Jun 22 12:44:22 2012
@@ -32,7 +32,7 @@
/* Get pid_t.
This is needed on glibc 2.11 (see
glibc bug <http://sourceware.org/bugzilla/show_bug.cgi?id=13198>)
- and MacOS X 10.5. */
+ and Mac OS X 10.5. */
#include <sys/types.h>
#if address@hidden@
--- lib/set-mode-acl.c.orig Fri Jun 22 13:18:21 2012
+++ lib/set-mode-acl.c Fri Jun 22 12:52:53 2012
@@ -56,7 +56,7 @@
#if USE_ACL
# if HAVE_ACL_GET_FILE
/* POSIX 1003.1e draft 17 (abandoned) specific version. */
- /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
# if !HAVE_ACL_TYPE_EXTENDED
/* Linux, FreeBSD, IRIX, Tru64 */
@@ -141,19 +141,19 @@
return 0;
# else /* HAVE_ACL_TYPE_EXTENDED */
- /* MacOS X */
+ /* Mac OS X */
- /* On MacOS X, acl_get_file (name, ACL_TYPE_ACCESS)
- and acl_get_file (name, ACL_TYPE_DEFAULT)
+ /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS)
+ and acl_get_file (name, ACL_TYPE_DEFAULT)
always return NULL / EINVAL. You have to use
- acl_get_file (name, ACL_TYPE_EXTENDED)
- or acl_get_fd (open (name, ...))
+ acl_get_file (name, ACL_TYPE_EXTENDED)
+ or acl_get_fd (open (name, ...))
to retrieve an ACL.
On the other hand,
- acl_set_file (name, ACL_TYPE_ACCESS, acl)
- and acl_set_file (name, ACL_TYPE_DEFAULT, acl)
+ acl_set_file (name, ACL_TYPE_ACCESS, acl)
+ and acl_set_file (name, ACL_TYPE_DEFAULT, acl)
have the same effect as
- acl_set_file (name, ACL_TYPE_EXTENDED, acl):
+ acl_set_file (name, ACL_TYPE_EXTENDED, acl):
Each of these calls sets the file's ACL. */
acl_t acl;
--- lib/signal.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/signal.in.h Fri Jun 22 12:44:22 2012
@@ -55,7 +55,7 @@
#ifndef address@hidden@_SIGNAL_H
#define address@hidden@_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 @@
/* 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 @@
/* 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 @@
/* 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 @@
/* 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 @@
/* 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
--- lib/stdint.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/stdint.in.h Fri Jun 22 12:44:22 2012
@@ -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 @address@hidden */
#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
--- lib/stdio-impl.h.orig Fri Jun 22 13:18:21 2012
+++ lib/stdio-impl.h Fri Jun 22 12:44:22 2012
@@ -28,7 +28,7 @@
#include <errno.h> /* For detecting Plan9. */
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, MacOS X, Cygwin */
+#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD,
DragonFly, Mac OS X, Cygwin */
# if defined __DragonFly__ /* DragonFly */
/* See
<http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.
*/
@@ -66,7 +66,7 @@
/* More fields, not relevant here. */
};
# define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
-# else /* FreeBSD, NetBSD <= 1.5Z,
DragonFly, MacOS X, Cygwin */
+# else /* FreeBSD, NetBSD <= 1.5Z,
DragonFly, Mac OS X, Cygwin */
# define fp_ub fp_->_ub
# endif
--- lib/stdlib.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/stdlib.in.h Fri Jun 22 12:44:22 2012
@@ -87,8 +87,8 @@
#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>
--- lib/strtod.c.orig Fri Jun 22 13:18:21 2012
+++ lib/strtod.c Fri Jun 22 12:44:22 2012
@@ -193,7 +193,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -DBL_MIN * DBL_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static double
compute_minus_zero (void)
--- lib/sys_select.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/sys_select.in.h Fri Jun 22 12:44:22 2012
@@ -63,7 +63,7 @@
/* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
of 'struct timeval', and no definition of this type.
- Also, MacOS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
+ Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
in <sys/time.h>.
But avoid namespace pollution on glibc systems. */
# ifndef __GLIBC__
--- lib/tcgetsid.c.orig Fri Jun 22 13:18:21 2012
+++ lib/tcgetsid.c Fri Jun 22 12:44:22 2012
@@ -27,7 +27,7 @@
pid_t
tcgetsid (int fd)
{
-#ifdef TIOCGSID /* MacOS X, OpenBSD */
+#ifdef TIOCGSID /* Mac OS X, OpenBSD */
int sid;
if (ioctl (fd, TIOCGSID, &sid) < 0)
--- lib/unistd.in.h.orig Fri Jun 22 13:18:21 2012
+++ lib/unistd.in.h Fri Jun 22 12:44:22 2012
@@ -1318,7 +1318,7 @@
_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));
--- lib/unlockpt.c.orig Fri Jun 22 13:18:21 2012
+++ lib/unlockpt.c Fri Jun 22 12:44:22 2012
@@ -28,7 +28,7 @@
/* Platforms which have the TIOCSPTLCK ioctl (Linux) already have the
unlockpt function. */
#if HAVE_REVOKE
- /* MacOS X 10.3, OpenBSD 3.8 do not have the unlockpt function, but they
+ /* Mac OS X 10.3, OpenBSD 3.8 do not have the unlockpt function, but they
have revoke(). */
char *name = ptsname (fd);
if (name == NULL)
--- lib/vasnprintf.c.orig Fri Jun 22 13:18:21 2012
+++ lib/vasnprintf.c Fri Jun 22 12:44:22 2012
@@ -275,7 +275,7 @@
{
const char *point;
/* Determine it in a multithread-safe way. We know nl_langinfo is
- multithread-safe on glibc systems and MacOS X systems, but is not required
+ multithread-safe on glibc systems and Mac OS X systems, but is not
required
to be multithread-safe by POSIX. sprintf(), however, is multithread-safe.
localeconv() is rarely multithread-safe. */
# if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined
__APPLE__ && defined __MACH__))
--- lib/vma-iter.c.orig Fri Jun 22 13:18:21 2012
+++ lib/vma-iter.c Fri Jun 22 12:44:22 2012
@@ -32,7 +32,7 @@
# include <sys/procfs.h> /* PIOC*, prmap_t */
#endif
-#if defined __APPLE__ && defined __MACH__ /* MacOS X */
+#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
# include <mach/mach.h>
#endif
@@ -359,7 +359,7 @@
close (fd);
return;
-#elif defined __APPLE__ && defined __MACH__ /* MacOS X */
+#elif defined __APPLE__ && defined __MACH__ /* Mac OS X */
task_t task = mach_task_self ();
vm_address_t address;
@@ -370,10 +370,10 @@
int more;
mach_port_t object_name;
unsigned int flags;
- /* In MacOS X 10.5, the types vm_address_t, vm_offset_t, vm_size_t have
+ /* In Mac OS X 10.5, the types vm_address_t, vm_offset_t, vm_size_t have
32 bits in 32-bit processes and 64 bits in 64-bit processes. Whereas
mach_vm_address_t and mach_vm_size_t are always 64 bits large.
- MacOS X 10.5 has three vm_region like methods:
+ Mac OS X 10.5 has three vm_region like methods:
- vm_region. It has arguments that depend on whether the current
process is 32-bit or 64-bit. When linking dynamically, this
function exists only in 32-bit processes. Therefore we use it only
--- lib/wcsrtombs-state.c.orig Fri Jun 22 13:18:21 2012
+++ lib/wcsrtombs-state.c Fri Jun 22 12:44:22 2012
@@ -22,7 +22,7 @@
/* Internal state used by the functions wcsrtombs() and wcsnrtombs(). */
mbstate_t _gl_wcsrtombs_state
/* The state must initially be in the "initial state"; so, zero-initialize it.
- On most systems, putting it into BSS is sufficient. Not so on MacOS X 10.3,
+ On most systems, putting it into BSS is sufficient. Not so on Mac OS X
10.3,
see <http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>.
When it needs an initializer, use 0 or {0} as initializer? 0 only works
when mbstate_t is a scalar type (such as when gnulib defines it, or on
--- m4/acl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/acl.m4 Fri Jun 22 13:00:14 2012
@@ -1,5 +1,5 @@
# acl.m4 - check for access control list (ACL) primitives
-# serial 13
+# serial 14
# Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -23,7 +23,7 @@
if test $ac_cv_header_sys_acl_h = yes; then
ac_save_LIBS=$LIBS
- dnl Test for POSIX-draft-like API (Linux, FreeBSD, MacOS X, IRIX, Tru64).
+ dnl Test for POSIX-draft-like API (Linux, FreeBSD, Mac OS X, IRIX,
Tru64).
dnl -lacl is needed on Linux, -lpacl is needed on OSF/1.
if test $use_acl = 0; then
AC_SEARCH_LIBS([acl_get_file], [acl pacl],
@@ -55,7 +55,7 @@
AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1],
[Define to 1 if the constant ACL_FIRST_ENTRY exists.])
fi
- dnl On MacOS X, other types of ACLs are supported.
+ dnl On Mac OS X, other types of ACLs are supported.
AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
[gl_cv_acl_ACL_TYPE_EXTENDED],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
--- m4/acosl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/acosl.m4 Fri Jun 22 13:04:15 2012
@@ -1,4 +1,4 @@
-# acosl.m4 serial 7
+# acosl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_acosl_no_libm = yes \
|| test $gl_cv_func_acosl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has acosl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has acosl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [[#include <math.h>]])
else
HAVE_DECL_ACOSL=0
--- m4/asinl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/asinl.m4 Fri Jun 22 13:04:24 2012
@@ -1,4 +1,4 @@
-# asinl.m4 serial 7
+# asinl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_asinl_no_libm = yes \
|| test $gl_cv_func_asinl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has asinl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has asinl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([asinl], , [HAVE_DECL_ASINL=0], [[#include <math.h>]])
else
HAVE_DECL_ASINL=0
--- m4/atanl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/atanl.m4 Fri Jun 22 13:04:31 2012
@@ -1,4 +1,4 @@
-# atanl.m4 serial 7
+# atanl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_atanl_no_libm = yes \
|| test $gl_cv_func_atanl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has atanl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has atanl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [[#include <math.h>]])
else
HAVE_DECL_ATANL=0
--- m4/c-stack.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/c-stack.m4 Fri Jun 22 13:04:36 2012
@@ -7,7 +7,7 @@
# Written by Paul Eggert.
-# serial 14
+# serial 15
AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
[
@@ -23,7 +23,7 @@
FAULT_YIELDS_SIGBUS=1 ;;
hpux*) # HP-UX
FAULT_YIELDS_SIGBUS=1 ;;
- macos* | darwin*) # MacOS X
+ macos* | darwin*) # Mac OS X
FAULT_YIELDS_SIGBUS=1 ;;
gnu*) # Hurd
FAULT_YIELDS_SIGBUS=1 ;;
--- m4/cosl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/cosl.m4 Fri Jun 22 13:04:40 2012
@@ -1,4 +1,4 @@
-# cosl.m4 serial 7
+# cosl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_cosl_no_libm = yes \
|| test $gl_cv_func_cosl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has cosl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has cosl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [[#include <math.h>]])
else
HAVE_DECL_COSL=0
--- m4/expl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/expl.m4 Fri Jun 22 13:04:44 2012
@@ -1,4 +1,4 @@
-# expl.m4 serial 7
+# expl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_expl_no_libm = yes \
|| test $gl_cv_func_expl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has expl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has expl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [[#include <math.h>]])
else
HAVE_DECL_EXPL=0
--- m4/extensions.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/extensions.m4 Fri Jun 22 13:04:56 2012
@@ -1,4 +1,4 @@
-# serial 11 -*- Autoconf -*-
+# serial 12 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -67,7 +67,7 @@
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on MacOS X. */
+/* Enable general extensions on Mac OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
--- m4/fdatasync.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/fdatasync.m4 Fri Jun 22 13:05:00 2012
@@ -1,4 +1,4 @@
-# fdatasync.m4 serial 3
+# fdatasync.m4 serial 4
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@
if test $ac_cv_have_decl_fdatasync = no; then
HAVE_DECL_FDATASYNC=0
- dnl MacOS X 10.7 has fdatasync but does not declare it.
+ dnl Mac OS X 10.7 has fdatasync but does not declare it.
AC_CHECK_FUNCS([fdatasync])
if test $ac_cv_func_fdatasync = no; then
HAVE_FDATASYNC=0
--- m4/fmal.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/fmal.m4 Fri Jun 22 13:05:06 2012
@@ -1,4 +1,4 @@
-# fmal.m4 serial 3
+# fmal.m4 serial 4
dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -354,7 +354,7 @@
failed_tests |= 16;
}
/* This test fails on glibc 2.11 x86,x86_64,powerpc glibc 2.7 hppa,sparc,
- MacOS X 10.5, FreeBSD 6.4 x86, OSF/1 5.1, mingw. */
+ Mac OS X 10.5, FreeBSD 6.4 x86, OSF/1 5.1, mingw. */
{
volatile long double x = ldexpl (1.0L, LDBL_MAX_EXP - 1);
volatile long double y = 2.0L;
--- m4/frexp.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/frexp.m4 Fri Jun 22 13:05:13 2012
@@ -1,4 +1,4 @@
-# frexp.m4 serial 13
+# frexp.m4 serial 14
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -107,7 +107,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -DBL_MIN * DBL_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static double
compute_minus_zero (void)
--- m4/frexpf.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/frexpf.m4 Fri Jun 22 13:05:20 2012
@@ -1,4 +1,4 @@
-# frexpf.m4 serial 4
+# frexpf.m4 serial 5
dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -FLT_MIN * FLT_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static float
compute_minus_zero (void)
--- m4/frexpl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/frexpl.m4 Fri Jun 22 13:05:27 2012
@@ -1,4 +1,4 @@
-# frexpl.m4 serial 19
+# frexpl.m4 serial 20
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
dnl Check whether it's declared.
- dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]])
FREXPL_LIBM=
@@ -73,7 +73,7 @@
AC_REQUIRE([gl_MATH_H_DEFAULTS])
AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
dnl Check whether it's declared.
- dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]])
if test $HAVE_DECL_FREXPL = 1; then
gl_CHECK_FREXPL_NO_LIBM
@@ -113,8 +113,8 @@
])
dnl Test whether frexpl() works on finite numbers (this fails on
-dnl MacOS X 10.4/PowerPC, on AIX 5.1, and on BeOS), on denormalized numbers
-dnl (this fails on MacOS X 10.5/i386), and also on infinite numbers (this
+dnl Mac OS X 10.4/PowerPC, on AIX 5.1, and on BeOS), on denormalized numbers
+dnl (this fails on Mac OS X 10.5/i386), and also on infinite numbers (this
dnl fails e.g. on IRIX 6.5 and mingw).
AC_DEFUN([gl_FUNC_FREXPL_WORKS],
[
@@ -162,7 +162,7 @@
if (exp != 5)
result |= 1;
}
- /* Test on finite numbers that fails on MacOS X 10.4, because its frexpl
+ /* Test on finite numbers that fails on Mac OS X 10.4, because its frexpl
function returns an invalid (incorrectly normalized) value: it returns
y = { 0x3fe028f5, 0xc28f5c28, 0x3c9eb851, 0xeb851eb8 }
but the correct result is
@@ -201,7 +201,7 @@
int exp;
long double y = frexpl (x, &exp);
/* On machines with IEEE854 arithmetic: x = 1.68105e-4932,
- exp = -16382, y = 0.5. On MacOS X 10.5: exp = -16384, y = 0.5. */
+ exp = -16382, y = 0.5. On Mac OS X 10.5: exp = -16384, y = 0.5. */
if (exp != LDBL_MIN_EXP - 1)
result |= 8;
}
--- m4/fsusage.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/fsusage.m4 Fri Jun 22 13:05:31 2012
@@ -1,4 +1,4 @@
-# serial 29
+# serial 30
# Obtaining file system usage information.
# Copyright (C) 1997-1998, 2000-2001, 2003-2012 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
dnl of field f_blocks in 'struct statvfs' from 32 bit to 64 bit on
dnl glibc/Hurd, HP-UX 11, Solaris (32-bit mode). It also changes the size
dnl of field f_blocks in 'struct statfs' from 32 bit to 64 bit on
-dnl MacOS X >= 10.5 (32-bit mode).
+dnl Mac OS X >= 10.5 (32-bit mode).
AC_REQUIRE([AC_SYS_LARGEFILE])
AC_MSG_NOTICE([checking how to get file system space usage])
@@ -60,7 +60,7 @@
#if defined __APPLE__ && defined __MACH__
#include <limits.h>
-/* On MacOS X >= 10.5, f_blocks in 'struct statvfs' is a 32-bit quantity;
+/* On Mac OS X >= 10.5, f_blocks in 'struct statvfs' is a 32-bit quantity;
that commonly limits file systems to 4 TiB. Whereas f_blocks in
'struct statfs' is a 64-bit type, thanks to the large-file support
that was enabled above. In this case, don't use statvfs(); use statfs()
@@ -160,7 +160,7 @@
fi
if test $ac_fsusage_space = no; then
- # glibc/Linux, MacOS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4.
+ # glibc/Linux, Mac OS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4.
# (glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0,
# OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.)
# (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and
--- m4/getdomainname.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/getdomainname.m4 Fri Jun 22 13:05:36 2012
@@ -1,4 +1,4 @@
-# getdomainname.m4 serial 9
+# getdomainname.m4 serial 10
dnl Copyright (C) 2002-2003, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -42,7 +42,7 @@
dnl What about the declaration?
dnl - It's int getdomainname(char *, size_t) on glibc, NetBSD, OpenBSD.
- dnl - It's int getdomainname(char *, int) on MacOS X, FreeBSD, AIX, IRIX,
+ dnl - It's int getdomainname(char *, int) on Mac OS X, FreeBSD, AIX, IRIX,
dnl OSF/1.
AC_CHECK_DECLS([getdomainname], , ,
[[#include <sys/types.h>
--- m4/getloadavg.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/getloadavg.m4 Fri Jun 22 13:05:42 2012
@@ -7,7 +7,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 5
+#serial 6
# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
# New applications should use gl_GETLOADAVG instead.
@@ -22,7 +22,7 @@
gl_save_LIBS=$LIBS
-# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
+# getloadvg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0,
# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
HAVE_GETLOADAVG=1
AC_CHECK_FUNC([getloadavg], [],
--- m4/getopt.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/getopt.m4 Fri Jun 22 13:05:50 2012
@@ -1,4 +1,4 @@
-# getopt.m4 serial 40
+# getopt.m4 serial 41
dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -173,7 +173,7 @@
if (!(optind == 1))
return 12;
}
- /* Detect MacOS 10.5, AIX 7.1 bug. */
+ /* Detect Mac OS X 10.5, AIX 7.1 bug. */
{
static char program[] = "program";
static char ab[] = "-ab";
@@ -236,7 +236,7 @@
nocrash_init();
/* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw,
- and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
+ and fails on Mac OS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
OSF/1 5.1, Solaris 10. */
{
static char conftest[] = "conftest";
@@ -247,7 +247,7 @@
result |= 1;
}
/* This code succeeds on glibc 2.8, mingw,
- and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
+ and fails on Mac OS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */
{
static char program[] = "program";
--- m4/gettext.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/gettext.m4 Fri Jun 22 13:10:29 2012
@@ -1,4 +1,4 @@
-# gettext.m4 serial 64 (gettext-0.18.2)
+# gettext.m4 serial 66 (gettext-0.18.2)
dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -97,7 +97,7 @@
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
- dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
gt_INTL_MACOSX
dnl Set USE_NLS.
--- m4/gnulib-common.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/gnulib-common.m4 Fri Jun 22 13:05:58 2012
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 32
+# gnulib-common.m4 serial 33
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,7 @@
[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
- __APPLE__ && __MACH__ test for MacOS X.
+ __APPLE__ && __MACH__ test for Mac OS X.
__APPLE_CC__ tests for the Apple compiler and its version.
__STDC_VERSION__ tests for the C99 mode. */
#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined
__cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
--- m4/intdiv0.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/intdiv0.m4 Fri Jun 22 13:10:49 2012
@@ -1,4 +1,4 @@
-# intdiv0.m4 serial 5 (gettext-0.18.2)
+# intdiv0.m4 serial 6 (gettext-0.18.2)
dnl Copyright (C) 2002, 2007-2008, 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,7 @@
changequote(,)dnl
case "$host_os" in
macos* | darwin[6-9]* | darwin[1-9][0-9]*)
- # On MacOS X 10.2 or newer, just assume the same as when cross-
+ # On Mac OS X 10.2 or newer, just assume the same as when cross-
# compiling. If we were to perform the real test, 1 Crash Report
# dialog window would pop up.
case "$host_cpu" in
--- m4/intlmacosx.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/intlmacosx.m4 Fri Jun 22 13:11:07 2012
@@ -1,4 +1,4 @@
-# intlmacosx.m4 serial 4 (gettext-0.18.2)
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 2004-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,11 +13,11 @@
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
-dnl Checks for special options needed on MacOS X.
+dnl Checks for special options needed on Mac OS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
[
- dnl Check for API introduced in MacOS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.2.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
@@ -31,9 +31,9 @@
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
fi
- dnl Check for API introduced in MacOS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -46,7 +46,7 @@
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in
the CoreFoundation framework.])
fi
INTL_MACOSX_LIBS=
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test
$gt_cv_func_CFLocaleCopyCurrent = yes; then
--- m4/largefile.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/largefile.m4 Fri Jun 22 12:44:27 2012
@@ -136,7 +136,7 @@
*)
dnl Nothing to do on gnulib's side.
dnl A 64-bit off_t is
- dnl - already the default on MacOS X, FreeBSD, NetBSD, OpenBSD, IRIX,
+ dnl - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX,
dnl OSF/1, Cygwin,
dnl - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on
dnl glibc, HP-UX, Solaris,
--- m4/ldexpl.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/ldexpl.m4 Fri Jun 22 13:06:39 2012
@@ -1,4 +1,4 @@
-# ldexpl.m4 serial 15
+# ldexpl.m4 serial 16
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
dnl Check whether it's declared.
- dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include <math.h>]])
LDEXPL_LIBM=
@@ -87,7 +87,7 @@
])
dnl Test whether ldexpl() works on finite numbers (this fails on AIX 5.1
-dnl and MacOS X 10.4/PowerPC).
+dnl and Mac OS X 10.4/PowerPC).
AC_DEFUN([gl_FUNC_LDEXPL_WORKS],
[
AC_REQUIRE([AC_PROG_CC])
--- m4/link-follow.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/link-follow.m4 Fri Jun 22 13:06:45 2012
@@ -1,4 +1,4 @@
-# serial 18
+# serial 19
dnl Run a program to determine whether link(2) follows symlinks.
dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
@@ -83,7 +83,7 @@
[gl_cv_func_link_follows_symlink=no], dnl GNU behavior
[gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile
failed
[dnl We're cross compiling.
- dnl The past results are "yes" on MacOS X, FreeBSD, NetBSD,
+ dnl The past results are "yes" on Mac OS X, FreeBSD, NetBSD,
dnl OpenBSD, Minix, AIX, HP-UX, OSF/1, and "no" on Linux, Cygwin.
case "$host_os" in
# On glibc/Linux we know the result.
--- m4/locale-ar.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/locale-ar.m4 Fri Jun 22 13:06:51 2012
@@ -1,4 +1,4 @@
-# locale-ar.m4 serial 5
+# locale-ar.m4 serial 6
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -72,7 +72,7 @@
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Values tested:
--- m4/locale-fr.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/locale-fr.m4 Fri Jun 22 13:06:56 2012
@@ -1,4 +1,4 @@
-# locale-fr.m4 serial 16
+# locale-fr.m4 serial 17
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -37,7 +37,7 @@
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -92,7 +92,7 @@
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the usual locale name.
@@ -165,7 +165,7 @@
if (setlocale (LC_ALL, "") == NULL) return 1;
# endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -220,7 +220,7 @@
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the usual locale name.
--- m4/locale-ja.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/locale-ja.m4 Fri Jun 22 13:07:02 2012
@@ -1,4 +1,4 @@
-# locale-ja.m4 serial 11
+# locale-ja.m4 serial 12
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -39,7 +39,7 @@
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -91,7 +91,7 @@
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the AIX locale name.
--- m4/locale-tr.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/locale-tr.m4 Fri Jun 22 13:07:08 2012
@@ -1,4 +1,4 @@
-# locale-tr.m4 serial 9
+# locale-tr.m4 serial 10
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -42,7 +42,7 @@
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -95,7 +95,7 @@
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the usual locale name.
--- m4/locale-zh.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/locale-zh.m4 Fri Jun 22 13:07:13 2012
@@ -1,4 +1,4 @@
-# locale-zh.m4 serial 11
+# locale-zh.m4 serial 12
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -40,7 +40,7 @@
if (setlocale (LC_ALL, "") == NULL) return 1;
#endif
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
- On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+ On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
succeeds but then nl_langinfo(CODESET) is "646". In this situation,
@@ -101,7 +101,7 @@
;;
*)
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
- # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+ # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of
the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure
script.
# Test for the locale name without encoding suffix.
--- m4/locale_h.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/locale_h.m4 Fri Jun 22 13:07:18 2012
@@ -1,4 +1,4 @@
-# locale_h.m4 serial 18
+# locale_h.m4 serial 19
dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -42,7 +42,7 @@
if test $ac_cv_header_xlocale_h = yes; then
HAVE_XLOCALE_H=1
dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
- dnl e.g. on MacOS X 10.5. If <locale.h> does not define locale_t by
+ dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
dnl itself, we assume that <xlocale.h> will do so.
AC_CACHE_CHECK([whether locale.h defines locale_t],
[gl_cv_header_locale_has_locale_t],
--- m4/lock.m4.orig Fri Jun 22 13:18:21 2012
+++ m4/lock.m4 Fri Jun 22 13:11:20 2012
@@ -1,4 +1,4 @@
-# lock.m4 serial 11 (gettext-0.18.2)
+# lock.m4 serial 12 (gettext-0.18.2)
dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@
[
AC_REQUIRE([gl_THREADLIB])
if test "$gl_threads_api" = posix; then
- # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+ # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
# pthread_rwlock_* functions.
AC_CHECK_TYPE([pthread_rwlock_t],
[AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
--- m4/logl.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/logl.m4 Fri Jun 22 13:07:30 2012
@@ -1,4 +1,4 @@
-# logl.m4 serial 8
+# logl.m4 serial 9
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_logl_no_libm = yes \
|| test $gl_cv_func_logl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has logl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has logl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([logl], , [HAVE_DECL_LOGL=0], [[#include <math.h>]])
save_LIBS="$LIBS"
LIBS="$LIBS $LOGL_LIBM"
--- m4/mathfunc.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/mathfunc.m4 Fri Jun 22 13:07:36 2012
@@ -1,4 +1,4 @@
-# mathfunc.m4 serial 10
+# mathfunc.m4 serial 11
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -113,7 +113,7 @@
# tests whether the function FUNC is available in libc or libm.
# It sets FUNC_LIBM to empty or "-lm" accordingly.
# FUNC must be one of the following functions, that are present on all systems
-# and provided by libm on all systems except MacOS X, BeOS, Haiku:
+# and provided by libm on all systems except Mac OS X, BeOS, Haiku:
# acos asin atan atan2 cbrt cos cosh erf erfc exp fmod hypot j0 j1 jn lgamma
# log log10 log1p pow remainder sin sinh sqrt tan tanh y0 y1 yn
--- m4/minus-zero.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/minus-zero.m4 Fri Jun 22 13:07:41 2012
@@ -1,4 +1,4 @@
-# minus-zero.m4 serial 1
+# minus-zero.m4 serial 2
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -FLT_MIN * FLT_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static float
compute_minus_zerof (void)
@@ -36,7 +36,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -DBL_MIN * DBL_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static double
compute_minus_zerod (void)
@@ -62,7 +62,7 @@
IRIX cc can't put -0.0L into .data, but can compute at runtime.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -LDBL_MIN * LDBL_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static long double
compute_minus_zerol (void)
--- m4/mktime.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/mktime.m4 Fri Jun 22 13:07:45 2012
@@ -1,4 +1,4 @@
-# serial 22
+# serial 23
dnl Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -17,7 +17,7 @@
AC_CHECK_FUNCS_ONCE([alarm])
AC_REQUIRE([gl_MULTIARCH])
if test $APPLE_UNIVERSAL_BUILD = 1; then
- # A universal build on Apple MacOS X platforms.
+ # A universal build on Apple Mac OS X platforms.
# The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode.
# But we need a configuration result that is valid in both modes.
gl_cv_func_working_mktime=no
--- m4/mmap-anon.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/mmap-anon.m4 Fri Jun 22 13:07:49 2012
@@ -1,4 +1,4 @@
-# mmap-anon.m4 serial 9
+# mmap-anon.m4 serial 10
dnl Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@
# - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
# and MAP_ANON exist and have the same value.
# - On HP-UX, only MAP_ANONYMOUS exists.
-# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
+# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
# - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
# used.
--- m4/multiarch.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/multiarch.m4 Fri Jun 22 13:07:53 2012
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 6
+# multiarch.m4 serial 7
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,7 @@
# Determine whether the compiler is or may be producing universal binaries.
#
-# On MacOS X 10.5 and later systems, the user can create libraries and
+# On Mac OS X 10.5 and later systems, the user can create libraries and
# executables that work on multiple system types--known as "fat" or
# "universal" binaries--by specifying multiple '-arch' options to the
# compiler but only a single '-arch' option to the preprocessor. Like
--- m4/nanosleep.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/nanosleep.m4 Fri Jun 22 13:07:59 2012
@@ -1,4 +1,4 @@
-# serial 35
+# serial 36
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -36,7 +36,7 @@
AC_REQUIRE([gl_MULTIARCH])
if test $APPLE_UNIVERSAL_BUILD = 1; then
- # A universal build on Apple MacOS X platforms.
+ # A universal build on Apple Mac OS X platforms.
# The test result would be 'no (mishandles large arguments)' in 64-bit
# mode but 'yes' in 32-bit mode. But we need a configuration result that
# is valid in both modes.
--- m4/nocrash.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/nocrash.m4 Fri Jun 22 13:08:03 2012
@@ -1,4 +1,4 @@
-# nocrash.m4 serial 3
+# nocrash.m4 serial 4
dnl Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,7 @@
AC_DEFUN([GL_NOCRASH],[[
#include <stdlib.h>
#if defined __MACH__ && defined __APPLE__
-/* Avoid a crash on MacOS X. */
+/* Avoid a crash on Mac OS X. */
#include <mach/mach.h>
#include <mach/mach_error.h>
#include <mach/thread_status.h>
--- m4/poll.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/poll.m4 Fri Jun 22 13:08:08 2012
@@ -1,4 +1,4 @@
-# poll.m4 serial 16
+# poll.m4 serial 17
dnl Copyright (c) 2003, 2005-2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@
else
AC_CHECK_FUNC([poll],
[# Check whether poll() works on special files (like /dev/null) and
- # and ttys (like /dev/tty). On MacOS X 10.4.0 and AIX 5.3, it doesn't.
+ # and ttys (like /dev/tty). On Mac OS X 10.4.0 and AIX 5.3, it doesn't.
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <fcntl.h>
#include <poll.h>
@@ -24,7 +24,7 @@
struct pollfd ufd;
/* Try /dev/null for reading. */
ufd.fd = open ("/dev/null", O_RDONLY);
- /* If /dev/null does not exist, it's not MacOS X nor AIX. */
+ /* If /dev/null does not exist, it's not Mac OS X nor AIX. */
if (ufd.fd >= 0)
{
ufd.events = POLLIN;
@@ -34,7 +34,7 @@
}
/* Try /dev/null for writing. */
ufd.fd = open ("/dev/null", O_WRONLY);
- /* If /dev/null does not exist, it's not MacOS X nor AIX. */
+ /* If /dev/null does not exist, it's not Mac OS X nor AIX. */
if (ufd.fd >= 0)
{
ufd.events = POLLOUT;
@@ -48,7 +48,7 @@
[gl_cv_func_poll=yes],
[gl_cv_func_poll=no],
[# When cross-compiling, assume that poll() works everywhere except on
- # MacOS X or AIX, regardless of its version.
+ # Mac OS X or AIX, regardless of its version.
AC_EGREP_CPP([MacOSX], [
#if (defined(__APPLE__) && defined(__MACH__)) || defined(_AIX)
This is MacOSX or AIX
--- m4/printf-frexpl.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/printf-frexpl.m4 Fri Jun 22 13:08:15 2012
@@ -1,4 +1,4 @@
-# printf-frexpl.m4 serial 9
+# printf-frexpl.m4 serial 10
dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -28,7 +28,7 @@
AC_DEFINE([HAVE_FREXPL_IN_LIBC], [1],
[Define if the frexpl function is available in libc.])
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]])
fi
@@ -40,7 +40,7 @@
AC_DEFINE([HAVE_LDEXPL_IN_LIBC], [1],
[Define if the ldexpl function is available in libc.])
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in
<math.h>.
+ dnl Mac OS X 10.3 has ldexpl() in libc but doesn't declare it in
<math.h>.
AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include <math.h>]])
;;
esac
--- m4/printf.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/printf.m4 Fri Jun 22 13:08:19 2012
@@ -1,4 +1,4 @@
-# printf.m4 serial 49
+# printf.m4 serial 50
dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -63,7 +63,7 @@
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";;
darwin*) gl_cv_func_printf_sizes_c99="guessing yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -222,7 +222,7 @@
# Guess yes on FreeBSD >= 6.
freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";;
darwin*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on HP-UX >= 11.
@@ -507,14 +507,14 @@
if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0
|| buf[0] == '0')
result |= 8;
- /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug. */
if (sprintf (buf, "%.1a", 1.999) < 0
|| (strcmp (buf, "0x1.0p+1") != 0
&& strcmp (buf, "0x2.0p+0") != 0
&& strcmp (buf, "0x4.0p-1") != 0
&& strcmp (buf, "0x8.0p-2") != 0))
result |= 16;
- /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a
+ /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
if (sprintf (buf, "%.1La", 1.999L) < 0
|| (strcmp (buf, "0x1.0p+1") != 0
@@ -590,7 +590,7 @@
# Guess yes on FreeBSD >= 6.
freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";;
darwin*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on Solaris >= 2.10.
@@ -1044,7 +1044,7 @@
fi
rm -fr conftest*
else
- dnl A universal build on Apple MacOS X platforms.
+ dnl A universal build on Apple Mac OS X platforms.
dnl The result would be 'no' in 32-bit mode and 'yes' in 64-bit mode.
dnl But we need a configuration result that is valid in both modes.
gl_cv_func_printf_enomem="guessing no"
@@ -1138,7 +1138,7 @@
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing
no";;
darwin*) gl_cv_func_snprintf_truncation_c99="guessing
yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -1237,7 +1237,7 @@
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";;
darwin*) gl_cv_func_snprintf_retval_c99="guessing
yes";;
# Guess yes on OpenBSD >= 3.9.
@@ -1318,7 +1318,7 @@
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing
no";;
darwin*) gl_cv_func_snprintf_directive_n="guessing
yes";;
# Guess yes on Solaris >= 2.6.
@@ -1460,7 +1460,7 @@
# Guess yes on FreeBSD >= 5.
freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing
no";;
freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing
yes";;
- # Guess yes on MacOS X >= 10.3.
+ # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing
no";;
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing
yes";;
# Guess yes on Cygwin.
@@ -1540,8 +1540,8 @@
dnl glibc 2.5 . . . . . . . . . . . . . .
. . . . . .
dnl glibc 2.3.6 . . . . # . . . . . . . . .
. . . . . .
dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . #
. . . . . .
-dnl MacOS X 10.5.8 . . . # # . . . . . . # . .
. . . . . .
-dnl MacOS X 10.3.9 . . . . # . . . . . . # . #
. . . . . .
+dnl Mac OS X 10.5.8 . . . # # . . . . . . # . .
. . . . . .
+dnl Mac OS X 10.3.9 . . . . # . . . . . . # . #
. . . . . .
dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . #
. . . . . .
dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ?
. . . . . .
dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . #
. . . . . .
--- m4/signbit.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/signbit.m4 Fri Jun 22 13:08:23 2012
@@ -1,4 +1,4 @@
-# signbit.m4 serial 12
+# signbit.m4 serial 13
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -170,7 +170,7 @@
/* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
So we use another constant expression instead.
But that expression does not work on other platforms, such as when
- cross-compiling to PowerPC on MacOS X 10.5. */
+ cross-compiling to PowerPC on Mac OS X 10.5. */
long double p0l = 0.0L;
#if defined __hpux || defined __sgi
long double m0l = -LDBL_MIN * LDBL_MIN;
--- m4/sinl.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/sinl.m4 Fri Jun 22 13:08:27 2012
@@ -1,4 +1,4 @@
-# sinl.m4 serial 7
+# sinl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_sinl_no_libm = yes \
|| test $gl_cv_func_sinl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has sinl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has sinl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([sinl], , [HAVE_DECL_SINL=0], [[#include <math.h>]])
else
HAVE_DECL_SINL=0
--- m4/sqrtl.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/sqrtl.m4 Fri Jun 22 13:08:33 2012
@@ -1,4 +1,4 @@
-# sqrtl.m4 serial 8
+# sqrtl.m4 serial 9
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_sqrtl_no_libm = yes \
|| test $gl_cv_func_sqrtl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has sqrtl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has sqrtl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [[#include <math.h>]])
save_LIBS="$LIBS"
--- m4/strerror_r.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/strerror_r.m4 Fri Jun 22 13:08:38 2012
@@ -1,4 +1,4 @@
-# strerror_r.m4 serial 14
+# strerror_r.m4 serial 15
dnl Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -76,7 +76,7 @@
dnl HP-UX 11.31 strerror_r always fails when the buffer length argument
dnl is less than 80.
dnl FreeBSD 8.s strerror_r claims failure on 0
- dnl MacOS X 10.5 strerror_r treats 0 like -1
+ dnl Mac OS X 10.5 strerror_r treats 0 like -1
dnl Solaris 10 strerror_r corrupts errno on failure
AC_CACHE_CHECK([whether strerror_r works],
[gl_cv_func_strerror_r_works],
--- m4/tanl.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/tanl.m4 Fri Jun 22 13:08:44 2012
@@ -1,4 +1,4 @@
-# tanl.m4 serial 7
+# tanl.m4 serial 8
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,7 +56,7 @@
if test $gl_cv_func_tanl_no_libm = yes \
|| test $gl_cv_func_tanl_in_libm = yes; then
dnl Also check whether it's declared.
- dnl MacOS X 10.3 has tanl() in libc but doesn't declare it in <math.h>.
+ dnl Mac OS X 10.3 has tanl() in libc but doesn't declare it in <math.h>.
AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [[#include <math.h>]])
else
HAVE_DECL_TANL=0
--- m4/threadlib.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/threadlib.m4 Fri Jun 22 13:13:18 2012
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 9 (gettext-0.18.2)
+# threadlib.m4 serial 10 (gettext-0.18.2)
dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -319,50 +319,50 @@
dnl Survey of platforms:
dnl
-dnl Platform Available Compiler Supports test-lock
-dnl flavours option weak result
-dnl --------------- --------- --------- -------- ---------
-dnl Linux 2.4/glibc posix -lpthread Y OK
+dnl Platform Available Compiler Supports test-lock
+dnl flavours option weak result
+dnl --------------- --------- --------- -------- ---------
+dnl Linux 2.4/glibc posix -lpthread Y OK
dnl
-dnl GNU Hurd/glibc posix
+dnl GNU Hurd/glibc posix
dnl
-dnl FreeBSD 5.3 posix -lc_r Y
-dnl posix -lkse ? Y
-dnl posix -lpthread ? Y
-dnl posix -lthr Y
+dnl FreeBSD 5.3 posix -lc_r Y
+dnl posix -lkse ? Y
+dnl posix -lpthread ? Y
+dnl posix -lthr Y
dnl
-dnl FreeBSD 5.2 posix -lc_r Y
-dnl posix -lkse Y
-dnl posix -lthr Y
+dnl FreeBSD 5.2 posix -lc_r Y
+dnl posix -lkse Y
+dnl posix -lthr Y
dnl
-dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
+dnl FreeBSD 4.0,4.10 posix -lc_r Y OK
dnl
-dnl NetBSD 1.6 --
+dnl NetBSD 1.6 --
dnl
-dnl OpenBSD 3.4 posix -lpthread Y OK
+dnl OpenBSD 3.4 posix -lpthread Y OK
dnl
-dnl MacOS X 10.[123] posix -lpthread Y OK
+dnl Mac OS X 10.[123] posix -lpthread Y OK
dnl
-dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9:
OK
-dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9:
OK
+dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9:
OK
+dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9:
OK
dnl
-dnl HP-UX 11 posix -lpthread N (cc) OK
+dnl HP-UX 11 posix -lpthread N (cc) OK
dnl Y (gcc)
dnl
-dnl IRIX 6.5 posix -lpthread Y 0.5
+dnl IRIX 6.5 posix -lpthread Y 0.5
dnl
-dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
+dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK
dnl
-dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
+dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK
dnl -lpthread (gcc) Y
dnl
-dnl Cygwin posix -lpthread Y OK
+dnl Cygwin posix -lpthread Y OK
dnl
-dnl Any of the above pth -lpth 0.0
+dnl Any of the above pth -lpth 0.0
dnl
-dnl Mingw windows N OK
+dnl Mingw windows N OK
dnl
-dnl BeOS 5 --
+dnl BeOS 5 --
dnl
dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
dnl turned off:
--- m4/ttyname_r.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/ttyname_r.m4 Fri Jun 22 13:08:51 2012
@@ -1,4 +1,4 @@
-# ttyname_r.m4 serial 8
+# ttyname_r.m4 serial 9
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -22,7 +22,7 @@
HAVE_TTYNAME_R=0
else
HAVE_TTYNAME_R=1
- dnl On MacOS X 10.4 (and Solaris 10 without gl_USE_SYSTEM_EXTENSIONS)
+ dnl On Mac OS X 10.4 (and Solaris 10 without gl_USE_SYSTEM_EXTENSIONS)
dnl the return type is 'char *', not 'int'.
AC_CACHE_CHECK([whether ttyname_r is compatible with its POSIX signature],
[gl_cv_func_ttyname_r_posix],
--- m4/unlink.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/unlink.m4 Fri Jun 22 13:08:55 2012
@@ -1,4 +1,4 @@
-# unlink.m4 serial 10
+# unlink.m4 serial 11
dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -56,14 +56,14 @@
;;
esac
- dnl Detect MacOS X 10.5.6 bug: On read-write HFS mounts, unlink("..") or
+ dnl Detect Mac OS X 10.5.6 bug: On read-write HFS mounts, unlink("..") or
dnl unlink("../..") succeeds without doing anything.
AC_CACHE_CHECK([whether unlink of a parent directory fails as it should],
[gl_cv_func_unlink_parent_fails],
[case "$host_os" in
darwin*)
dnl Try to unlink a subdirectory of /tmp, because /tmp is usually on a
- dnl HFS mount on MacOS X. Use a subdirectory, owned by the current
+ dnl HFS mount on Mac OS X. Use a subdirectory, owned by the current
dnl user, because otherwise unlink() may fail due to permissions
dnl reasons, and because when running as root we don't want to risk
dnl destroying the entire /tmp.
--- m4/visibility.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/visibility.m4 Fri Jun 22 13:11:50 2012
@@ -1,4 +1,4 @@
-# visibility.m4 serial 4 (gettext-0.18.2)
+# visibility.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 2005, 2008, 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@
dnl __attribute__((__visibility__("default"))).
dnl Does *not* test for __visibility__("protected") - which has tricky
dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
+dnl Mac OS X.
dnl Does *not* test for __visibility__("internal") - which has processor
dnl dependent semantics.
dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
--- m4/wcwidth.m4.orig Fri Jun 22 13:18:22 2012
+++ m4/wcwidth.m4 Fri Jun 22 13:04:09 2012
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 22
+# wcwidth.m4 serial 23
dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -36,7 +36,7 @@
if test $ac_cv_func_wcwidth = yes; then
HAVE_WCWIDTH=1
- dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
+ dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
dnl This leads to bugs in 'ls' (coreutils).
--- tests/minus-zero.h.orig Fri Jun 22 13:18:22 2012
+++ tests/minus-zero.h Fri Jun 22 12:44:22 2012
@@ -24,7 +24,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -FLT_MIN * FLT_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static float
compute_minus_zerof (void)
@@ -42,7 +42,7 @@
/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -DBL_MIN * DBL_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static double
compute_minus_zerod (void)
@@ -61,7 +61,7 @@
IRIX cc can't put -0.0L into .data, but can compute at runtime.
ICC 10.0 has a bug when optimizing the expression -zero.
The expression -LDBL_MIN * LDBL_MIN does not work when cross-compiling
- to PowerPC on MacOS X 10.5. */
+ to PowerPC on Mac OS X 10.5. */
#if defined __hpux || defined __sgi || defined __ICC
static long double
compute_minus_zerol (void)
--- tests/test-alloca-opt.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-alloca-opt.c Fri Jun 22 12:44:22 2012
@@ -44,7 +44,7 @@
{
/* Try various values.
n = 0 gave a crash on Alpha with gcc-2.5.8.
- Some versions of MacOS X have a stack size limit of 512 KB. */
+ Some versions of Mac OS X have a stack size limit of 512 KB. */
func (34);
func (134);
func (399);
Changing permissions from 100755 to 100644
--- tests/test-copy-acl.sh.orig Fri Jun 22 13:18:22 2012
+++ tests/test-copy-acl.sh Fri Jun 22 12:44:22 2012
@@ -111,7 +111,7 @@
acl_flavor=aix
else
if (fsaclctl -v >/dev/null) 2>/dev/null; then
- # MacOS X.
+ # Mac OS X.
acl_flavor=macosx
else
if test -f /sbin/chacl; then
Changing permissions from 100755 to 100644
--- tests/test-copy-file.sh.orig Fri Jun 22 13:18:22 2012
+++ tests/test-copy-file.sh Fri Jun 22 12:44:22 2012
@@ -105,7 +105,7 @@
acl_flavor=aix
else
if (fsaclctl -v >/dev/null) 2>/dev/null; then
- # MacOS X.
+ # Mac OS X.
acl_flavor=macosx
else
if test -f /sbin/chacl; then
--- tests/test-fdatasync.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-fdatasync.c Fri Jun 22 12:44:22 2012
@@ -38,7 +38,7 @@
if (fdatasync (fd) != 0)
{
ASSERT (errno == EINVAL /* POSIX */
- || errno == ENOTSUP /* seen on MacOS X 10.5 */
+ || errno == ENOTSUP /* seen on Mac OS X 10.5 */
|| errno == EBADF /* seen on AIX 7.1 */
|| errno == EIO /* seen on mingw */
);
Changing permissions from 100755 to 100644
--- tests/test-file-has-acl.sh.orig Fri Jun 22 13:18:22 2012
+++ tests/test-file-has-acl.sh Fri Jun 22 12:44:22 2012
@@ -111,7 +111,7 @@
acl_flavor=aix
else
if (fsaclctl -v >/dev/null) 2>/dev/null; then
- # MacOS X.
+ # Mac OS X.
acl_flavor=macosx
else
if test -f /sbin/chacl; then
--- tests/test-flock.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-flock.c Fri Jun 22 12:44:22 2012
@@ -100,7 +100,7 @@
#if defined __linux__
/* Invalid operation codes are rejected by the Linux implementation and by
- the gnulib replacement, but not by the MacOS X implementation. */
+ the gnulib replacement, but not by the Mac OS X implementation. */
ASSERT (flock (fd, LOCK_SH | LOCK_EX) == -1);
ASSERT (errno == EINVAL);
ASSERT (flock (fd, LOCK_SH | LOCK_UN) == -1);
--- tests/test-fsync.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-fsync.c Fri Jun 22 12:44:22 2012
@@ -38,7 +38,7 @@
if (fsync (fd) != 0)
{
ASSERT (errno == EINVAL /* POSIX */
- || errno == ENOTSUP /* seen on MacOS X 10.5 */
+ || errno == ENOTSUP /* seen on Mac OS X 10.5 */
|| errno == EBADF /* seen on AIX 7.1 */
|| errno == EIO /* seen on mingw */
);
--- tests/test-localename.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-localename.c Fri Jun 22 12:44:22 2012
@@ -715,7 +715,7 @@
ASSERT (name != NULL);
- /* Only MacOS X and Windows have a facility for the user to set the default
+ /* Only Mac OS X and Windows have a facility for the user to set the default
locale. */
#if !((defined __APPLE__ && defined __MACH__) || (defined _WIN32 || defined
__WIN32__ || defined __CYGWIN__))
ASSERT (strcmp (name, "C") == 0);
--- tests/test-malloca.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-malloca.c Fri Jun 22 12:44:22 2012
@@ -45,7 +45,7 @@
{
/* Try various values.
n = 0 gave a crash on Alpha with gcc-2.5.8.
- Some versions of MacOS X have a stack size limit of 512 KB. */
+ Some versions of Mac OS X have a stack size limit of 512 KB. */
func (34);
func (134);
func (399);
--- tests/test-nonblocking-pipe.h.orig Fri Jun 22 13:18:22 2012
+++ tests/test-nonblocking-pipe.h Fri Jun 22 12:55:26 2012
@@ -24,7 +24,7 @@
Linux/SPARC >= 126977
Linux/IA-64, Linux/MIPS >= 253953
Linux/PPC64 >= 1048576
- FreeBSD, OpenBSD, MacOS X >= 65537
+ FreeBSD, OpenBSD, Mac OS X >= 65537
AIX >= 32769
HP-UX >= 8193
IRIX >= 10241
--- tests/test-nonblocking-socket.h.orig Fri Jun 22 13:18:22 2012
+++ tests/test-nonblocking-socket.h Fri Jun 22 12:55:36 2012
@@ -23,7 +23,7 @@
Linux >= 7350000 (depends on circumstances)
FreeBSD >= 107521
OpenBSD >= 28673
- MacOS X >= 680000 (depends on circumstances)
+ Mac OS X >= 680000 (depends on circumstances)
AIX 5.1 >= 125713
AIX 7.1 >= 200000 (depends on circumstances)
HP-UX >= 114689
@@ -44,7 +44,7 @@
# define SOCKET_DATA_BLOCK_SIZE 1000000
#endif
-/* On Linux, MacOS X, Cygwin 1.5.x, native Windows,
+/* On Linux, Mac OS X, Cygwin 1.5.x, native Windows,
sockets have very large buffers in the kernel, so that write() calls
succeed before the reader has started reading, even if fd is blocking
and the amount of data is larger than 1 MB. */
--- tests/test-openpty.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-openpty.c Fri Jun 22 12:44:22 2012
@@ -48,7 +48,7 @@
}
/* Set the terminal characteristics.
- On Linux or MacOS X, they can be set on either the master or the slave;
+ On Linux or Mac OS X, they can be set on either the master or the slave;
the effect is the same. But on Solaris, they have to be set on the
master; tcgetattr on the slave fails. */
{
@@ -101,7 +101,7 @@
}
/* Close the master side before the slave side gets closed.
- This is necessary on MacOS X 10.4.11. */
+ This is necessary on Mac OS X 10.4.11. */
close (master);
}
--- tests/test-posix_openpt.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-posix_openpt.c Fri Jun 22 12:44:22 2012
@@ -68,7 +68,7 @@
ASSERT (isatty (slave));
/* Close the master side before the slave side gets closed.
- This is necessary on MacOS X 10.4.11. */
+ This is necessary on Mac OS X 10.4.11. */
ASSERT (close (master) == 0);
ASSERT (close (slave) == 0);
--- tests/test-ptsname.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-ptsname.c Fri Jun 22 12:44:22 2012
@@ -109,7 +109,7 @@
#else
- /* Try various master names of MacOS X: /dev/pty[p-w][0-9a-f] */
+ /* Try various master names of Mac OS X: /dev/pty[p-w][0-9a-f] */
{
int char1;
int char2;
--- tests/test-ptsname_r.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-ptsname_r.c Fri Jun 22 12:44:22 2012
@@ -170,7 +170,7 @@
#else
- /* Try various master names of MacOS X: /dev/pty[p-w][0-9a-f] */
+ /* Try various master names of Mac OS X: /dev/pty[p-w][0-9a-f] */
{
int char1;
int char2;
--- tests/test-sameacls.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-sameacls.c Fri Jun 22 12:44:22 2012
@@ -115,11 +115,11 @@
}
}
{
-#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
static const int types[] =
{
ACL_TYPE_ACCESS
-# if HAVE_ACL_TYPE_EXTENDED /* MacOS X */
+# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */
, ACL_TYPE_EXTENDED
# endif
};
--- tests/test-select.h.orig Fri Jun 22 13:18:22 2012
+++ tests/test-select.h Fri Jun 22 12:44:22 2012
@@ -265,7 +265,7 @@
#if !(defined __osf__ || defined WINDOWS_NATIVE)
int fd;
- /* On Linux, MacOS X, *BSD, values of fd like 99 or 399 are discarded
+ /* On Linux, Mac OS X, *BSD, values of fd like 99 or 399 are discarded
by the kernel early and therefore do *not* lead to EBADF, as required
by POSIX. */
# if defined __linux__ || (defined __APPLE__ && defined __MACH__) || defined
__FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
Changing permissions from 100755 to 100644
--- tests/test-set-mode-acl.sh.orig Fri Jun 22 13:18:22 2012
+++ tests/test-set-mode-acl.sh Fri Jun 22 12:44:22 2012
@@ -111,7 +111,7 @@
acl_flavor=aix
else
if (fsaclctl -v >/dev/null) 2>/dev/null; then
- # MacOS X.
+ # Mac OS X.
acl_flavor=macosx
else
if test -f /sbin/chacl; then
--- tests/test-snprintf-posix.h.orig Fri Jun 22 13:18:22 2012
+++ tests/test-snprintf-posix.h Fri Jun 22 12:44:22 2012
@@ -273,7 +273,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug. */
char result[100];
int retval =
my_snprintf (result, sizeof (result), "%.1a %d", 1.999, 33, 44, 55);
@@ -624,7 +624,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
char result[100];
int retval =
--- tests/test-sprintf-posix.h.orig Fri Jun 22 13:18:22 2012
+++ tests/test-sprintf-posix.h Fri Jun 22 12:44:22 2012
@@ -259,7 +259,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug. */
char result[1000];
int retval =
my_sprintf (result, "%.1a %d", 1.999, 33, 44, 55);
@@ -610,7 +610,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
char result[1000];
int retval =
--- tests/test-strtod.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-strtod.c Fri Jun 22 12:44:22 2012
@@ -383,7 +383,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -404,8 +404,8 @@
errno = 0;
result = strtod (input, &ptr);
ASSERT (result == 0.0);
- ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* MacOS X 10.3,
FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */
- ASSERT (ptr == input + 2); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (!!signbit (result) == !!signbit (minus_zerod)); /* Mac OS X 10.3,
FreeBSD 6.2, IRIX 6.5, OSF/1 4.0 */
+ ASSERT (ptr == input + 2); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -416,7 +416,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -427,7 +427,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -438,7 +438,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -449,7 +449,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -460,7 +460,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -471,7 +471,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -482,7 +482,7 @@
result = strtod (input, &ptr);
ASSERT (result == 0.0);
ASSERT (!signbit (result));
- ASSERT (ptr == input + 1); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, AIX 7.1 */
+ ASSERT (ptr == input + 1); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, AIX 7.1 */
ASSERT (errno == 0);
}
{
@@ -703,8 +703,8 @@
worrying about. */
ASSERT (!!signbit (result1) != !!signbit (result2)); /* glibc-2.3.6, IRIX
6.5, OSF/1 5.1, mingw */
# endif
- ASSERT (ptr1 == input + 6); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
- ASSERT (ptr2 == input + 6); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (ptr1 == input + 6); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (ptr2 == input + 6); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
ASSERT (errno == 0);
#else
ASSERT (result1 == 0.0);
@@ -724,7 +724,7 @@
result = strtod (input, &ptr);
#if 1 /* All known CPUs support NaNs. */
ASSERT (isnand (result)); /* OpenBSD 4.0, HP-UX 11.11, IRIX 6.5,
OSF/1 5.1, mingw */
- ASSERT (ptr == input + 6); /* glibc-2.3.6, MacOS X 10.3, FreeBSD
6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (ptr == input + 6); /* glibc-2.3.6, Mac OS X 10.3, FreeBSD
6.2, OpenBSD 4.0, AIX 7.1, HP-UX 11.11, IRIX 6.5, OSF/1 5.1, mingw */
ASSERT (errno == 0);
#else
ASSERT (result == 0.0);
@@ -920,9 +920,9 @@
input[m] = '\0';
errno = 0;
result = strtod (input, &ptr);
- ASSERT (result == 1.0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (result == 1.0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
ASSERT (ptr == input + m); /* OSF/1 5.1 */
- ASSERT (errno == 0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (errno == 0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
}
free (input);
}
@@ -946,9 +946,9 @@
input[m] = '\0';
errno = 0;
result = strtod (input, &ptr);
- ASSERT (result == 1.0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (result == 1.0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
ASSERT (ptr == input + m);
- ASSERT (errno == 0); /* MacOS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
+ ASSERT (errno == 0); /* Mac OS X 10.3, FreeBSD 6.2, NetBSD
3.0, OpenBSD 4.0, IRIX 6.5, OSF/1 5.1, mingw */
}
free (input);
}
--- tests/test-time.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-time.c Fri Jun 22 12:44:22 2012
@@ -26,7 +26,7 @@
struct timespec t1;
#if 0
/* POSIX:2008 does not require pid_t in <time.h> unconditionally, and indeed
- it's missing on MacOS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */
+ it's missing on Mac OS X 10.5, FreeBSD 6.4, OpenBSD 4.9, mingw. */
pid_t t2;
#endif
--- tests/test-vasnprintf-posix.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-vasnprintf-posix.c Fri Jun 22 12:44:22 2012
@@ -326,7 +326,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug. */
size_t length;
char *result =
my_asnprintf (NULL, &length, "%.1a %d", 1.999, 33, 44, 55);
@@ -741,7 +741,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
size_t length;
char *result =
--- tests/test-vasprintf-posix.c.orig Fri Jun 22 13:18:22 2012
+++ tests/test-vasprintf-posix.c Fri Jun 22 12:44:22 2012
@@ -306,7 +306,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug. */
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug. */
char *result;
int retval =
my_asprintf (&result, "%.1a %d", 1.999, 33, 44, 55);
@@ -721,7 +721,7 @@
}
{ /* Rounding can turn a ...FFF into a ...000.
- This shows a MacOS X 10.3.9 (Darwin 7.9) bug and a
+ This shows a Mac OS X 10.3.9 (Darwin 7.9) bug and a
glibc 2.4 bug <http://sourceware.org/bugzilla/show_bug.cgi?id=2908>. */
char *result;
int retval =