From: Robert S. Murawski <rsm4@cssd.pitt.edu>
Date: Sun, 24 Aug 2003 18:17:44 +0000 (+0000)
Subject: winnt-update-to-build-again-20030824
X-Git-Tag: openafs-devel-1_3_50~84
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=292a9377c9783a9ff7fd9bfbbc91690790c6ffe2;p=packages%2Fo%2Fopenafs.git

winnt-update-to-build-again-20030824


get things closer to building again for winnt port
---

diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index beae71dce..86af3a57b 100644
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -59,7 +59,7 @@ $(RXOBJS): $(RX)\$$(@B).c
 	$(C2OBJ) -I$(RX) $**
 
 $(IDLFILES):afsrpc.idl
-	midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /app_config $?
+	midl $(MIDL_FLAGS) /no_robust $(AFSDEV_AUXMIDLFLAGS) /app_config $?
 
 
 AFSDOBJS=\
diff --git a/src/WINNT/afsreg/NTMakefile b/src/WINNT/afsreg/NTMakefile
index 96c29d1f0..1b7e7e51a 100644
--- a/src/WINNT/afsreg/NTMakefile
+++ b/src/WINNT/afsreg/NTMakefile
@@ -11,7 +11,6 @@ INCFILES = \
 	$(DESTDIR)\include\WINNT\afsreg.h \
 	$(DESTDIR)\include\WINNT\syscfg.h \
 	$(DESTDIR)\include\WINNT\afssw.h \
-	$(DESTDIR)\include\WINNT\osi_malloc.h \
 	$(DESTDIR)\include\WINNT\vptab.h
 
 
diff --git a/src/bucoord/NTMakefile b/src/bucoord/NTMakefile
index 6eb3f20fb..e13dcb54f 100644
--- a/src/bucoord/NTMakefile
+++ b/src/bucoord/NTMakefile
@@ -19,16 +19,13 @@ INCFILES = bc.h
 LIBFILE = $(DESTDIR)\lib\afs\afsbxdb.lib
 
 LIBOBJS =\
-	$(OJT)dsstub.obj \
-	$(OJT)ubik_db_if.obj \
-	$(OJT)status.obj \
-	$(OJT)dlq.obj \
-	$(OJT)bucoord_errs.obj \
-	$(OJT)volstub.obj \
-	$(OJT)AFS_component_version_number.obj
-
-$(LIBOBJS):$$(@B).c
-	$(C2OBJ) $**
+	$(OJT)/dsstub.obj \
+	$(OJT)/ubik_db_if.obj \
+	$(OJT)/status.obj \
+	$(OJT)/dlq.obj \
+	$(OJT)/bucoord_errs.obj \
+	$(OJT)/volstub.obj \
+	$(OJT)/AFS_component_version_number.obj
 
 $(LIBFILE): $(LIBOBJS)
 	$(LIBARCH)
@@ -40,30 +37,27 @@ $(LIBFILE): $(LIBOBJS)
 EXEFILE = $(DESTDIR)\etc\backup.exe
 
 EXEOBJS =\
-	$(OJT)main.obj \
-	$(OJT)config.obj \
-	$(OJT)dsstub.obj \
-	$(OJT)volstub.obj \
-	$(OJT)commands.obj \
-	$(OJT)regex.obj \
-	$(OJT)server.obj \
-	$(OJT)dsvs.obj \
-	$(OJT)dump.obj \
-	$(OJT)restore.obj \
-	$(OJT)ubik_db_if.obj \
-	$(OJT)dump_sched.obj \
-	$(OJT)vol_sets.obj \
-	$(OJT)tape_hosts.obj \
-	$(OJT)bucoord_errs.obj \
-	$(OJT)bc_status.obj \
-	$(OJT)status.obj \
-	$(OJT)dlq.obj 
-
-$(EXEOBJS):$$(@B).c
-	$(C2OBJ) $**
-
-$(OJT)backup.res:AFS_component_version_number.h
-
+	$(OJT)\main.obj \
+	$(OJT)\config.obj \
+	$(OJT)\dsstub.obj \
+	$(OJT)\volstub.obj \
+	$(OJT)\commands.obj \
+	$(OJT)\regex.obj \
+	$(OJT)\server.obj \
+	$(OJT)\dsvs.obj \
+	$(OJT)\dump.obj \
+	$(OJT)\restore.obj \
+	$(OJT)\ubik_db_if.obj \
+	$(OJT)\dump_sched.obj \
+	$(OJT)\vol_sets.obj \
+	$(OJT)\tape_hosts.obj \
+	$(OJT)\bucoord_errs.obj \
+	$(OJT)\bc_status.obj \
+	$(OJT)\status.obj \
+	$(OJT)\dlq.obj \
+
+
+$(OJT)/backup.res:AFS_component_version_number.h
 	$(RC) backup.rc
 
 $(EXEOBJS):$$(@B).c
