Update from stable branch.

diff --git a/apps/apps.c b/apps/apps.c
index b04bfbd3c3460ce6cad070ad47f59aa593860974..b992a04ba6d7cac6b666c91e0255b5b6bbb32a96 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 1c2dcc406e66237b21f3ce279bc4eea64c51b42c..99304394c3d0413f53c1df8c1d8fc278cf232b8f 100644 (file)
--- 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 <signal.h>
 #include <stdio.h>
 #include <string.h>