From: Theodore Tso <tytso@mit.edu>
Date: Wed, 12 Jun 1996 05:16:09 +0000 (+0000)
Subject: Change _WINDOWS to _MSDOS, and add check for _WIN32
X-Git-Tag: krb5-1.0-beta7~376
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=578f087df29a96f7652506dee6b46a8e2aa30be3;p=krb5.git

Change _WINDOWS to _MSDOS, and add check for _WIN32

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8317 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index db85eeef1..e94ad00dc 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 10 21:51:35 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* syslog.c: Change _WINDOWS to _MSDOS, and add check for _WIN32.
+
 Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in: Folded in danw's changes to allow
diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c
index 1e4da05b5..b853f046d 100644
--- a/src/lib/krb5/posix/syslog.c
+++ b/src/lib/krb5/posix/syslog.c
@@ -33,9 +33,9 @@
  * Modified to use UNIX domain IPC by Ralph Campbell
  */
 
-#if !defined(_WINDOWS) && !defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
 
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
 #include <stdarg.h>
 #else
 #define const
@@ -63,7 +63,7 @@ static int	LogFacility = LOG_USER;	/* default facility code */
 
 
 void
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
 syslog(int pri, const char *fmt, ...)
 #else
 syslog(pri, fmt, va_alist)
@@ -74,7 +74,7 @@ syslog(pri, fmt, va_alist)
 {
     va_list pvar;
     void vsyslog();
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
     va_start(pvar, fmt);
 #else
     va_start(pvar);
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index df2c6d9e8..a36ca9f4c 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 10 21:52:38 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* rc_io.c: Change _WINDOWS to _MSDOS, and add check for _WIN32.
+
 Sat Feb 24 18:53:33 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* rc_io.c (krb5_rc_io_creat, krb5_rc_io_open): Use Windows path
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index dd5d8e73a..bf11e8ff9 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -11,7 +11,7 @@
  * I/O functions for the replay cache default implementation.
  */
 
-#ifdef _WINDOWS
+#if defined(_MSDOS) || defined(_WIN32)
 #  define PATH_SEPARATOR "\\"
 #else
 #  define PATH_SEPARATOR "/"
@@ -60,7 +60,7 @@ static void getdir()
  if (!dirlen)
   {
    if (!(dir = getenv("KRB5RCACHEDIR")))
-#ifdef _WINDOWS
+#if defined(_MSDOS) || defined(_WIN32)
      if (!(dir = getenv("TEMP")))
 	 if (!(dir = getenv("TMP")))
 	     dir = "C:\\";