@@ -110,7 +104,7 @@ bucoord_errs.c bc.h:    bucoord_errs.et bc.p.h
 ############################################################################
 # Definitions for generating versioninfo resources
 
-$(OJT)backup.res: AFS_component_version_number.h
+$(OJT)/backup.res: AFS_component_version_number.h
 
 ############################################################################
 # Install 
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index a42344857..0c62ed70f 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -54,7 +54,8 @@ AFSDEV_BUILDTYPE = NONE
 !ENDIF
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VERSION=1.2.8 a
+AFSPRODUCT_VERSION=1.2.11
+AFSPRODUCT_FILE_VERSION=1,2,1100,0
 CELLNAME_DEFAULT=Your Cell Name
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
@@ -244,6 +245,9 @@ CPP2OBJ = $(C2OBJ)
 
 .c{$(OJT)\}.obj:
 	$(C2OBJ) $<
+   
+.c.obj:
+   $(C2OBJ) $<
 
 .cpp{$(OJT)\}.obj:
 	$(CPP2OBJ) $<
diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index e1d46f1b3..782924061 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -322,7 +322,9 @@ main(int argc, char **argv)
 #endif
     }
 
+#ifndef AFS_NT40_ENV
     serverLogSyslogTag = "ptserver";
+#endif
     OpenLog(AFSDIR_SERVER_PTLOG_FILEPATH);	/* set up logging */
     SetupLogSignals();
 
diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index 0ea43709f..94bb46f3e 100644
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -47,6 +47,7 @@ LIBOBJS = \
 	$(OJT)\regex.obj \
 	$(OJT)\readdir_nt.obj \
 	$(OJT)\serverLog.obj \
+   $(OJT)\snprintf.obj \
 	$(OJT)\uuid.obj \
 	$(OJT)\volparse.obj \
 	$(OJT)\winsock_nt.obj \
diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index ee99ecc08..6ad2610d9 100644
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -10,8 +10,12 @@ RCSID
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
+#ifndef AFS_NT40_ENV
 #include <netinet/in.h>
 #include <netdb.h>
+#else
+#include <winsock2.h>
+#endif
 #if defined(AFS_AIX32_ENV) || defined(AFS_SUN_ENV) || defined(AFS_XBSD_ENV)
 #include <sys/socket.h>
 #endif
@@ -520,6 +524,7 @@ vsnprintf(char *p, unsigned int avail, char *fmt, va_list ap)
 }
 #endif /* AFS_OSF20_ENV || AFS_AIX32_ENV */
 
+#ifndef AFS_NT40_ENV
 #if defined(AFS_OSF20_ENV) && !defined(AFS_DUX50_ENV) || defined(AFS_AIX32_ENV) || (defined(AFS_SUN55_ENV) && !defined(AFS_SUN56_ENV)) || !defined(HAVE_SNPRINTF)
 
 #ifdef AFS_AIX51_ENV
@@ -541,3 +546,4 @@ snprintf(char *p, unsigned int avail, char *fmt, ...)
 #endif
 }
 #endif /* AFS_OSF20_ENV || AFS_AIX32_ENV */
+#endif /* AFS_NT40_ENV */