diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/crypto/os/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/crypto/os/c_localaddr.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/os/c_ustime.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index d9bb87bbf4..3671f1349d 100644 --- 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 c13aa159af..407631555c 100644 --- 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 2adceaa338..8b539463f2 100644 --- 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) */ |