From 93723b50b639d8dc717bc1bf463fd46e1b321239 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Sat, 13 Oct 2012 21:25:14 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/ui/ui_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/ui/ui_openssl.c')

diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c
index 1e3dba0833..e319faa47b 100644
--- a/src/lib/libcrypto/ui/ui_openssl.c
+++ b/src/lib/libcrypto/ui/ui_openssl.c
@@ -122,7 +122,7 @@
  * sigaction and fileno included. -pedantic would be more appropriate for
  * the intended purposes, but we can't prevent users from adding -ansi.
  */
-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
 #define _POSIX_C_SOURCE 2
 #endif
 #include <signal.h>
-- 
cgit v1.2.3-55-g6feb