DEVEL15-tviced-windows-20070820

build serialize_state.c

(cherry picked from commit da79b76e7d5807330b0fc3c2b9518b150beba312)

diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile
index f68f4e7e8e7f8ee039f66ba16c88197f19e18023..be778d50907ab0a0da6b4d621cabbfb412b1e8e1 100644 (file)
--- a/src/tviced/NTMakefile
+++ b/src/tviced/NTMakefile
@@ -5,7 +5,7 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG -DFSSYNC_BUILD_SERVER
+AFSDEV_AUXCDEFINES = -DAFS_PTHREAD_ENV -DRXDEBUG -DFSSYNC_BUILD_SERVER #-DAFS_DEMAND_ATTACH_FS
 
 RELDIR=tviced
 !INCLUDE ..\config\NTMakefile.$(SYS_NAME)
@@ -19,6 +19,7 @@ SRC_DIR = ..\viced
 EXEFILE = $(DESTDIR)\root.server\usr\afs\bin\fileserver.exe
 
 VICED = ..\viced
+TVICED = .
 VLSERVER = ..\vlserver
 LWP = ..\lwp
 LIBACL = ..\libacl
@@ -31,9 +32,11 @@ RX = ..\rx
 RXOBJS = $(OUT)\xdr_int64.obj \
          $(OUT)\xdr_int32.obj
 
-VICEDOBJS = $(OUT)\viced.obj $(OUT)\afsfileprocs.obj $(OUT)\host.obj $(OUT)\physio.obj $(OUT)\callback.obj
+VICEDOBJS = $(OUT)\viced.obj $(OUT)\afsfileprocs.obj $(OUT)\host.obj $(OUT)\physio.obj $(OUT)\callback.obj 
 VICEDRES =     $(OUT)\$(VICED)\fileserver.res
 
+TVICEDOBJS = $(OUT)\serialize_state.obj
+
 VLSERVEROBJS = $(OUT)\vldbint.cs.obj $(OUT)\vldbint.xdr.obj
 
 LWPOBJS = $(OUT)\lock.obj $(OUT)\fasttime.obj $(OUT)\threadname.obj
@@ -51,9 +54,7 @@ VOLOBJS = $(OUT)\vnode.obj $(OUT)\volume.obj $(OUT)\vutil.obj $(OUT)\partition.o
 FSINTOBJS = $(OUT)\afsaux.obj $(OUT)\afscbint.cs.obj $(OUT)\afsint.ss.obj $(OUT)\afsint.xdr.obj
 
 EXEOBJS = $(VICEDOBJS) $(VICEDRES) $(VLSERVEROBJS) $(LWPOBJS) $(LIBACLOBJS) \
-        $(UTILOBJS) $(DIROBJS) $(VOLOBJS) $(FSINTOBJS) $(RXOBJS)
-
-
+        $(UTILOBJS) $(DIROBJS) $(VOLOBJS) $(FSINTOBJS) $(RXOBJS) #$(TVICEDOBJS) 
 
 noversion: install
 
@@ -65,6 +66,9 @@ $(RXOBJS): $(RX)\$$(@B).c
 $(VICEDOBJS): $(VICED)\$$(@B).c
        $(C2OBJ) -I$(VICED) -I$(UTIL) $**
 
+$(TVICEDOBJS): $(TVICED)\$$(@B).c
+       $(C2OBJ) -I$(TVICED) -I$(UTIL) $**
+
 $(UTILOBJS): $(UTIL)\$$(@B).c
        $(C2OBJ) -I$(UTIL) $**
 

diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c
index f89ef0f61de24e35f1742fcd9af3685836e806a1..62391983252b141a127bf289fd473fc95a532f88 100644 (file)
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -107,8 +107,9 @@ extern off_t afs_lseek(int FD, off_t O, int F);
  * have been written so that it will be very simple to go
  * back to standard I/O for just those poorly written platforms
  */
+#ifndef _WIN32
 #define FS_STATE_USE_MMAP
-
+#endif
 
 #ifdef FS_STATE_USE_MMAP
 #define FS_STATE_INIT_FILESIZE (8 * 1024 * 1024)  /* truncate to 8MB initially */