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 beae71dce14f929efb13fe6f6808ec2c52c832aa..86af3a57bc81ddb23d4e98272a5d7b70d0873e73 100644 (file)
--- 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 96c29d1f03d4225f091ab552f5dfc4ce65a4374f..1b7e7e51a333106f1d72a49894602d5e08e96b8d 100644 (file)
--- 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 6eb3f20fb8ed0c17931cf5779cb385f380420b1c..e13dcb54f19fc6f03313566c9889cde049332a91 100644 (file)
--- 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 a4234485755e2f565211455b5c6e687579d0522c..0c62ed70f21d6182e2778380eeb37d3419b4c354 100644 (file)
--- 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 e1d46f1b31c26e45f44f9994413e10a900149108..7829240612adf7cd9f48cc12861427c5063ec997 100644 (file)
--- 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 0ea43709fc28d5e145a4619c668ecaa46df31845..94bb46f3ede73693998ffc1390ff690b5b2d4fde 100644 (file)
--- 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 ee99ecc08d4be04b3d33997b20ed5bdb853f5ee2..6ad2610d9ddbb78b0ba5f7b57c0fd9aaf82876b7 100644 (file)
--- 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 */