From 7ecdd38ac4428aadf244390660daa00d16ffc273 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Wed, 12 Jun 1996 04:13:42 +0000 Subject: [PATCH] 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 --- src/lib/crypto/os/ChangeLog | 7 +++++++ src/lib/crypto/os/c_localaddr.c | 2 +- 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 d9bb87bbf..3671f1349 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 + + * 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 * 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 c13aa159a..407631555 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 2adceaa33..8b539463f 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) */ -- 2.26.2