diff -u -r -b -H krb5-1.2.3-orig/src/appl/bsd/login.c krb5-1.2.3/src/appl/bsd/login.c --- krb5-1.2.3-orig/src/appl/bsd/login.c Wed Jan 9 17:26:49 2002 +++ krb5-1.2.3/src/appl/bsd/login.c Tue Feb 5 20:20:54 2002 @@ -295,7 +295,11 @@ char term[64], *hostname, *username; +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #ifdef KRB4 #define KRB_ENVIRON "KRBTKFILE" /* Ticket file environment variable */ diff -u -r -b -H krb5-1.2.3-orig/src/kadmin/dbutil/kdb5_destroy.c krb5-1.2.3/src/kadmin/dbutil/kdb5_destroy.c --- krb5-1.2.3-orig/src/kadmin/dbutil/kdb5_destroy.c Wed Jan 9 17:27:12 2002 +++ krb5-1.2.3/src/kadmin/dbutil/kdb5_destroy.c Tue Feb 5 20:21:16 2002 @@ -35,7 +35,11 @@ #include #include +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif extern int exit_status; extern krb5_boolean dbactive; extern kadm5_config_params global_params; diff -u -r -b -H krb5-1.2.3-orig/src/kadmin/dbutil/kdb5_stash.c krb5-1.2.3/src/kadmin/dbutil/kdb5_stash.c --- krb5-1.2.3-orig/src/kadmin/dbutil/kdb5_stash.c Wed Jan 9 17:27:12 2002 +++ krb5-1.2.3/src/kadmin/dbutil/kdb5_stash.c Tue Feb 5 20:21:23 2002 @@ -58,7 +58,11 @@ #include #include +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif extern krb5_keyblock master_keyblock; extern krb5_principal master_princ; diff -u -r -b -H krb5-1.2.3-orig/src/kadmin/v4server/acl_files.c krb5-1.2.3/src/kadmin/v4server/acl_files.c --- krb5-1.2.3-orig/src/kadmin/v4server/acl_files.c Wed Jan 9 17:27:22 2002 +++ krb5-1.2.3/src/kadmin/v4server/acl_files.c Tue Feb 5 20:21:41 2002 @@ -50,7 +50,11 @@ #define COR(a,b) ((a!=NULL)?(a):(b)) +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #ifndef HAVE_STDLIB_H extern char *malloc(), *calloc(); diff -u -r -b -H krb5-1.2.3-orig/src/kadmin/v4server/admin_server.c krb5-1.2.3/src/kadmin/v4server/admin_server.c --- krb5-1.2.3-orig/src/kadmin/v4server/admin_server.c Wed Jan 9 17:27:22 2002 +++ krb5-1.2.3/src/kadmin/v4server/admin_server.c Tue Feb 5 20:22:02 2002 @@ -269,7 +269,9 @@ */ kadm_listen() { +#ifndef __CYGWIN__ extern int errno; +#endif int found; int admin_fd; int peer_fd; diff -u -r -b -H krb5-1.2.3-orig/src/kdc/kerberos_v4.c krb5-1.2.3/src/kdc/kerberos_v4.c --- krb5-1.2.3-orig/src/kdc/kerberos_v4.c Wed Jan 9 17:27:28 2002 +++ krb5-1.2.3/src/kdc/kerberos_v4.c Tue Feb 5 20:22:08 2002 @@ -66,7 +66,11 @@ #include #include +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif static int compat_decrypt_key PROTOTYPE((krb5_key_data *, C_Block, krb5_keyblock *, int)); diff -u -r -b -H krb5-1.2.3-orig/src/kdc/network.c krb5-1.2.3/src/kdc/network.c --- krb5-1.2.3-orig/src/kdc/network.c Wed Jan 9 17:27:28 2002 +++ krb5-1.2.3/src/kdc/network.c Tue Feb 5 20:22:13 2002 @@ -55,7 +55,11 @@ #include #endif +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif static int *udp_port_fds = (int *) NULL; static u_short *udp_port_nums = (u_short *) NULL; diff -u -r -b -H krb5-1.2.3-orig/src/lib/des425/quad_cksum.c krb5-1.2.3/src/lib/des425/quad_cksum.c --- krb5-1.2.3-orig/src/lib/des425/quad_cksum.c Wed Jan 9 17:27:42 2002 +++ krb5-1.2.3/src/lib/des425/quad_cksum.c Tue Feb 5 20:22:25 2002 @@ -102,7 +102,11 @@ /* Externals */ extern char *errmsg(); #ifndef HAVE_ERRNO +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #endif extern int des_debug; diff -u -r -b -H krb5-1.2.3-orig/src/lib/des425/verify.c krb5-1.2.3/src/lib/des425/verify.c --- krb5-1.2.3-orig/src/lib/des425/verify.c Wed Jan 9 17:27:42 2002 +++ krb5-1.2.3/src/lib/des425/verify.c Tue Feb 5 20:22:32 2002 @@ -37,7 +37,11 @@ #include "./des.h" extern char *errmsg(); +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif extern int des_string_to_key(); extern int des_key_sched(); extern int des_ecb_encrypt(); diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/dest_tkt.c krb5-1.2.3/src/lib/krb4/dest_tkt.c --- krb5-1.2.3-orig/src/lib/krb4/dest_tkt.c Wed Jan 9 17:27:49 2002 +++ krb5-1.2.3/src/lib/krb4/dest_tkt.c Tue Feb 5 20:22:48 2002 @@ -69,7 +69,9 @@ { char *file = TKT_FILE; int i,fd; +#ifndef __CYGWIN__ extern int errno; +#endif int ret; struct stat statpre, statpost; char buf[BUFSIZ]; diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/in_tkt.c krb5-1.2.3/src/lib/krb4/in_tkt.c --- krb5-1.2.3-orig/src/lib/krb4/in_tkt.c Wed Jan 9 17:27:50 2002 +++ krb5-1.2.3/src/lib/krb4/in_tkt.c Tue Feb 5 20:27:47 2002 @@ -35,7 +35,9 @@ #ifdef HAVE_UNISTD_H #include #endif - +#ifdef __CYGWIN__ +#include +#endif extern int krb_debug; /* diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/netread.c krb5-1.2.3/src/lib/krb4/netread.c --- krb5-1.2.3-orig/src/lib/krb4/netread.c Wed Jan 9 17:27:50 2002 +++ krb5-1.2.3/src/lib/krb4/netread.c Tue Feb 5 20:22:54 2002 @@ -12,7 +12,11 @@ #define DEFINE_SOCKADDR #include "krb.h" #ifndef _WINDOWS +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #endif /* diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/netwrite.c krb5-1.2.3/src/lib/krb4/netwrite.c --- krb5-1.2.3-orig/src/lib/krb4/netwrite.c Wed Jan 9 17:27:50 2002 +++ krb5-1.2.3/src/lib/krb4/netwrite.c Tue Feb 5 20:23:01 2002 @@ -12,7 +12,11 @@ #define DEFINE_SOCKADDR #include "krb.h" #ifndef _WINDOWS +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #endif /* diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/recvauth.c krb5-1.2.3/src/lib/krb4/recvauth.c --- krb5-1.2.3-orig/src/lib/krb4/recvauth.c Wed Jan 9 17:27:50 2002 +++ krb5-1.2.3/src/lib/krb4/recvauth.c Tue Feb 5 20:23:08 2002 @@ -26,7 +26,11 @@ */ #ifndef _WINDOWS +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #endif /* diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/send_to_kdc.c krb5-1.2.3/src/lib/krb4/send_to_kdc.c --- krb5-1.2.3-orig/src/lib/krb4/send_to_kdc.c Wed Jan 9 17:27:50 2002 +++ krb5-1.2.3/src/lib/krb4/send_to_kdc.c Tue Feb 5 23:10:50 2002 @@ -19,6 +19,10 @@ #include #endif +#ifdef __CYGWIN__ +#include +#endif + #define S_AD_SZ sizeof(struct sockaddr_in) #ifdef HAVE_STDLIB_H diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb4/tf_util.c krb5-1.2.3/src/lib/krb4/tf_util.c --- krb5-1.2.3-orig/src/lib/krb4/tf_util.c Wed Jan 9 17:27:50 2002 +++ krb5-1.2.3/src/lib/krb4/tf_util.c Tue Feb 5 20:23:14 2002 @@ -46,7 +46,11 @@ #define TF_LCK_RETRY ((unsigned)2) /* seconds to sleep before * retry if ticket file is * locked */ +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif extern int krb_debug; void tf_close(); diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/keytab/file/ktf_util.c krb5-1.2.3/src/lib/krb5/keytab/file/ktf_util.c --- krb5-1.2.3-orig/src/lib/krb5/keytab/file/ktf_util.c Wed Jan 9 17:27:55 2002 +++ krb5-1.2.3/src/lib/krb5/keytab/file/ktf_util.c Tue Feb 5 20:23:23 2002 @@ -98,7 +98,11 @@ #endif #ifndef HAVE_ERRNO +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #endif static krb5_error_code diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/keytab/srvtab/kts_util.c krb5-1.2.3/src/lib/krb5/keytab/srvtab/kts_util.c --- krb5-1.2.3-orig/src/lib/krb5/keytab/srvtab/kts_util.c Wed Jan 9 17:27:56 2002 +++ krb5-1.2.3/src/lib/krb5/keytab/srvtab/kts_util.c Tue Feb 5 20:23:29 2002 @@ -53,7 +53,12 @@ #define INST_SZ 40 #ifndef HAVE_ERRNO +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif + #endif static krb5_error_code diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/os/c_ustime.c krb5-1.2.3/src/lib/krb5/os/c_ustime.c --- krb5-1.2.3-orig/src/lib/krb5/os/c_ustime.c Wed Jan 9 17:27:58 2002 +++ krb5-1.2.3/src/lib/krb5/os/c_ustime.c Tue Feb 5 20:23:34 2002 @@ -325,7 +325,11 @@ /* We're a Unix machine -- do Unix time things. */ +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif static struct timeval last_tv = {0, 0}; diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/os/localaddr.c krb5-1.2.3/src/lib/krb5/os/localaddr.c --- krb5-1.2.3-orig/src/lib/krb5/os/localaddr.c Wed Jan 9 17:27:58 2002 +++ krb5-1.2.3/src/lib/krb5/os/localaddr.c Tue Feb 5 20:23:39 2002 @@ -77,7 +77,11 @@ * Add more address families here. */ +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif /* * Return all the protocol addresses of this host. diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/os/timeofday.c krb5-1.2.3/src/lib/krb5/os/timeofday.c --- krb5-1.2.3-orig/src/lib/krb5/os/timeofday.c Wed Jan 9 17:27:58 2002 +++ krb5-1.2.3/src/lib/krb5/os/timeofday.c Tue Feb 5 20:23:45 2002 @@ -33,7 +33,11 @@ #include #ifndef HAVE_ERRNO +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #endif KRB5_DLLIMP krb5_error_code KRB5_CALLCONV diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/posix/syslog.c krb5-1.2.3/src/lib/krb5/posix/syslog.c --- krb5-1.2.3-orig/src/lib/krb5/posix/syslog.c Wed Jan 9 17:27:58 2002 +++ krb5-1.2.3/src/lib/krb5/posix/syslog.c Tue Feb 5 20:23:56 2002 @@ -89,7 +89,9 @@ const register char *fmt; va_list ap; { +#ifndef __CYGWIN__ extern int errno; +#endif register int cnt; register char *p; time_t now, time(); diff -u -r -b -H krb5-1.2.3-orig/src/lib/krb5/rcache/rc_io.c krb5-1.2.3/src/lib/krb5/rcache/rc_io.c --- krb5-1.2.3-orig/src/lib/krb5/rcache/rc_io.c Wed Jan 9 17:27:58 2002 +++ krb5-1.2.3/src/lib/krb5/rcache/rc_io.c Tue Feb 5 20:24:03 2002 @@ -40,7 +40,11 @@ #endif #ifndef HAVE_ERRNO -extern int errno; /* this should be in errno.h, but isn't on some systems */ +#ifndef __CYGWIN__ +extern int errno; +#else +#include +#endif #endif #define FREE(x) ((void) free((char *) (x))) diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/bindresvport.c krb5-1.2.3/src/lib/rpc/bindresvport.c --- krb5-1.2.3-orig/src/lib/rpc/bindresvport.c Wed Jan 9 17:27:58 2002 +++ krb5-1.2.3/src/lib/rpc/bindresvport.c Tue Feb 5 20:24:13 2002 @@ -48,7 +48,9 @@ int res; static short port; struct sockaddr_in myaddr; +#ifndef __CYGWIN__ extern int errno; +#endif int i; #define STARTPORT 600 diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/clnt_tcp.c krb5-1.2.3/src/lib/rpc/clnt_tcp.c --- krb5-1.2.3-orig/src/lib/rpc/clnt_tcp.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/clnt_tcp.c Tue Feb 5 20:24:19 2002 @@ -59,7 +59,11 @@ #define MCALL_MSG_SIZE 24 +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif static int readtcp(); static int writetcp(); diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/clnt_udp.c krb5-1.2.3/src/lib/rpc/clnt_udp.c --- krb5-1.2.3-orig/src/lib/rpc/clnt_udp.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/clnt_udp.c Tue Feb 5 20:24:23 2002 @@ -48,7 +48,11 @@ #include #include +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif /* * UDP bases client side rpc operations diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/pmap_getmaps.c krb5-1.2.3/src/lib/rpc/pmap_getmaps.c --- krb5-1.2.3-orig/src/lib/rpc/pmap_getmaps.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/pmap_getmaps.c Tue Feb 5 20:24:28 2002 @@ -55,7 +55,11 @@ #define NAMELEN 255 #define MAX_BROADCAST_SIZE 1400 +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif /* * Get a copy of the current port maps. diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/pmap_rmt.c krb5-1.2.3/src/lib/rpc/pmap_rmt.c --- krb5-1.2.3-orig/src/lib/rpc/pmap_rmt.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/pmap_rmt.c Tue Feb 5 20:24:33 2002 @@ -58,7 +58,11 @@ #include #define MAX_BROADCAST_SIZE 1400 +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif static struct timeval timeout = { 3, 0 }; diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/svc.c krb5-1.2.3/src/lib/rpc/svc.c --- krb5-1.2.3-orig/src/lib/rpc/svc.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/svc.c Tue Feb 5 20:24:38 2002 @@ -46,7 +46,11 @@ #include #include +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif #ifdef FD_SETSIZE static SVCXPRT **xports; diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/svc_auth_gssapi.c krb5-1.2.3/src/lib/rpc/svc_auth_gssapi.c --- krb5-1.2.3-orig/src/lib/rpc/svc_auth_gssapi.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/svc_auth_gssapi.c Tue Feb 5 20:24:45 2002 @@ -115,7 +115,11 @@ static client_list *clients = NULL; +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif enum auth_stat _svcauth_gssapi(rqst, msg, no_dispatch) register struct svc_req *rqst; diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/svc_run.c krb5-1.2.3/src/lib/rpc/svc_run.c --- krb5-1.2.3-orig/src/lib/rpc/svc_run.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/svc_run.c Tue Feb 5 20:24:58 2002 @@ -47,7 +47,9 @@ #else int readfds; #endif /* def FD_SETSIZE */ +#ifndef __CYGWIN__ extern int errno; +#endif for (;;) { #ifdef FD_SETSIZE diff -u -r -b -H krb5-1.2.3-orig/src/lib/rpc/svc_udp.c krb5-1.2.3/src/lib/rpc/svc_udp.c --- krb5-1.2.3-orig/src/lib/rpc/svc_udp.c Wed Jan 9 17:27:59 2002 +++ krb5-1.2.3/src/lib/rpc/svc_udp.c Tue Feb 5 20:25:04 2002 @@ -72,7 +72,11 @@ svcudp_destroy }; +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif /* * kept in xprt->xp_p2 diff -u -r -b -H krb5-1.2.3-orig/src/tests/dejagnu/t_inetd.c krb5-1.2.3/src/tests/dejagnu/t_inetd.c --- krb5-1.2.3-orig/src/tests/dejagnu/t_inetd.c Wed Jan 9 17:28:18 2002 +++ krb5-1.2.3/src/tests/dejagnu/t_inetd.c Tue Feb 5 20:25:09 2002 @@ -55,7 +55,12 @@ #include "com_err.h" +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif + char *progname; diff -u -r -b -H krb5-1.2.3-orig/src/util/db2/clib/mkstemp.c krb5-1.2.3/src/util/db2/clib/mkstemp.c --- krb5-1.2.3-orig/src/util/db2/clib/mkstemp.c Wed Jan 9 17:28:29 2002 +++ krb5-1.2.3/src/util/db2/clib/mkstemp.c Tue Feb 5 20:25:19 2002 @@ -61,7 +61,9 @@ char *path; register int *doopen; { +#ifndef __CYGWIN__ extern int errno; +#endif register char *start, *trv; struct stat sbuf; u_int pid; diff -u -r -b -H krb5-1.2.3-orig/src/util/db2/test/SEQ_TEST/t.c krb5-1.2.3/src/util/db2/test/SEQ_TEST/t.c --- krb5-1.2.3-orig/src/util/db2/test/SEQ_TEST/t.c Wed Jan 9 17:28:33 2002 +++ krb5-1.2.3/src/util/db2/test/SEQ_TEST/t.c Tue Feb 5 20:25:25 2002 @@ -8,7 +8,11 @@ #include #include +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif void main(int argc, char *argv[]) { char id1[] = {" "}, id2[] = {" "}; diff -u -r -b -H krb5-1.2.3-orig/src/util/et/compile_et.c krb5-1.2.3/src/util/et/compile_et.c --- krb5-1.2.3-orig/src/util/et/compile_et.c Wed Jan 9 17:28:36 2002 +++ krb5-1.2.3/src/util/et/compile_et.c Tue Feb 5 20:25:29 2002 @@ -29,7 +29,11 @@ /* C library */ extern char *malloc(); +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif /* lex stuff */ extern FILE *yyin; diff -u -r -b -H krb5-1.2.3-orig/src/util/pty/update_utmp.c krb5-1.2.3/src/util/pty/update_utmp.c --- krb5-1.2.3-orig/src/util/pty/update_utmp.c Wed Jan 9 17:28:37 2002 +++ krb5-1.2.3/src/util/pty/update_utmp.c Tue Feb 5 23:22:37 2002 @@ -344,6 +344,18 @@ #define PTY_ENDUTXENT endutent #endif +#ifdef __CYGWIN__ +#include +/* JALONSO: Don't have pututline, so make one up... */ +void pututline (struct utmp * newUtmp) { + FILE *utmpFile; + + utmpFile = fopen( UTMP_FILE, "a" ); + fwrite( ( void * ) newUtmp, sizeof( struct utmp ), 1, utmpFile ); + fclose( utmpFile ); +} +#endif + static int better(const PTY_STRUCT_UTMPX *, const PTY_STRUCT_UTMPX *, const PTY_STRUCT_UTMPX *); static int match_pid(const PTY_STRUCT_UTMPX *, diff -u -r -b -H krb5-1.2.3-orig/src/util/ss/help.c krb5-1.2.3/src/util/ss/help.c --- krb5-1.2.3-orig/src/util/ss/help.c Wed Jan 9 17:28:37 2002 +++ krb5-1.2.3/src/util/ss/help.c Tue Feb 5 20:25:34 2002 @@ -12,7 +12,11 @@ #include "ss_internal.h" #include "copyright.h" +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif void ss_help (argc, argv, sci_idx, info_ptr) int argc; diff -u -r -b -H krb5-1.2.3-orig/src/util/ss/pager.c krb5-1.2.3/src/util/ss/pager.c --- krb5-1.2.3-orig/src/util/ss/pager.c Wed Jan 9 17:28:38 2002 +++ krb5-1.2.3/src/util/ss/pager.c Tue Feb 5 20:25:39 2002 @@ -17,7 +17,11 @@ static char MORE[] = "more"; extern char *_ss_pager_name; extern char *getenv(); +#ifndef __CYGWIN__ extern int errno; +#else +#include +#endif /* * this needs a *lot* of work.... diff -u -r -b -H krb5-1.2.3-orig/src/util/ss/parse.c krb5-1.2.3/src/util/ss/parse.c --- krb5-1.2.3-orig/src/util/ss/parse.c Wed Jan 9 17:28:38 2002 +++ krb5-1.2.3/src/util/ss/parse.c Tue Feb 5 23:09:26 2002 @@ -7,6 +7,9 @@ #include "ss_internal.h" #include "copyright.h" +#ifdef __CYGWIN__ +#include +#endif enum parse_mode { WHITESPACE, TOKEN, QUOTED_STRING };