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

diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index e6424c965b8bbe835c5b5a788eab298e9e9c35bc..2156972b1a8671bdac7e3f202ad6b9bb2dbbdc83 100644 (file)
--- 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 8bcfee2b2957a48e7b39fe4a11413a582610c8b0..9a872bc8213248611f3061e47edb4e924817c6ee 100644 (file)
--- 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 376c85817d745bcaf828b64b1f9476100d78fe91..8cdc381a1fac22809e459c7e247d0789e0c9eaff 100644 (file)
--- 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 2aa3233d0ade6f16035e0b913338fc9d72f6f96c..6adae5a491888d5ea8a4748292f1ad5681c81c0f 100644 (file)
--- 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 27512e776db6f01e4c84b921bb157e586b1ea54e..f452da1b335f7f3e8dab40ac7d2e9d37ccdde1f4 100644 (file)
--- 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 0cd88a5de48578cf3433da0d8fc23299a5c0ab8b..792ca31b5aebf00f78bdd2a6efadf17abdce6611 100644 (file)
--- 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