diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-06-12 05:02:19 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-06-12 05:02:19 +0000 |
| commit | 785158e36cda245184391a15c41b577b3847f4d3 (patch) | |
| tree | c87708c5e8052e309dca4aba471d61646d4564f9 /src/lib | |
| parent | 7fe06f597ae2a820786d59cd716357f74ae1b8a2 (diff) | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/kadm/adm_conn.c | 4 | ||||
| -rw-r--r-- | src/lib/kadm/adm_kw_dec.c | 2 | ||||
| -rw-r--r-- | src/lib/kadm/adm_kw_enc.c | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index d8939ac92..e7c6c98ac 100644 --- 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 3b737a087..1534b4b02 100644 --- 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 83c9395ae..35097383b 100644 --- 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); } -#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 3a0741c10..b98725f91 100644 --- 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); } -#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. |