"Andrew W. Gray" <agray@iconsinc.com> says /GD is no longer a valid

[openssl.git] / crypto / cast / cast_lcl.h

diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index 2694bc44415e53554e8d3e17d047e172d99d14f4..5fab8a43f6b48c033dd01068d4bff64fd0ab6bc3 100644 (file)
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -60,7 +60,8 @@
 #include <stdlib.h>
 #endif
 
-#include <openssl/e_os.h>      /* OPENSSL_EXTERN */
+
+#include "openssl/e_os.h" /* OPENSSL_EXTERN */
 
 #undef c2l
 #define c2l(c,l)       (l =((unsigned long)(*((c)++)))    , \
@@ -150,7 +151,7 @@
                          *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
                          *((c)++)=(unsigned char)(((l)     )&0xff))
 
-#if defined(WIN32)
+#if defined(WIN32) && defined(_MSC_VER)
 #define ROTL(a,n)     (_lrotl(a,n))
 #else
 #define ROTL(a,n)     ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n))))
@@ -215,11 +216,11 @@
        }
 #endif
 
-OPENSSL_EXTERN CAST_LONG CAST_S_table0[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table1[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table2[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table3[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table4[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table5[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table6[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table7[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table0[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table1[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table2[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table3[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table4[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table5[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table6[256];
+OPENSSL_EXTERN const CAST_LONG CAST_S_table7[256];