Change use of _WINDOWS to _MSDOS, and add check for _WIN32

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

diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index d8939ac92dd823cc8236a200f48bffb348ab128c..e7c6c98ac18cee2ed714407b13957d2a4bb50dc3 100644 (file)
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 10 21:42:26 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * adm_conn.c:
+       * adm_kw_dec.c:
+       * adm_kw_enc.c: Change use of _WINDOWS to _MSDOS, and add check
+               for _WIN32
+
 Tue May 21 20:51:06 1996  Sam Hartman  <hartmans@mit.edu>
 
        * Makefile.in (check-unix):  Use KRB5_RUN_FLAGS

diff --git a/src/lib/kadm/adm_conn.c b/src/lib/kadm/adm_conn.c
index 3b737a0872a0d4e2ca4502dc6344ee975757e0f8..1534b4b027661069f741d9f52e66c47b7ef90db3 100644 (file)
--- a/src/lib/kadm/adm_conn.c
+++ b/src/lib/kadm/adm_conn.c
@@ -127,7 +127,7 @@ kadm_get_ccache(kcontext, user, ccname, ccache, client)
        goto cleanup;
 
     if (!ccname) {
-#ifdef _WINDOWS
+#if defined(_MSDOS) || defined(_WIN32)
        strcpy (new_cache, "FILE:");
        GetTempFileName (0, "tkt", 0, new_cache+5);
 #else
@@ -136,7 +136,7 @@ kadm_get_ccache(kcontext, user, ccname, ccache, client)
 #else
        (void) sprintf(new_cache, kadm_cache_name_fmt, getpid());
 #endif /* _MACINTOSH */
-#endif /* _WINDOWS */
+#endif /* _MSDOS || _WIN32 */
     }
     else
        sprintf(new_cache, "FILE:%s", ccname);

diff --git a/src/lib/kadm/adm_kw_dec.c b/src/lib/kadm/adm_kw_dec.c
index 83c9395ae5762c0d2808b65e4b0be98413a89423..35097383bc2a0701596620ed9fecfc494628d878 100644 (file)
--- a/src/lib/kadm/adm_kw_dec.c
+++ b/src/lib/kadm/adm_kw_dec.c
@@ -226,7 +226,7 @@ decode_kw_tagged(dataentp, keyword, ntags, taglist, lenp, datap)
     return(kret);
 }
 \f
-#if ! defined(_WINDOWS) && ! defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
 /*
  * krb5_adm_proto_to_dbent()   - Convert external attribute list into a
  *                               database entry.

diff --git a/src/lib/kadm/adm_kw_enc.c b/src/lib/kadm/adm_kw_enc.c
index 3a0741c104e6e641adc6a569a5413e9bd2f3d4f3..b98725f91000111a414428581cd8f9c7d919b775 100644 (file)
--- a/src/lib/kadm/adm_kw_enc.c
+++ b/src/lib/kadm/adm_kw_enc.c
@@ -161,7 +161,7 @@ format_kw_tagged(datap, kwordp, ntags, taglist, vallen, val)
     return(retval);
 }
 \f
-#if ! defined(_WINDOWS) && ! defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
 /*
  * krb5_adm_dbent_to_proto()   - Convert database a database entry into
  *                               an external attribute list.