From: Richard Levitte <levitte@openssl.org>
Date: Sat, 9 Sep 2000 07:14:43 +0000 (+0000)
Subject: Since C compilers on VMS (perhaps with gcc being the great exception)
X-Git-Tag: OpenSSL-engine-0_9_6-beta1~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dcd4d341e165730ffc01de7bf6566be0a9a99085;p=oweals%2Fopenssl.git

Since C compilers on VMS (perhaps with gcc being the great exception)
do not quite follow the same rules as on Unix, we need to use the
FLAT_INC tweak to include the vendor-specific header files.
---

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 4a967ee7aa..79a50f96b8 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -1194,7 +1194,9 @@ $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
 	 THEN CC = "CC/DECC"
 $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
-           "/NOLIST/PREFIX=ALL/INCLUDE=SYS$DISK:[]" + CCEXTRAFLAGS
+           "/NOLIST/PREFIX=ALL" + -
+	   "/INCLUDE=(SYS$DISK:[],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
+	   CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
@@ -1226,7 +1228,8 @@ $	WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
 $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST/INCLUDE=SYS$DISK:[]" + -
+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
+	   "/INCLUDE=(SYS$DISK:[],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
 	   CCEXTRAFLAGS
 $     CCDEFS = """VAXC""," + CCDEFS
 $!
@@ -1258,7 +1261,8 @@ $!
 $!    Use GNU C...
 $!
 $     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=SYS$DISK:[]" + CCEXTRAFLAGS
+	   "/INCLUDE=(SYS$DISK:[],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
+	   CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
diff --git a/crypto/engine/hw_atalla.c b/crypto/engine/hw_atalla.c
index 51a1680a06..3bb992a193 100644
--- a/crypto/engine/hw_atalla.c
+++ b/crypto/engine/hw_atalla.c
@@ -66,7 +66,11 @@
 #ifndef NO_HW
 #ifndef NO_HW_ATALLA
 
+#ifdef FLAT_INC
+#include "atalla.h"
+#else
 #include "vendor_defns/atalla.h"
+#endif
 
 static int atalla_init(void);
 static int atalla_finish(void);
diff --git a/crypto/engine/hw_cswift.c b/crypto/engine/hw_cswift.c
index 87b6e216bc..77608b8983 100644
--- a/crypto/engine/hw_cswift.c
+++ b/crypto/engine/hw_cswift.c
@@ -78,7 +78,11 @@
  * simply to keep the file sizes reasonable.
  * [Geoff]
  */
+#ifdef FLAT_INC
+#include "cswift.h"
+#else
 #include "vendor_defns/cswift.h"
+#endif
 
 static int cswift_init(void);
 static int cswift_finish(void);
diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c
index 8485a27dca..41f5900676 100644
--- a/crypto/engine/hw_ncipher.c
+++ b/crypto/engine/hw_ncipher.c
@@ -76,7 +76,11 @@
  * The hwcryptohook.h included here is from May 2000.
  * [Richard Levitte]
  */
+#ifdef FLAT_INC
+#include "hwcryptohook.h"
+#else
 #include "vendor_defns/hwcryptohook.h"
+#endif
 
 static int hwcrhk_init(void);
 static int hwcrhk_finish(void);