c_ustime.c: Fix WIN32 to be _WIN32

c_localaddr.c: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS

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

diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index d9bb87bbf46e8b5d18b03df2a8e31fe602147eb0..3671f1349db614cbfb1e8c61c080666befd4ccc9 100644 (file)
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jun 12 00:12:52 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * c_ustime.c: Fix WIN32 to be _WIN32
+
+       * c_localaddr.c: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
+       
+
 Sat Feb 24 00:34:15 1996  Theodore Y. Ts'o  <tytso@dcl>
 
        * c_ustime.c (krb5_crypto_us_timeofday): Add Windows 95/NT time

diff --git a/src/lib/crypto/os/c_localaddr.c b/src/lib/crypto/os/c_localaddr.c
index c13aa159afdb169616e623e62488f05ac691d52d..407631555cb35de3b730461e9010ba13ce03b9f4 100644 (file)
--- a/src/lib/crypto/os/c_localaddr.c
+++ b/src/lib/crypto/os/c_localaddr.c
@@ -30,7 +30,7 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 
-#if !defined(HAVE_MACSOCK_H) && !defined(_MSDOS)
+#if !defined(HAVE_MACSOCK_H) && !defined(_MSDOS) && !defined(_WIN32)
 
 /* needed for solaris, harmless elsewhere... */
 #define BSD_COMP

diff --git a/src/lib/crypto/os/c_ustime.c b/src/lib/crypto/os/c_ustime.c
index 2adceaa3389c9ff6fd46b43c51d5514b1ba33e87..8b539463f2065e4bc1ffd13da927e0bd89218592 100644 (file)
--- a/src/lib/crypto/os/c_ustime.c
+++ b/src/lib/crypto/os/c_ustime.c
@@ -121,7 +121,7 @@ krb5_crypto_us_timeofday(seconds, microseconds)
 }
 
 
-#elif defined(WIN32) || defined(_WINDOWS)
+#elif defined(_WIN32) || defined(_MSDOS)
 
    /* Microsoft Windows NT and 95   (32bit)  */
    /* This one works for WOW (Windows on Windows, ntvdm on Win-NT) */