From: Dr. Stephen Henson Date: Wed, 13 May 2009 11:32:46 +0000 (+0000) Subject: Update from stable branch. X-Git-Tag: OpenSSL-fips-2_0-rc1~1673 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83d8fa7dd1031eec729640d85572665a50c8f57c;p=oweals%2Fopenssl.git Update from stable branch. --- diff --git a/apps/apps.c b/apps/apps.c index b04bfbd3c3..b992a04ba6 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -109,10 +109,12 @@ * */ +#ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 2 /* On VMS, you need to define this to get the declaration of fileno(). The value 2 is to make sure no function defined in POSIX-2 is left undefined. */ +#endif #include #include #include diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 1c2dcc406e..99304394c3 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -122,7 +122,9 @@ * sigaction and fileno included. -pedantic would be more appropriate for * the intended purposes, but we can't prevent users from adding -ansi. */ -#define _POSIX_C_SOURCE 1 +#ifndef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 2 +#endif #include #include #include