diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-06-12 04:49:06 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-06-12 04:49:06 +0000 |
| commit | a9dcdd45b3ee4b500ad66bfbf73ca5f826d1fdb3 (patch) | |
| tree | ce282735d04fee7e60a889bfa5de25ed8a93c31f /src | |
| parent | 55c3fa33901c4a545825a37b38bca1334bb9e610 (diff) | |
| download | krb5-a9dcdd45b3ee4b500ad66bfbf73ca5f826d1fdb3.tar.gz krb5-a9dcdd45b3ee4b500ad66bfbf73ca5f826d1fdb3.tar.xz krb5-a9dcdd45b3ee4b500ad66bfbf73ca5f826d1fdb3.zip | |
Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8308 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/krb5/stock/ChangeLog | 4 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 4 | ||||
| -rw-r--r-- | src/include/sys/ChangeLog | 4 | ||||
| -rw-r--r-- | src/include/sys/syslog.h | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/pname_to_uid.c | 2 |
6 files changed, 17 insertions, 4 deletions
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index e6424c965b..2156972b1a 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 12 00:43:16 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * osconf.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS + Tue Mar 5 12:27:18 1996 Richard Basch <basch@lehman.com> * osconf.h (KPROPD_DEFAULT_KDB5_EDIT): kdb5_edit is now in PREFIX/sbin diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index 8bcfee2b29..9a872bc821 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/krb5/stock/osconf.h @@ -27,7 +27,7 @@ #ifndef KRB5_OSCONF__ #define KRB5_OSCONF__ -#if !defined(_MSDOS) +#if !defined(_MSDOS) || !defined(_WIN32) /* Don't try to pull in autoconf.h for Windows, since it's not used */ #ifndef KRB5_AUTOCONF__ #define KRB5_AUTOCONF__ @@ -35,7 +35,7 @@ #endif #endif -#if defined(_WINDOWS) || defined(WIN32) +#if defined(_MSDOS) || defined(_WIN32) #define DEFAULT_PROFILE_FILENAME "krb5.ini" #define DEFAULT_LNAME_FILENAME "/aname" #define DEFAULT_KEYTAB_NAME "FILE:%s\\v5srvtab" diff --git a/src/include/sys/ChangeLog b/src/include/sys/ChangeLog index 376c85817d..8cdc381a1f 100644 --- a/src/include/sys/ChangeLog +++ b/src/include/sys/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 12 00:44:07 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * syslog.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS + Thu Jun 22 16:12:23 1995 Tom Yu (tlyu@dragons-lair) * syslog.h: reverse sense of KRB5_PROVIDE_PROTOTYPES diff --git a/src/include/sys/syslog.h b/src/include/sys/syslog.h index 2aa3233d0a..6adae5a491 100644 --- a/src/include/sys/syslog.h +++ b/src/include/sys/syslog.h @@ -90,7 +90,7 @@ #define LOG_NOWAIT 0x10 /* if forking to log on console, don't wait() */ #ifndef KERNEL -#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES) +#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES) extern void syslog (int , const char *, ... ); #ifdef va_start /* XXX depending on #define of va_start in <stdarg.h> */ diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 27512e776d..f452da1b33 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 12 00:48:32 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * pname_to_uid.c: Add #ifdef _WIN32 in places where we had #ifdef + _MSDOS + Fri Jun 7 14:52:56 1996 Kevin L Mitchell <klmitch@mit.edu> * accept_sec_context.c, init_sec_context.c, inq_context.c, diff --git a/src/lib/gssapi/krb5/pname_to_uid.c b/src/lib/gssapi/krb5/pname_to_uid.c index 0cd88a5de4..792ca31b5a 100644 --- a/src/lib/gssapi/krb5/pname_to_uid.c +++ b/src/lib/gssapi/krb5/pname_to_uid.c @@ -25,7 +25,7 @@ */ #include "gssapiP_krb5.h" -#if !defined(_MSDOS) && !defined(_MACINTOSH) +#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH) #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif |