* ad_print.c, g_in_tkt.c, g_pw_in_tkt.c, kadm_net.c, klog.c:

	* kuserok.c, log.c, memcache.c, netread.c, netwrite.c:
	* password_to_key.c, recvauth.c, stime.c, tkt_string.c:
	Change _WINDOWS to _WIN32 in many places.  Update copyright
	notices.  Remove _WINDOWS handling completely in a few places
	where it's not needed.

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

15 files changed, 225 insertions, 78 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index b5e1fd40e..0f3d1d662 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-13  Tom Yu  <tlyu@mit.edu>
+
+	* ad_print.c, g_in_tkt.c, g_pw_in_tkt.c, kadm_net.c, klog.c:
+	* kuserok.c, log.c, memcache.c, netread.c, netwrite.c:
+	* password_to_key.c, recvauth.c, stime.c, tkt_string.c: 
+	Change _WINDOWS to _WIN32 in many places.  Update copyright
+	notices.  Remove _WINDOWS handling completely in a few places
+	where it's not needed.
+
 2002-12-12  Tom Yu  <tlyu@mit.edu>
 
 	* FSp-glue.c: Extracted and ported from various files from KfM.
diff --git a/src/lib/krb4/ad_print.c b/src/lib/krb4/ad_print.c
index 7d6de43b4..632957208 100644
--- a/src/lib/krb4/ad_print.c
+++ b/src/lib/krb4/ad_print.c
@@ -1,22 +1,36 @@
 /*
- * ad_print.c
+ * lib/krb4/ad_print.c
  *
- * Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright 1988 by the Massachusetts Institute of Technology.  All
+ * Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
- *
- * Miscellaneous debug printing utilities
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
 #include "krb.h"
 #include "des.h"
 #include "krb4int.h"
 #include <stdio.h>
 #include "port-sockets.h"
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 
 /*
  * Print some of the contents of the given authenticator structure
diff --git a/src/lib/krb4/g_in_tkt.c b/src/lib/krb4/g_in_tkt.c
index 09253daa8..e2b89552e 100644
--- a/src/lib/krb4/g_in_tkt.c
+++ b/src/lib/krb4/g_in_tkt.c
@@ -26,6 +26,7 @@
 
 #include "krb.h"
 #include "des.h"
+#include "krb4int.h"
 #include "prot.h"
 
 #include <string.h>
diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c
index 3396fcbd9..1aa22783f 100644
--- a/src/lib/krb4/g_pw_in_tkt.c
+++ b/src/lib/krb4/g_pw_in_tkt.c
@@ -1,13 +1,29 @@
 /*
- * g_pw_in_tkt.c
+ * lib/krb4/g_pw_in_tkt.c
  *
  * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
 #include <krb5.h>
 #include "krb.h"
 #include "krb_err.h"
@@ -52,7 +68,7 @@ passwd_to_key(user,instance,realm,passwd,key)
     char *user, *instance, *realm, *passwd;
     C_Block key;
 {
-#if defined(_WINDOWS) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
     string_to_key(passwd, key);
 #else /* unix */
 #ifdef NOENCRYPTION
@@ -99,7 +115,7 @@ krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
     int life;
     char *password;
 {
-#if defined(_WINDOWS) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
     /* In spite of the comments above, we don't allow that path here,
        to simplify coding the non-UNIX clients. The only code that now
        depends on this behavior is the preauth support, which has a
@@ -154,7 +170,7 @@ krb_get_pw_in_tkt_preauth(user,instance,realm,service,sinstance,life,password)
    int   preauth_len;
    int   ret_st;
 
-#if defined(_WINDOWS) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
    /* On non-Unix systems, we can't handle a null password, because
       passwd_to_key can't handle prompting for the password.  */
    if (password == 0)
diff --git a/src/lib/krb4/kadm_net.c b/src/lib/krb4/kadm_net.c
index 37a660319..781ec82da 100644
--- a/src/lib/krb4/kadm_net.c
+++ b/src/lib/krb4/kadm_net.c
@@ -1,5 +1,5 @@
 /*
- * kadm_net.c
+ * lib/krb4/kadm_net.c
  *
  * Copyright 1988, 2002 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -44,17 +44,17 @@
 #include "prot.h"
 
 /* XXX FIXME! */
-#if defined(_WINDOWS) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
 	#define SIGNAL(s, f) 0
 #else
 	#define SIGNAL(s, f) signal(s, f)
-	extern int errno;
 #endif
 
 static void clear_secrets(des_cblock sess_key, Key_schedule sess_sched);
 /* XXX FIXME! */
+#ifdef SIGPIPE
 static sigtype (*opipe)();
-
+#endif
 
 /*
  * kadm_init_link
@@ -286,14 +286,18 @@ int kadm_cli_conn(Kadm_Client *client_parm)
 
 	return KADM_NO_CONN;		/* couldnt get the connect */
     }
+#ifdef SIGPIPE
     opipe = SIGNAL(SIGPIPE, SIG_IGN);
+#endif
     client_parm->my_addr_len = sizeof(client_parm->my_addr);
     if (SOCKET_GETSOCKNAME(client_parm->admin_fd,
 		    (struct sockaddr *) & client_parm->my_addr,
 		    &client_parm->my_addr_len) < 0) {
 	(void) SOCKET_CLOSE(client_parm->admin_fd);
 	client_parm->admin_fd = -1;
+#ifdef SIGPIPE
 	(void) SIGNAL(SIGPIPE, opipe);
+#endif
 	return KADM_NO_HERE;		/* couldnt find out who we are */
     }
 #if 0
@@ -301,7 +305,9 @@ int kadm_cli_conn(Kadm_Client *client_parm)
 		   sizeof(on)) < 0) {
 	(void) closesocket(client_parm.admin_fd);
 	client_parm.admin_fd = -1;
+#ifdef SIGPIPE
 	(void) SIGNAL(SIGPIPE, opipe);
+#endif
 	return KADM_NO_CONN;		/* XXX */
     }
 #endif
@@ -311,7 +317,9 @@ int kadm_cli_conn(Kadm_Client *client_parm)
 void kadm_cli_disconn(Kadm_Client *client_parm)
 {
     (void) SOCKET_CLOSE(client_parm->admin_fd);
+#ifdef SIGPIPE
     (void) SIGNAL(SIGPIPE, opipe);
+#endif
     return;
 }
 
diff --git a/src/lib/krb4/klog.c b/src/lib/krb4/klog.c
index 29778c4c5..aa2b5f8c9 100644
--- a/src/lib/krb4/klog.c
+++ b/src/lib/krb4/klog.c
@@ -1,19 +1,34 @@
 /*
- * klog.c
+ * lib/krb4/klog.c
  *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
+ * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute of
+ * Technology.  All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
 #include "krb.h"
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
-#if !defined(VMS) && !defined(_WINDOWS)
+#if !defined(VMS) && !defined(_WIN32)
 #include <sys/time.h>
 #endif
 #include <stdio.h>
diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c
index f94ee8101..615bd3365 100644
--- a/src/lib/krb4/kuserok.c
+++ b/src/lib/krb4/kuserok.c
@@ -1,19 +1,35 @@
 /*
- * kuserok.c
+ * lib/krb4/kuserok.c
  *
  * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  *
  * kuserok: check if a kerberos principal has
  * access to a local account
  */
 
-#include "mit-copyright.h"
 #include "krb.h"
 
-#if !defined(_WINDOWS)
+#if !defined(_WIN32)
 
 #include <stdio.h>
 #include <pwd.h>
diff --git a/src/lib/krb4/log.c b/src/lib/krb4/log.c
index aabcf83cc..850cbfb82 100644
--- a/src/lib/krb4/log.c
+++ b/src/lib/krb4/log.c
@@ -1,11 +1,27 @@
 /*
- * log.c
+ * lib/krb4/log.c
  *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
+ * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute of
+ * Technology.  All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
 #ifdef KRB_CRYPT_DEBUG
@@ -14,12 +30,11 @@
    krb_set_logfile, or change all the invokers. */
 #endif
 
-#include "mit-copyright.h"
 #include "krb.h"
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
-#if !defined(VMS) && !defined(_WINDOWS)
+#if !defined(VMS) && !defined(_WIN32)
 #include <sys/time.h>
 #endif
 #include <stdio.h>
diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c
index ea5f1eeaa..77fe0ed50 100644
--- a/src/lib/krb4/memcache.c
+++ b/src/lib/krb4/memcache.c
@@ -14,7 +14,7 @@
 
 #include "krb.h"
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <errno.h>
 
 typedef DWORD OSErr;
@@ -55,11 +55,11 @@ typedef int OSErr;
 static	int		fNumSessions = 0;
 static	Session		**fSessions = 0;
 
-#ifndef _WINDOWS
+#ifndef _WIN32
 #define change_cache()
 #endif
 
-#if defined (_WINDOWS) || defined (unix)
+#if defined (_WIN32) || defined (unix)
 /* Fake Mac handles up for general use.  */
 #define	Handle	char **
 #define	Size	int
@@ -164,7 +164,7 @@ MemError()
 
 #endif /* Windows || unix */
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 /*
  * change_cache should be called after the cache changes.
diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c
index 49edaade4..140bca3b1 100644
--- a/src/lib/krb4/netread.c
+++ b/src/lib/krb4/netread.c
@@ -1,21 +1,34 @@
 /*
- * netread.c
+ * lib/krb4/netwrite.c
  *
  * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
 #include <errno.h>
 #include "krb.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifndef _WINDOWS
-extern int errno;
-#endif
 #include "port-sockets.h"
 
 /*
diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c
index 975d76ba7..18468db6b 100644
--- a/src/lib/krb4/netwrite.c
+++ b/src/lib/krb4/netwrite.c
@@ -1,13 +1,29 @@
 /*
- * netwrite.c
+ * lib/krb4/netwrite.c
  *
  * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
 #include <errno.h>
 #include "krb.h"
 #ifdef HAVE_UNISTD_H
@@ -15,10 +31,6 @@
 #endif
 #include "port-sockets.h"
 
-#ifndef _WINDOWS
-extern int errno;
-#endif
-
 /*
  * krb_net_write() writes "len" bytes from "buf" to the file
  * descriptor "fd".  It returns the number of bytes written or
diff --git a/src/lib/krb4/password_to_key.c b/src/lib/krb4/password_to_key.c
index be307a42d..e488eb238 100644
--- a/src/lib/krb4/password_to_key.c
+++ b/src/lib/krb4/password_to_key.c
@@ -1,5 +1,5 @@
 /*
- * password_to_key.c -- password_to_key functions merged from KfM
+ * lib/krb4/password_to_key.c
  *
  * Copyright 1999, 2002 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -22,6 +22,8 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
+ *
+ * password_to_key functions merged from KfM
  */
 
 #include <string.h>
@@ -101,7 +103,7 @@ mit_passwd_to_key(char *user, char *instance, char *realm,
 
     if (passwd)
         mit_string_to_key(passwd, key);
-#if !(defined(_WINDOWS) || defined(macintosh))
+#if !(defined(_WIN32) || defined(macintosh))
     else {
         des_read_password((C_Block *)key, "Password: ", 0);
     }
@@ -137,7 +139,7 @@ afs_passwd_to_key(char *user, char *instance, char *realm,
 
     if (passwd)
         afs_string_to_key(passwd, realm, key);
-#if !(defined(_WINDOWS) || defined(macintosh))
+#if !(defined(_WIN32) || defined(macintosh))
     else {
         des_read_password((C_Block *)key, "Password: ", 0);
     }
diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c
index a205ec6a4..220fbd948 100644
--- a/src/lib/krb4/recvauth.c
+++ b/src/lib/krb4/recvauth.c
@@ -1,14 +1,29 @@
 /*
- * recvauth.c
+ * lib/krb4/recvauth.c
  *
  * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
-
 #include "krb.h"
 #include <errno.h>
 #include <stdio.h>
@@ -31,10 +46,6 @@
  * be sure to support old versions of krb_sendauth!
  */
 
-#ifndef _WINDOWS
-extern int errno;
-#endif
-
 /*
  * krb_recvauth() reads (and optionally responds to) a message sent
  * using krb_sendauth().  The "options" argument is a bit-field of
diff --git a/src/lib/krb4/stime.c b/src/lib/krb4/stime.c
index eea8ffe05..92c86895e 100644
--- a/src/lib/krb4/stime.c
+++ b/src/lib/krb4/stime.c
@@ -1,18 +1,33 @@
 /*
- * stime.c
+ * lib/krb4/stime.c
  *
- * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
- * of Technology.
+ * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute of
+ * Technology.  All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <mit-copyright.h>.
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
  */
 
-#include "mit-copyright.h"
 #include "krb.h"
 #include "krb4int.h"
 #include <stdio.h>                      /* for sprintf() */
-#ifndef _WINDOWS
+#ifndef _WIN32
 #include <time.h>
 #include <sys/time.h>
 #endif
diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c
index 36625fc0b..f6bfd15bc 100644
--- a/src/lib/krb4/tkt_string.c
+++ b/src/lib/krb4/tkt_string.c
@@ -38,10 +38,10 @@ char *getenv();
 #endif
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 typedef unsigned long uid_t;
 uid_t getuid(void) { return 0; }
-#endif /* _WINDOWS */
+#endif /* _WIN32 */
 
 /*
  * This routine is used to generate the name of the file that holds