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

8 files changed, 21 insertions, 6 deletions

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index f980270ad..afbce5789 100644
--- 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 121fca3aa..0229107c6 100644
--- 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 9e7b9c225..531fd8af7 100644
--- 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 baa9dc102..8714f4a0b 100644
--- 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 ddec45b3d..5ab4151c9 100644
--- 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 657cf49b9..9e73726bc 100644
--- 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 09e62a294..a636968d5 100644
--- 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 5be6257ae..9c799da32 100644
--- 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 *);