*** empty log message ***

2 files changed, 18 insertions, 80 deletions

diff --git a/netsvcs/servers/servers.mak b/netsvcs/servers/servers.mak
index a03140fa2fc..ace35245ab1 100644
--- a/netsvcs/servers/servers.mak
+++ b/netsvcs/servers/servers.mak
@@ -44,24 +44,24 @@ CPP=cl.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-OUTDIR=.\Release

+OUTDIR=.

 INTDIR=.\Release

 

-ALL : "$(OUTDIR)\servers.exe"

+ALL : "$(OUTDIR)\main.exe"

 

 CLEAN : 

 	-@erase "$(INTDIR)\main.obj"

-	-@erase "$(OUTDIR)\servers.exe"

+	-@erase "$(OUTDIR)\main.exe"

 

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

+"$(INTDIR)" :

+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

 

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

  /Fp"$(INTDIR)/servers.pch" /YX /Fo"$(INTDIR)/" /c 

 CPP_OBJS=.\Release/

 CPP_SBRS=.\.

@@ -75,15 +75,15 @@ BSC32_SBRS= \
 	

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib ..\lib\netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 /out:"main.exe"

 LINK32_FLAGS=ace.lib ..\lib\netsvcs.lib kernel32.lib user32.lib gdi32.lib\

  winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/servers.pdb" /machine:I386 /out:"$(OUTDIR)/servers.exe" 

+ uuid.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)/main.pdb"\

+ /machine:I386 /out:"$(OUTDIR)/main.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\main.obj"

 

-"$(OUTDIR)\servers.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+"$(OUTDIR)\main.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

     $(LINK32) @<<

   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

@@ -132,11 +132,11 @@ BSC32_SBRS= \
 	

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib aced.lib ..\lib\netsvcs.lib /nologo /subsystem:console /debug /machine:I386 /out:"main.exe"

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\

- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib aced.lib\

- ..\lib\netsvcs.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/main.pdb" /debug /machine:I386 /out:"$(OUTDIR)/main.exe" 

+# ADD LINK32 aced.lib ..\lib\netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"main.exe"

+LINK32_FLAGS=aced.lib ..\lib\netsvcs.lib kernel32.lib user32.lib gdi32.lib\

+ winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

+ uuid.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)/main.pdb"\

+ /debug /machine:I386 /out:"$(OUTDIR)/main.exe" 

 LINK32_OBJS= \

 	"$(INTDIR)\main.obj"

 

@@ -187,74 +187,13 @@ SOURCE=.\main.cpp
 DEP_CPP_MAIN_=\

 	"..\..\ace\config-win32.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 NODEP_CPP_MAIN_=\

@@ -290,7 +229,6 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\Acceptor.h"\

 	{$(INCLUDE)}"\ace\Acceptor.i"\

 	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

 	{$(INCLUDE)}"\ace\Atomic_Op.i"\

@@ -299,7 +237,6 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

 	{$(INCLUDE)}"\ace\config-win32-common.h"\

 	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.h"\

 	{$(INCLUDE)}"\ace\Containers.cpp"\

 	{$(INCLUDE)}"\ace\Containers.h"\

 	{$(INCLUDE)}"\ace\Containers.i"\

@@ -412,6 +349,7 @@ DEP_CPP_MAIN_=\
 	{$(INCLUDE)}"\ace\Thread.i"\

 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

+	{$(INCLUDE)}"\ace\Time_Request_Reply.h"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

 	{$(INCLUDE)}"\ace\TLI.h"\

 	{$(INCLUDE)}"\ace\TLI.i"\

diff --git a/netsvcs/servers/servers.mdp b/netsvcs/servers/servers.mdp
index 015b3fa714c..4fb7058dd7e 100644
--- a/netsvcs/servers/servers.mdp
+++ b/netsvcs/servers/servers.mdp