Add #ifdef _WIN32 in places where we had #ifdef _MSDOS

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8299 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index f980270adf35fec46c88cd8c318159a2f4ff7be6..afbce57897404f7cd708b2537734fc7d32368691 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 12 00:08:31 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * f_tables.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
+
 Tue May 21 19:30:10 1996  Sam Hartman  <hartmans@mit.edu>
 
        * Makefile.in (check-unix): In building destest and verify, make

diff --git a/src/lib/crypto/des/f_tables.h b/src/lib/crypto/des/f_tables.h
index 121fca3aad2eece7fd936fd0c39e1d992f4bb6f5..0229107c6a373e4c959f26d7bb78494957c57adc 100644 (file)
--- a/src/lib/crypto/des/f_tables.h
+++ b/src/lib/crypto/des/f_tables.h
@@ -15,7 +15,7 @@
 #define        __DES_TABLES_H__        /* nothing */
 
 #ifndef const
-#if !defined(__STDC__) && !defined(_WINDOWS)
+#if !defined(__STDC__) && !defined(_MSDOS) && !defined(_WIN32)
 #define const /* nothing */
 #endif
 #endif

diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 9e7b9c2257381593a31c5634abcc0d54dca01ba8..531fd8af72aba037572408f3f57d7aff694ecfd0 100644 (file)
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 12 00:10:42 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * md4.c
+       * rsa-md4.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
+       
+
 Thu May 23 19:24:33 1996  Sam Hartman  <hartmans@mit.edu>
 
        * Makefile.in (RUN_SETUP):  use KRB5_RUN_FLAGS

diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c
index baa9dc10275ac4fcd5244948de2a5ae2c6133189..8714f4a0b8758cc59ab1929ff7cb9e62e32c66a9 100644 (file)
--- a/src/lib/crypto/md4/md4.c
+++ b/src/lib/crypto/md4/md4.c
@@ -38,14 +38,14 @@
 #include "k5-int.h"
 #include "rsa-md4.h"
 
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
 #define UL(x) x##UL
 #else
 #define UL(x) ((krb5_ui_4) x)
 #endif    
 
 /* forward declaration */
-#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES)
+#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES)
 static void Transform (krb5_ui_4 FAR *, krb5_ui_4 FAR *);
 #else
 static void Transform ();

diff --git a/src/lib/crypto/md4/rsa-md4.h b/src/lib/crypto/md4/rsa-md4.h
index ddec45b3d371f1c43b30f883c7749c3c12083b3e..5ab4151c9a991443c2945ccacfe3c88c0b19dc69 100644 (file)
--- a/src/lib/crypto/md4/rsa-md4.h
+++ b/src/lib/crypto/md4/rsa-md4.h
@@ -83,7 +83,7 @@ typedef struct {
   unsigned char digest[16];            /* actual digest after MD4Final call */
 } krb5_MD4_CTX;
 
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
 extern void krb5_MD4Init(krb5_MD4_CTX FAR *);
 extern void krb5_MD4Update(krb5_MD4_CTX FAR *, unsigned char FAR *, unsigned int);
 extern void krb5_MD4Final(krb5_MD4_CTX FAR *);

diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 657cf49b90f570046c2a5cda36e9a08e1300e37f..9e73726bc7e4d01a97c369d1e94e294033a1539f 100644 (file)
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 12 00:11:34 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * rsa-md5.h:
+       * md5.c: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
+
 Tue May 21 20:29:03 1996  Sam Hartman  <hartmans@mit.edu>
 
        * Makefile.in (check-unix): Use KRB5_RUN_FLAGS 

diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c
index 09e62a294c1773a757bb0a6d96c60d604e645635..a636968d568e57220ab3729cbac99482f943bf14 100644 (file)
--- a/src/lib/crypto/md5/md5.c
+++ b/src/lib/crypto/md5/md5.c
@@ -38,7 +38,7 @@
 #include "k5-int.h"
 #include "rsa-md5.h"
 
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
 #define UL(x) x##UL
 #else
 #define UL(x) ((krb5_ui_4) x)

diff --git a/src/lib/crypto/md5/rsa-md5.h b/src/lib/crypto/md5/rsa-md5.h
index 5be6257aeb93de1d90cf27a5461909f8c5115964..9c799da329e5644e5f178b22935d8c71268b8a4f 100644 (file)
--- a/src/lib/crypto/md5/rsa-md5.h
+++ b/src/lib/crypto/md5/rsa-md5.h
@@ -48,7 +48,7 @@ typedef struct {
   unsigned char digest[16];            /* actual digest after MD5Final call */
 } krb5_MD5_CTX;
 
-#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES)
+#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES)
 extern void krb5_MD5Init(krb5_MD5_CTX FAR *);
 extern void krb5_MD5Update(krb5_MD5_CTX FAR *,unsigned char FAR *,unsigned int);
 extern void krb5_MD5Final(krb5_MD5_CTX FAR *);