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 4a967ee7aa2b0d5f937c18b6fe28d57dcff1c9af..79a50f96b80c35a0aeade9bffa58bbaeb6407b86 100644 (file)
--- 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 51a1680a063794ad5b14e77fb0d917c10e930de4..3bb992a193ee69ba2ae5f2d3c7a8e275ecf16800 100644 (file)
--- 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 87b6e216bc1195e0325e3c02fb2997e290da51ba..77608b898394af9590341091b0b42ca82e157144 100644 (file)
--- 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 8485a27dca73aa3a93dec544172490f05a1c55c3..41f5900676a50041cdca841308abd32bcd35abed 100644 (file)
--- 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);