Windows/NT integration (V1_0_WIN32_BRANCH merge)

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

5 files changed, 48 insertions, 86 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 30fd1c3c2..1456356a1 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,16 @@
+Tue Feb  4 15:55:11 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only override the object build of the error table
+		under Unix
+
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* gssapi.hin, gssapi_generic.c, gssapi_generic.h:
+	DLL export all public gssapi functions; move windows/mac stuff to
+	win-mac.h
+
 Wed Nov 20 13:59:58 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (install): Install gssapi.h from the build tree.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 87b414f47..4b652734e 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSMYNAME=generic
+##DOSOBJFILE=..\generic.lst
+##WIN16##LIBNAME=..\gssapi.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -18,17 +20,21 @@ ETHDRS= gssapi_err_generic.h
 
 EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 
-HDRS=	$(EHDRDIR)/gssapi.h \
-	$(EHDRDIR)/gssapi_generic.h
+HDRS=	$(EHDRDIR)$(S)gssapi.h \
+	$(EHDRDIR)$(S)gssapi_generic.h
 
-gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
+$(EHDRDIR)$(S)gssapi.h: gssapi.h
+	$(CP) gssapi.h $@
+$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
+	$(CP) $(srcdir)$(S)gssapi_generic.h $@
+
+gssapi_err_generic.o: gssapi_err_generic.c
 	$(CC) $(CFLAGS) -c $*.c
+
 @SHARED_RULE_LOCAL@
-##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
 
+gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et
-
 gssapi_err_generic.c: gssapi_err_generic.et
 
 gssapi.h: gssapi.hin
@@ -83,22 +89,22 @@ OBJS = \
 	util_validate.$(OBJEXT) \
 	gssapi_err_generic.$(OBJEXT)
 
-$(OBJS): $(HDRS) $(ETHDRS)
-
 EXPORTED_HEADERS= gssapi_generic.h
 EXPORTED_BUILT_HEADERS= gssapi.h
 
-all-unix:: shared $(SRCS) $(ETHDRS) $(OBJS)
+$(OBJS): $(EXPORTED_HEADERS) $(ETHDRS)
 
+all-unix:: shared $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
 all-mac:: $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
+all-windows:: win-include $(HDRS) $(OBJFILE)
 
-all-windows:: $(SRCS) $(ETHDRS) win-include
-all-windows:: $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-	copy gssapi.h $(EHDRDIR)
-	copy gssapi_generic.h $(EHDRDIR)
 
 unixmac: $(SRCS) $(ETHDRS)
 
@@ -109,7 +115,7 @@ clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/*
 
 clean-windows::
-	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
+	$(RM) $(HDRS) $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 4d2e14d00..685b8aa7b 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -26,82 +26,25 @@
 /*
  * Determine platform-dependent configuration.
  */
-#if defined(_MSDOS) || defined(_WIN32)
-
-#ifdef _MSDOS
-	/* Windows 16 definition */
-
-#define GSS_SIZEOF_INT      2
-#define GSS_SIZEOF_SHORT    2
-#define GSS_SIZEOF_LONG     4
-
-#ifndef FAR
-#define FAR	_far
-#define NEAR	_near
-#endif
-
-#ifndef KRB5_CALLCONV
-#define KRB5_CALLCONV __far __export __pascal
-#define KRB5_CALLCONV_C __far __export __cdecl
-#define KRB5_DLLIMP
-#define INTERFACE   KRB5_CALLCONV
-#define INTERFACE_C KRB5_CALLCONV_C
-#endif /* !KRB5_CALLCONV */
-	
-#else
-	/* Windows 32 specific definitions */
-#define GSS_SIZEOF_INT      4
-#define GSS_SIZEOF_SHORT    2
-#define GSS_SIZEOF_LONG     4
 
-#ifndef KRB5_CALLCONV
-#ifdef KRB5_DLL_FILE
-#define KRB5_DECLSPEC dllexport
-#else
-#define KRB5_DECLSPEC dllimport
-#endif
-#define KRB5_DLLIMP __declspec(KRB5_DECLSPEC)
-#define KRB5_CALLCONV __stdcall
-#define KRB5_CALLCONV_C __cdecl
-#define INTERFACE   KRB5_DLLIMP KRB5_CALLCONV
-#define INTERFACE_C KRB5_DLLIMP KRB5_CALLCONV_C
-#endif /* !KRB5_CALLCONV */
-
-#include <windows.h>
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#define _SIZE_T_DEFINED
-#endif /* _SIZE_T_DEFINED */
-
-#ifndef _UID_T_DEFINED
-typedef unsigned int uid_t;
-#define _UID_T_DEFINED
+#if defined(_MSDOS) || defined(_WIN32)
+#include <win-mac.h>
 #endif
-#else /* _MSDOS_ */
 
 #ifndef KRB5_CALLCONV
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
 #define KRB5_DLLIMP
-#define INTERFACE
-#define INTERFACE_C
+#endif
+
+#ifndef FAR
 #define FAR
 #define NEAR
-#endif /* !KRB5_CALLCONV */
+#endif
 
 #define	GSS_SIZEOF_INT		SIZEOF_INT
 #define	GSS_SIZEOF_LONG		SIZEOF_LONG
 #define	GSS_SIZEOF_SHORT	SIZEOF_SHORT
-#endif /* _MSDOS */
-
-#ifndef FAR
-#define FAR
-#endif
-#ifndef NEAR
-#define NEAR
-#endif
 
 /*
  * Make sure we have a definition for PROTOTYPE.
diff --git a/src/lib/gssapi/generic/gssapi_generic.c b/src/lib/gssapi/generic/gssapi_generic.c
index 7072329b7..b078104d2 100644
--- a/src/lib/gssapi/generic/gssapi_generic.c
+++ b/src/lib/gssapi/generic/gssapi_generic.c
@@ -53,7 +53,7 @@ static gss_OID_desc oids[] = {
    {10, "\052\206\110\206\367\022\001\002\001\004"},
 };
 
-gss_OID gss_nt_user_name = oids+0;
-gss_OID gss_nt_machine_uid_name = oids+1;
-gss_OID gss_nt_string_uid_name = oids+2;
-gss_OID gss_nt_service_name = oids+3;
+KRB5_DLLIMP gss_OID gss_nt_user_name = oids+0;
+KRB5_DLLIMP gss_OID gss_nt_machine_uid_name = oids+1;
+KRB5_DLLIMP gss_OID gss_nt_string_uid_name = oids+2;
+KRB5_DLLIMP gss_OID gss_nt_service_name = oids+3;
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index 09a9810b0..7b48d396f 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -33,9 +33,9 @@
 #include <gssapi/gssapi.h>
 #endif
 
-extern gss_OID gss_nt_user_name;
-extern gss_OID gss_nt_machine_uid_name;
-extern gss_OID gss_nt_string_uid_name;
-extern gss_OID gss_nt_service_name;
+KRB5_DLLIMP extern gss_OID gss_nt_user_name;
+KRB5_DLLIMP extern gss_OID gss_nt_machine_uid_name;
+KRB5_DLLIMP extern gss_OID gss_nt_string_uid_name;
+KRB5_DLLIMP extern gss_OID gss_nt_service_name;
 
 #endif /* _GSSAPI_GENERIC_H_ */