Changeset 27517 for branches/eam_branches/20100225/psLib/src/fits/psFits.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• psLib/src/fits/psFits.c (modified) (2 diffs)

branches/eam_branches/20100225/psLib/src/fits/psFits.c

@@ -149 +149 @@
             int thisErrno = errno;      // Error number
             char errorBuf[MAX_STRING_LENGTH], *errorMsg;
-#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
+#if (((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) ||  __APPLE__)
             strerror_r(thisErrno, errorBuf, MAX_STRING_LENGTH);
             errorMsg = errorBuf;
@@ -208 +208 @@
                 int thisErrno = errno;
                 char errorBuf[64], *errorMsg;
-# if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
+#if (((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) ||  __APPLE__)
                 strerror_r (errno, errorBuf, 64);
                 errorMsg = errorBuf;