diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-06-12 04:13:42 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-06-12 04:13:42 +0000 |
| commit | 7ecdd38ac4428aadf244390660daa00d16ffc273 (patch) | |
| tree | 3fb66984e58d336b0fdc924ab66154a0342d8e67 /src | |
| parent | 656ac3831cc2f7939226712b2252a915a2b9cb57 (diff) | |
| download | krb5-7ecdd38ac4428aadf244390660daa00d16ffc273.tar.gz krb5-7ecdd38ac4428aadf244390660daa00d16ffc273.tar.xz krb5-7ecdd38ac4428aadf244390660daa00d16ffc273.zip | |
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
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 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 <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 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) */ |