Added initial support for Borland C++ Builder

21 files changed, 984 insertions, 62 deletions

diff --git a/ace/ACE.bpg b/ace/ACE.bpg
new file mode 100644
index 00000000000..7a32b122e67
--- /dev/null
+++ b/ace/ACE.bpg
@@ -0,0 +1,21 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = ACER ACED
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+ACER: ACER.bpr
+  $(MAKE)
+
+ACED: ACED.bpr
+  $(MAKE)
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index f0013d300dc..35fbe41d76c 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -2517,7 +2517,6 @@ ACE::get_ip_interfaces (size_t &count,
   const TCHAR *BIND_NAME_ID =  __TEXT ("Bind");
   const TCHAR *IPADDR_NAME_ID = __TEXT ("IPAddress");
   const TCHAR *INVALID_TCPIP_DEVICE_ADDR = __TEXT ("0.0.0.0");
-  const int MAX_STRING_SZ = 4096;
 
   TCHAR raw_buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
   DWORD raw_buflen = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1;
diff --git a/ace/ACED.bpr b/ace/ACED.bpr
new file mode 100644
index 00000000000..93f88595e7b
--- /dev/null
+++ b/ace/ACED.bpr
@@ -0,0 +1,234 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = ACED.dll
+OBJFILES = obj\ACED.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj obj\Addr.obj \
+  obj\Arg_Shifter.obj obj\ARGV.obj obj\Array.obj obj\Asynch_Acceptor.obj \
+  obj\Asynch_IO.obj obj\Auto_Ptr.obj obj\Basic_Types.obj obj\Connector.obj \
+  obj\Containers.obj obj\CORBA_Handler.obj obj\CORBA_Ref.obj obj\Date_Time.obj \
+  obj\DEV.obj obj\DEV_Addr.obj obj\DEV_Connector.obj obj\DEV_IO.obj obj\Dump.obj \
+  obj\Dump_T.obj obj\Dynamic.obj obj\Dynamic_Service.obj obj\Env_Value_T.obj \
+  obj\Event_Handler.obj obj\Event_Handler_T.obj obj\FIFO.obj obj\FIFO_Recv.obj \
+  obj\FIFO_Recv_Msg.obj obj\FIFO_Send.obj obj\FIFO_Send_Msg.obj obj\FILE.obj \
+  obj\FILE_Addr.obj obj\FILE_Connector.obj obj\FILE_IO.obj obj\Filecache.obj \
+  obj\Free_List.obj obj\Future.obj obj\Get_Opt.obj obj\Handle_Set.obj \
+  obj\Hash_Map_Manager.obj obj\High_Res_Timer.obj obj\INET_Addr.obj \
+  obj\IO_Cntl_Msg.obj obj\IO_SAP.obj obj\IOStream.obj obj\IOStream_T.obj \
+  obj\IPC_SAP.obj obj\Local_Name_Space.obj obj\Local_Name_Space_T.obj \
+  obj\Local_Tokens.obj obj\LOCK_SOCK_Acceptor.obj obj\Log_Msg.obj \
+  obj\Log_Record.obj obj\LSOCK.obj obj\LSOCK_Acceptor.obj obj\LSOCK_CODgram.obj \
+  obj\LSOCK_Connector.obj obj\LSOCK_Dgram.obj obj\LSOCK_Stream.obj obj\Malloc.obj \
+  obj\Malloc_T.obj obj\Managed_Object.obj obj\Map_Manager.obj obj\Mem_Map.obj \
+  obj\Memory_Pool.obj obj\Message_Block.obj obj\Message_Queue.obj \
+  obj\Method_Object.obj obj\Module.obj obj\Msg_WFMO_Reactor.obj \
+  obj\Multiplexor.obj obj\Name_Proxy.obj obj\Name_Request_Reply.obj \
+  obj\Name_Space.obj obj\Naming_Context.obj obj\Object_Manager.obj \
+  obj\Obstack.obj obj\OS.obj obj\Parse_Node.obj obj\Pipe.obj \
+  obj\Priority_Reactor.obj obj\Proactor.obj obj\Process.obj \
+  obj\Process_Manager.obj obj\Profile_Timer.obj obj\Reactor.obj \
+  obj\Read_Buffer.obj obj\Registry.obj obj\Registry_Name_Space.obj \
+  obj\Remote_Name_Space.obj obj\Remote_Tokens.obj obj\Sched_Params.obj \
+  obj\Select_Reactor.obj obj\Service_Config.obj obj\Service_Manager.obj \
+  obj\Service_Object.obj obj\Service_Repository.obj obj\Service_Types.obj \
+  obj\Shared_Memory.obj obj\Shared_Memory_MM.obj obj\Shared_Memory_SV.obj \
+  obj\Shared_Object.obj obj\Signal.obj obj\Singleton.obj obj\SOCK.obj \
+  obj\SOCK_Acceptor.obj obj\SOCK_CODgram.obj obj\SOCK_Connector.obj \
+  obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \
+  obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \
+  obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \
+  obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
+  obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \
+  obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \
+  obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \
+  obj\Synch_T.obj obj\System_Time.obj obj\Task.obj obj\Task_T.obj obj\Thread.obj \
+  obj\Thread_Manager.obj obj\Time_Request_Reply.obj obj\Timer_Hash.obj \
+  obj\Timer_Hash_T.obj obj\Timer_Heap.obj obj\Timer_Heap_T.obj obj\Timer_List.obj \
+  obj\Timer_List_T.obj obj\Timer_Queue.obj obj\Timer_Queue_Adapters.obj \
+  obj\Timer_Queue_T.obj obj\Timer_Wheel.obj obj\Timer_Wheel_T.obj obj\TLI.obj \
+  obj\TLI_Acceptor.obj obj\TLI_Connector.obj obj\TLI_Stream.obj obj\Token.obj \
+  obj\Token_Collection.obj obj\Token_Invariants.obj obj\Token_Manager.obj \
+  obj\Token_Request_Reply.obj obj\Trace.obj obj\TTY_IO.obj \
+  obj\Typed_SV_Message.obj obj\Typed_SV_Message_Queue.obj obj\UNIX_Addr.obj \
+  obj\UPIPE_Acceptor.obj obj\UPIPE_Connector.obj obj\UPIPE_Stream.obj \
+  obj\WFMO_Reactor.obj obj\XtReactor.obj
+RESFILES =
+DEFFILE =
+RESDEPEN = $(RESFILES)
+LIBFILES =
+LIBRARIES = VCL35.lib
+SPARELIBS = VCL35.lib
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -WD -Od -Hc -w-par -w-inl -Ve -r- -k -y -v -vi- -c -b- -Vx
+CFLAG2 = -D_RTLDLL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl \
+  -H=ace.csm
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_RTLDLL -N2obj -N0obj \
+  -Uc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
+  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl -$Y -$W \
+  -$O- -v -JPHN -M
+RFLAGS = -D_RTLDLL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
+AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /i$(BCB)\include\vcl \
+  /d_RTLDLL /mx /w2 /zi
+LFLAGS = -Lc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
+  -aa -Tpd -x -Gn -Gi -v
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0d32.obj sysinit.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=1
+Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=c:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_RTLDLL
+Item1=_RTLDLL;USEPACKAGES
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/ace/ACED.cpp b/ace/ACED.cpp
new file mode 100644
index 00000000000..2af2b7164e0
--- /dev/null
+++ b/ace/ACED.cpp
@@ -0,0 +1,187 @@
+// $Id$
+
+// This is the main CPP file associated with the
+// debug non-unicode version of ACE.
+
+#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
+#include <vcl.h>
+
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
+{
+  return 1;
+}
+
+USEUNIT("ACE.cpp");
+USEUNIT("Activation_Queue.cpp");
+USEUNIT("Acceptor.cpp");
+USEUNIT("Addr.cpp");
+USEUNIT("Arg_Shifter.cpp");
+USEUNIT("ARGV.cpp");
+USEUNIT("Array.cpp");
+USEUNIT("Asynch_Acceptor.cpp");
+USEUNIT("Asynch_IO.cpp");
+USEUNIT("Auto_Ptr.cpp");
+USEUNIT("Basic_Types.cpp");
+USEUNIT("Connector.cpp");
+USEUNIT("Containers.cpp");
+USEUNIT("CORBA_Handler.cpp");
+USEUNIT("CORBA_Ref.cpp");
+USEUNIT("Date_Time.cpp");
+USEUNIT("DEV.cpp");
+USEUNIT("DEV_Addr.cpp");
+USEUNIT("DEV_Connector.cpp");
+USEUNIT("DEV_IO.cpp");
+USEUNIT("Dump.cpp");
+USEUNIT("Dump_T.cpp");
+USEUNIT("Dynamic.cpp");
+USEUNIT("Dynamic_Service.cpp");
+USEUNIT("Env_Value_T.cpp");
+USEUNIT("Event_Handler.cpp");
+USEUNIT("Event_Handler_T.cpp");
+USEUNIT("FIFO.cpp");
+USEUNIT("FIFO_Recv.cpp");
+USEUNIT("FIFO_Recv_Msg.cpp");
+USEUNIT("FIFO_Send.cpp");
+USEUNIT("FIFO_Send_Msg.cpp");
+USEUNIT("FILE.cpp");
+USEUNIT("FILE_Addr.cpp");
+USEUNIT("FILE_Connector.cpp");
+USEUNIT("FILE_IO.cpp");
+USEUNIT("Filecache.cpp");
+USEUNIT("Free_List.cpp");
+USEUNIT("Future.cpp");
+USEUNIT("Get_Opt.cpp");
+USEUNIT("Handle_Set.cpp");
+USEUNIT("Hash_Map_Manager.cpp");
+USEUNIT("High_Res_Timer.cpp");
+USEUNIT("INET_Addr.cpp");
+USEUNIT("IO_Cntl_Msg.cpp");
+USEUNIT("IO_SAP.cpp");
+USEUNIT("IOStream.cpp");
+USEUNIT("IOStream_T.cpp");
+USEUNIT("IPC_SAP.cpp");
+USEUNIT("Local_Name_Space.cpp");
+USEUNIT("Local_Name_Space_T.cpp");
+USEUNIT("Local_Tokens.cpp");
+USEUNIT("LOCK_SOCK_Acceptor.cpp");
+USEUNIT("Log_Msg.cpp");
+USEUNIT("Log_Record.cpp");
+USEUNIT("LSOCK.cpp");
+USEUNIT("LSOCK_Acceptor.cpp");
+USEUNIT("LSOCK_CODgram.cpp");
+USEUNIT("LSOCK_Connector.cpp");
+USEUNIT("LSOCK_Dgram.cpp");
+USEUNIT("LSOCK_Stream.cpp");
+USEUNIT("Malloc.cpp");
+USEUNIT("Malloc_T.cpp");
+USEUNIT("Managed_Object.cpp");
+USEUNIT("Map_Manager.cpp");
+USEUNIT("Mem_Map.cpp");
+USEUNIT("Memory_Pool.cpp");
+USEUNIT("Message_Block.cpp");
+USEUNIT("Message_Queue.cpp");
+USEUNIT("Method_Object.cpp");
+USEUNIT("Module.cpp");
+USEUNIT("Msg_WFMO_Reactor.cpp");
+USEUNIT("Multiplexor.cpp");
+USEUNIT("Name_Proxy.cpp");
+USEUNIT("Name_Request_Reply.cpp");
+USEUNIT("Name_Space.cpp");
+USEUNIT("Naming_Context.cpp");
+USEUNIT("Object_Manager.cpp");
+USEUNIT("Obstack.cpp");
+USEUNIT("OS.cpp");
+USEUNIT("Parse_Node.cpp");
+USEUNIT("Pipe.cpp");
+USEUNIT("Priority_Reactor.cpp");
+USEUNIT("Proactor.cpp");
+USEUNIT("Process.cpp");
+USEUNIT("Process_Manager.cpp");
+USEUNIT("Profile_Timer.cpp");
+USEUNIT("Reactor.cpp");
+USEUNIT("Read_Buffer.cpp");
+USEUNIT("Registry.cpp");
+USEUNIT("Registry_Name_Space.cpp");
+USEUNIT("Remote_Name_Space.cpp");
+USEUNIT("Remote_Tokens.cpp");
+USEUNIT("Sched_Params.cpp");
+USEUNIT("Select_Reactor.cpp");
+USEUNIT("Service_Config.cpp");
+USEUNIT("Service_Manager.cpp");
+USEUNIT("Service_Object.cpp");
+USEUNIT("Service_Repository.cpp");
+USEUNIT("Service_Types.cpp");
+USEUNIT("Shared_Memory.cpp");
+USEUNIT("Shared_Memory_MM.cpp");
+USEUNIT("Shared_Memory_SV.cpp");
+USEUNIT("Shared_Object.cpp");
+USEUNIT("Signal.cpp");
+USEUNIT("Singleton.cpp");
+USEUNIT("SOCK.cpp");
+USEUNIT("SOCK_Acceptor.cpp");
+USEUNIT("SOCK_CODgram.cpp");
+USEUNIT("SOCK_Connector.cpp");
+USEUNIT("SOCK_Dgram.cpp");
+USEUNIT("SOCK_Dgram_Bcast.cpp");
+USEUNIT("SOCK_Dgram_Mcast.cpp");
+USEUNIT("SOCK_IO.cpp");
+USEUNIT("SOCK_Stream.cpp");
+USEUNIT("SPIPE.cpp");
+USEUNIT("SPIPE_Acceptor.cpp");
+USEUNIT("SPIPE_Addr.cpp");
+USEUNIT("SPIPE_Connector.cpp");
+USEUNIT("SPIPE_Stream.cpp");
+USEUNIT("SString.cpp");
+USEUNIT("Strategies.cpp");
+USEUNIT("Strategies_T.cpp");
+USEUNIT("Stream.cpp");
+USEUNIT("Stream_Modules.cpp");
+USEUNIT("SV_Message.cpp");
+USEUNIT("SV_Message_Queue.cpp");
+USEUNIT("SV_Semaphore_Complex.cpp");
+USEUNIT("SV_Semaphore_Simple.cpp");
+USEUNIT("SV_Shared_Memory.cpp");
+USEUNIT("Svc_Conf_l.cpp");
+USEUNIT("Svc_Conf_y.cpp");
+USEUNIT("Svc_Handler.cpp");
+USEUNIT("Synch.cpp");
+USEUNIT("Synch_Options.cpp");
+USEUNIT("Synch_T.cpp");
+USEUNIT("System_Time.cpp");
+USEUNIT("Task.cpp");
+USEUNIT("Task_T.cpp");
+USEUNIT("Thread.cpp");
+USEUNIT("Thread_Manager.cpp");
+USEUNIT("Time_Request_Reply.cpp");
+USEUNIT("Timer_Hash.cpp");
+USEUNIT("Timer_Hash_T.cpp");
+USEUNIT("Timer_Heap.cpp");
+USEUNIT("Timer_Heap_T.cpp");
+USEUNIT("Timer_List.cpp");
+USEUNIT("Timer_List_T.cpp");
+USEUNIT("Timer_Queue.cpp");
+USEUNIT("Timer_Queue_Adapters.cpp");
+USEUNIT("Timer_Queue_T.cpp");
+USEUNIT("Timer_Wheel.cpp");
+USEUNIT("Timer_Wheel_T.cpp");
+USEUNIT("TLI.cpp");
+USEUNIT("TLI_Acceptor.cpp");
+USEUNIT("TLI_Connector.cpp");
+USEUNIT("TLI_Stream.cpp");
+USEUNIT("Token.cpp");
+USEUNIT("Token_Collection.cpp");
+USEUNIT("Token_Invariants.cpp");
+USEUNIT("Token_Manager.cpp");
+USEUNIT("Token_Request_Reply.cpp");
+USEUNIT("Trace.cpp");
+USEUNIT("TTY_IO.cpp");
+USEUNIT("Typed_SV_Message.cpp");
+USEUNIT("Typed_SV_Message_Queue.cpp");
+USEUNIT("UNIX_Addr.cpp");
+USEUNIT("UPIPE_Acceptor.cpp");
+USEUNIT("UPIPE_Connector.cpp");
+USEUNIT("UPIPE_Stream.cpp");
+USEUNIT("WFMO_Reactor.cpp");
+USEUNIT("XtReactor.cpp");
+//---------------------------------------------------------------------------
+#endif
diff --git a/ace/ACER.bpr b/ace/ACER.bpr
new file mode 100644
index 00000000000..3fe61886a42
--- /dev/null
+++ b/ace/ACER.bpr
@@ -0,0 +1,234 @@
+# ---------------------------------------------------------------------------
+!if !$d(BCB)
+BCB = $(MAKEDIR)\..
+!endif
+
+# ---------------------------------------------------------------------------
+# IDE SECTION
+# ---------------------------------------------------------------------------
+# The following section of the project makefile is managed by the BCB IDE.
+# It is recommended to use the IDE to change any of the values in this
+# section.
+# ---------------------------------------------------------------------------
+
+VERSION = BCB.03
+# ---------------------------------------------------------------------------
+PROJECT = ACER.dll
+OBJFILES = obj\ACER.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj obj\Addr.obj \
+  obj\Arg_Shifter.obj obj\ARGV.obj obj\Array.obj obj\Asynch_Acceptor.obj \
+  obj\Asynch_IO.obj obj\Auto_Ptr.obj obj\Basic_Types.obj obj\Connector.obj \
+  obj\Containers.obj obj\CORBA_Handler.obj obj\CORBA_Ref.obj obj\Date_Time.obj \
+  obj\DEV.obj obj\DEV_Addr.obj obj\DEV_Connector.obj obj\DEV_IO.obj obj\Dump.obj \
+  obj\Dump_T.obj obj\Dynamic.obj obj\Dynamic_Service.obj obj\Env_Value_T.obj \
+  obj\Event_Handler.obj obj\Event_Handler_T.obj obj\FIFO.obj obj\FIFO_Recv.obj \
+  obj\FIFO_Recv_Msg.obj obj\FIFO_Send.obj obj\FIFO_Send_Msg.obj obj\FILE.obj \
+  obj\FILE_Addr.obj obj\FILE_Connector.obj obj\FILE_IO.obj obj\Filecache.obj \
+  obj\Free_List.obj obj\Future.obj obj\Get_Opt.obj obj\Handle_Set.obj \
+  obj\Hash_Map_Manager.obj obj\High_Res_Timer.obj obj\INET_Addr.obj \
+  obj\IO_Cntl_Msg.obj obj\IO_SAP.obj obj\IOStream.obj obj\IOStream_T.obj \
+  obj\IPC_SAP.obj obj\Local_Name_Space.obj obj\Local_Name_Space_T.obj \
+  obj\Local_Tokens.obj obj\LOCK_SOCK_Acceptor.obj obj\Log_Msg.obj \
+  obj\Log_Record.obj obj\LSOCK.obj obj\LSOCK_Acceptor.obj obj\LSOCK_CODgram.obj \
+  obj\LSOCK_Connector.obj obj\LSOCK_Dgram.obj obj\LSOCK_Stream.obj obj\Malloc.obj \
+  obj\Malloc_T.obj obj\Managed_Object.obj obj\Map_Manager.obj obj\Mem_Map.obj \
+  obj\Memory_Pool.obj obj\Message_Block.obj obj\Message_Queue.obj \
+  obj\Method_Object.obj obj\Module.obj obj\Msg_WFMO_Reactor.obj \
+  obj\Multiplexor.obj obj\Name_Proxy.obj obj\Name_Request_Reply.obj \
+  obj\Name_Space.obj obj\Naming_Context.obj obj\Object_Manager.obj \
+  obj\Obstack.obj obj\OS.obj obj\Parse_Node.obj obj\Pipe.obj \
+  obj\Priority_Reactor.obj obj\Proactor.obj obj\Process.obj \
+  obj\Process_Manager.obj obj\Profile_Timer.obj obj\Reactor.obj \
+  obj\Read_Buffer.obj obj\Registry.obj obj\Registry_Name_Space.obj \
+  obj\Remote_Name_Space.obj obj\Remote_Tokens.obj obj\Sched_Params.obj \
+  obj\Select_Reactor.obj obj\Service_Config.obj obj\Service_Manager.obj \
+  obj\Service_Object.obj obj\Service_Repository.obj obj\Service_Types.obj \
+  obj\Shared_Memory.obj obj\Shared_Memory_MM.obj obj\Shared_Memory_SV.obj \
+  obj\Shared_Object.obj obj\Signal.obj obj\Singleton.obj obj\SOCK.obj \
+  obj\SOCK_Acceptor.obj obj\SOCK_CODgram.obj obj\SOCK_Connector.obj \
+  obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \
+  obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \
+  obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \
+  obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
+  obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \
+  obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \
+  obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \
+  obj\Synch_T.obj obj\System_Time.obj obj\Task.obj obj\Task_T.obj obj\Thread.obj \
+  obj\Thread_Manager.obj obj\Time_Request_Reply.obj obj\Timer_Hash.obj \
+  obj\Timer_Hash_T.obj obj\Timer_Heap.obj obj\Timer_Heap_T.obj obj\Timer_List.obj \
+  obj\Timer_List_T.obj obj\Timer_Queue.obj obj\Timer_Queue_Adapters.obj \
+  obj\Timer_Queue_T.obj obj\Timer_Wheel.obj obj\Timer_Wheel_T.obj obj\TLI.obj \
+  obj\TLI_Acceptor.obj obj\TLI_Connector.obj obj\TLI_Stream.obj obj\Token.obj \
+  obj\Token_Collection.obj obj\Token_Invariants.obj obj\Token_Manager.obj \
+  obj\Token_Request_Reply.obj obj\Trace.obj obj\TTY_IO.obj \
+  obj\Typed_SV_Message.obj obj\Typed_SV_Message_Queue.obj obj\UNIX_Addr.obj \
+  obj\UPIPE_Acceptor.obj obj\UPIPE_Connector.obj obj\UPIPE_Stream.obj \
+  obj\WFMO_Reactor.obj obj\XtReactor.obj
+RESFILES =
+DEFFILE =
+RESDEPEN = $(RESFILES)
+LIBFILES =
+LIBRARIES = VCL35.lib
+SPARELIBS = VCL35.lib
+PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \
+  QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \
+  INETDB35.bpi INET35.bpi
+# ---------------------------------------------------------------------------
+PATHCPP = .;
+PATHASM = .;
+PATHPAS = .;
+PATHRC = .;
+DEBUGLIBPATH = $(BCB)\lib\debug
+RELEASELIBPATH = $(BCB)\lib\release
+# ---------------------------------------------------------------------------
+CFLAG1 = -WD -O2 -Hc -w-par -w-inl -Ve -k- -vi -c -b- -Vx
+CFLAG2 = -D_RTLDLL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl \
+  -H=obj\ace.csm
+CFLAG3 = -w-rvl -Tkh30000
+PFLAGS = -D_RTLDLL -N2obj -N0obj \
+  -Uc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl -$L- -$D- \
+  -v -JPHN -M
+RFLAGS = -D_RTLDLL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
+AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /i$(BCB)\include\vcl \
+  /d_RTLDLL /mx /w2 /zn
+LFLAGS = -Lc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+  -aa -Tpd -x -Gn -Gi
+IFLAGS =
+# ---------------------------------------------------------------------------
+ALLOBJ = c0d32.obj sysinit.obj $(OBJFILES)
+ALLRES = $(RESFILES)
+ALLLIB = $(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib
+# ---------------------------------------------------------------------------
+!ifdef IDEOPTIONS
+
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=1
+Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=c:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_RTLDLL
+Item1=_RTLDLL;USEPACKAGES
+
+[HistoryLists\hlIntOutputDir]
+Count=1
+Item0=obj
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+
+!endif
+
+# ---------------------------------------------------------------------------
+# MAKE SECTION
+# ---------------------------------------------------------------------------
+# This section of the project file is not used by the BCB IDE.  It is for
+# the benefit of building from the command-line using the MAKE utility.
+# ---------------------------------------------------------------------------
+
+.autodepend
+# ---------------------------------------------------------------------------
+!if !$d(BCC32)
+BCC32 = bcc32
+!endif
+
+!if !$d(DCC32)
+DCC32 = dcc32
+!endif
+
+!if !$d(TASM32)
+TASM32 = tasm32
+!endif
+
+!if !$d(LINKER)
+LINKER = ilink32
+!endif
+
+!if !$d(BRCC32)
+BRCC32 = brcc32
+!endif
+# ---------------------------------------------------------------------------
+!if $d(PATHCPP)
+.PATH.CPP = $(PATHCPP)
+.PATH.C   = $(PATHCPP)
+!endif
+
+!if $d(PATHPAS)
+.PATH.PAS = $(PATHPAS)
+!endif
+
+!if $d(PATHASM)
+.PATH.ASM = $(PATHASM)
+!endif
+
+!if $d(PATHRC)
+.PATH.RC  = $(PATHRC)
+!endif
+# ---------------------------------------------------------------------------
+$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE)
+    $(BCB)\BIN\$(LINKER) @&&!
+    $(LFLAGS) +
+    $(ALLOBJ), +
+    $(PROJECT),, +
+    $(ALLLIB), +
+    $(DEFFILE), +
+    $(ALLRES)
+!
+# ---------------------------------------------------------------------------
+.pas.hpp:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.pas.obj:
+    $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< }
+
+.cpp.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.c.obj:
+    $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< }
+
+.asm.obj:
+    $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@
+
+.rc.res:
+    $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $<
+# ---------------------------------------------------------------------------
diff --git a/ace/ACER.cpp b/ace/ACER.cpp
new file mode 100644
index 00000000000..39dcdf2801e
--- /dev/null
+++ b/ace/ACER.cpp
@@ -0,0 +1,187 @@
+// $Id$
+
+// This is the main CPP file associated with the
+// release non-unicode version of ACE.
+
+#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
+#include <vcl.h>
+
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
+{
+  return 1;
+}
+
+USEUNIT("ACE.cpp");
+USEUNIT("Activation_Queue.cpp");
+USEUNIT("Acceptor.cpp");
+USEUNIT("Addr.cpp");
+USEUNIT("Arg_Shifter.cpp");
+USEUNIT("ARGV.cpp");
+USEUNIT("Array.cpp");
+USEUNIT("Asynch_Acceptor.cpp");
+USEUNIT("Asynch_IO.cpp");
+USEUNIT("Auto_Ptr.cpp");
+USEUNIT("Basic_Types.cpp");
+USEUNIT("Connector.cpp");
+USEUNIT("Containers.cpp");
+USEUNIT("CORBA_Handler.cpp");
+USEUNIT("CORBA_Ref.cpp");
+USEUNIT("Date_Time.cpp");
+USEUNIT("DEV.cpp");
+USEUNIT("DEV_Addr.cpp");
+USEUNIT("DEV_Connector.cpp");
+USEUNIT("DEV_IO.cpp");
+USEUNIT("Dump.cpp");
+USEUNIT("Dump_T.cpp");
+USEUNIT("Dynamic.cpp");
+USEUNIT("Dynamic_Service.cpp");
+USEUNIT("Env_Value_T.cpp");
+USEUNIT("Event_Handler.cpp");
+USEUNIT("Event_Handler_T.cpp");
+USEUNIT("FIFO.cpp");
+USEUNIT("FIFO_Recv.cpp");
+USEUNIT("FIFO_Recv_Msg.cpp");
+USEUNIT("FIFO_Send.cpp");
+USEUNIT("FIFO_Send_Msg.cpp");
+USEUNIT("FILE.cpp");
+USEUNIT("FILE_Addr.cpp");
+USEUNIT("FILE_Connector.cpp");
+USEUNIT("FILE_IO.cpp");
+USEUNIT("Filecache.cpp");
+USEUNIT("Free_List.cpp");
+USEUNIT("Future.cpp");
+USEUNIT("Get_Opt.cpp");
+USEUNIT("Handle_Set.cpp");
+USEUNIT("Hash_Map_Manager.cpp");
+USEUNIT("High_Res_Timer.cpp");
+USEUNIT("INET_Addr.cpp");
+USEUNIT("IO_Cntl_Msg.cpp");
+USEUNIT("IO_SAP.cpp");
+USEUNIT("IOStream.cpp");
+USEUNIT("IOStream_T.cpp");
+USEUNIT("IPC_SAP.cpp");
+USEUNIT("Local_Name_Space.cpp");
+USEUNIT("Local_Name_Space_T.cpp");
+USEUNIT("Local_Tokens.cpp");
+USEUNIT("LOCK_SOCK_Acceptor.cpp");
+USEUNIT("Log_Msg.cpp");
+USEUNIT("Log_Record.cpp");
+USEUNIT("LSOCK.cpp");
+USEUNIT("LSOCK_Acceptor.cpp");
+USEUNIT("LSOCK_CODgram.cpp");
+USEUNIT("LSOCK_Connector.cpp");
+USEUNIT("LSOCK_Dgram.cpp");
+USEUNIT("LSOCK_Stream.cpp");
+USEUNIT("Malloc.cpp");
+USEUNIT("Malloc_T.cpp");
+USEUNIT("Managed_Object.cpp");
+USEUNIT("Map_Manager.cpp");
+USEUNIT("Mem_Map.cpp");
+USEUNIT("Memory_Pool.cpp");
+USEUNIT("Message_Block.cpp");
+USEUNIT("Message_Queue.cpp");
+USEUNIT("Method_Object.cpp");
+USEUNIT("Module.cpp");
+USEUNIT("Msg_WFMO_Reactor.cpp");
+USEUNIT("Multiplexor.cpp");
+USEUNIT("Name_Proxy.cpp");
+USEUNIT("Name_Request_Reply.cpp");
+USEUNIT("Name_Space.cpp");
+USEUNIT("Naming_Context.cpp");
+USEUNIT("Object_Manager.cpp");
+USEUNIT("Obstack.cpp");
+USEUNIT("OS.cpp");
+USEUNIT("Parse_Node.cpp");
+USEUNIT("Pipe.cpp");
+USEUNIT("Priority_Reactor.cpp");
+USEUNIT("Proactor.cpp");
+USEUNIT("Process.cpp");
+USEUNIT("Process_Manager.cpp");
+USEUNIT("Profile_Timer.cpp");
+USEUNIT("Reactor.cpp");
+USEUNIT("Read_Buffer.cpp");
+USEUNIT("Registry.cpp");
+USEUNIT("Registry_Name_Space.cpp");
+USEUNIT("Remote_Name_Space.cpp");
+USEUNIT("Remote_Tokens.cpp");
+USEUNIT("Sched_Params.cpp");
+USEUNIT("Select_Reactor.cpp");
+USEUNIT("Service_Config.cpp");
+USEUNIT("Service_Manager.cpp");
+USEUNIT("Service_Object.cpp");
+USEUNIT("Service_Repository.cpp");
+USEUNIT("Service_Types.cpp");
+USEUNIT("Shared_Memory.cpp");
+USEUNIT("Shared_Memory_MM.cpp");
+USEUNIT("Shared_Memory_SV.cpp");
+USEUNIT("Shared_Object.cpp");
+USEUNIT("Signal.cpp");
+USEUNIT("Singleton.cpp");
+USEUNIT("SOCK.cpp");
+USEUNIT("SOCK_Acceptor.cpp");
+USEUNIT("SOCK_CODgram.cpp");
+USEUNIT("SOCK_Connector.cpp");
+USEUNIT("SOCK_Dgram.cpp");
+USEUNIT("SOCK_Dgram_Bcast.cpp");
+USEUNIT("SOCK_Dgram_Mcast.cpp");
+USEUNIT("SOCK_IO.cpp");
+USEUNIT("SOCK_Stream.cpp");
+USEUNIT("SPIPE.cpp");
+USEUNIT("SPIPE_Acceptor.cpp");
+USEUNIT("SPIPE_Addr.cpp");
+USEUNIT("SPIPE_Connector.cpp");
+USEUNIT("SPIPE_Stream.cpp");
+USEUNIT("SString.cpp");
+USEUNIT("Strategies.cpp");
+USEUNIT("Strategies_T.cpp");
+USEUNIT("Stream.cpp");
+USEUNIT("Stream_Modules.cpp");
+USEUNIT("SV_Message.cpp");
+USEUNIT("SV_Message_Queue.cpp");
+USEUNIT("SV_Semaphore_Complex.cpp");
+USEUNIT("SV_Semaphore_Simple.cpp");
+USEUNIT("SV_Shared_Memory.cpp");
+USEUNIT("Svc_Conf_l.cpp");
+USEUNIT("Svc_Conf_y.cpp");
+USEUNIT("Svc_Handler.cpp");
+USEUNIT("Synch.cpp");
+USEUNIT("Synch_Options.cpp");
+USEUNIT("Synch_T.cpp");
+USEUNIT("System_Time.cpp");
+USEUNIT("Task.cpp");
+USEUNIT("Task_T.cpp");
+USEUNIT("Thread.cpp");
+USEUNIT("Thread_Manager.cpp");
+USEUNIT("Time_Request_Reply.cpp");
+USEUNIT("Timer_Hash.cpp");
+USEUNIT("Timer_Hash_T.cpp");
+USEUNIT("Timer_Heap.cpp");
+USEUNIT("Timer_Heap_T.cpp");
+USEUNIT("Timer_List.cpp");
+USEUNIT("Timer_List_T.cpp");
+USEUNIT("Timer_Queue.cpp");
+USEUNIT("Timer_Queue_Adapters.cpp");
+USEUNIT("Timer_Queue_T.cpp");
+USEUNIT("Timer_Wheel.cpp");
+USEUNIT("Timer_Wheel_T.cpp");
+USEUNIT("TLI.cpp");
+USEUNIT("TLI_Acceptor.cpp");
+USEUNIT("TLI_Connector.cpp");
+USEUNIT("TLI_Stream.cpp");
+USEUNIT("Token.cpp");
+USEUNIT("Token_Collection.cpp");
+USEUNIT("Token_Invariants.cpp");
+USEUNIT("Token_Manager.cpp");
+USEUNIT("Token_Request_Reply.cpp");
+USEUNIT("Trace.cpp");
+USEUNIT("TTY_IO.cpp");
+USEUNIT("Typed_SV_Message.cpp");
+USEUNIT("Typed_SV_Message_Queue.cpp");
+USEUNIT("UNIX_Addr.cpp");
+USEUNIT("UPIPE_Acceptor.cpp");
+USEUNIT("UPIPE_Connector.cpp");
+USEUNIT("UPIPE_Stream.cpp");
+USEUNIT("WFMO_Reactor.cpp");
+USEUNIT("XtReactor.cpp");
+//---------------------------------------------------------------------------
+#endif
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 8b64a05eb9d..42836e98183 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -129,7 +129,7 @@ ACE_Asynch_Acceptor<HANDLER>::accept (size_t bytes_to_read)
 template <class HANDLER> void 
 ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &result)
 {
-#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (_WIN32_WINNT >= 0x0400)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
 
   // Variable for error tracking 
   int error = 0;
@@ -221,7 +221,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re
     {
       this->accept (this->bytes_to_read_);
     }
-#endif // defined (ACE_HAS_WINSOCK2) || (_WIN32_WINNT >= 0x0400)
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
 }
 
 template <class HANDLER> int
@@ -237,11 +237,11 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void)
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
-#if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) && defined (_MSC_VER) && (_MSC_VER > 1020)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020))
   return (int) ::CancelIo (this->listen_handle_);
 #else
   ACE_NOTSUP_RETURN (-1);
-#endif /* (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020)) */
 }
 
 template <class HANDLER> void
@@ -249,7 +249,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (ACE_Message_Block &message_block,
 					     ACE_INET_Addr &remote_address,
 					     ACE_INET_Addr &local_address)
 {
-#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (_WIN32_WINNT >= 0x0400)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   sockaddr *local_addr = 0;
   sockaddr *remote_addr = 0;
   int local_size = 0;
@@ -269,7 +269,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (ACE_Message_Block &message_block,
 #else
   // just in case
   errno = ENOTSUP;
-#endif // defined (ACE_HAS_WINSOCK2) || (_WIN32_WINNT >= 0x0400)
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
 }
 
 template <class HANDLER> ACE_HANDLE 
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp
index 9f794fc04a8..d0f76ff3325 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -132,11 +132,11 @@ ACE_Asynch_Operation::cancel (void)
   // All I/O operations that are canceled will complete with the error
   // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
   // operations will occur normally.
-#if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) && defined (_MSC_VER) && (_MSC_VER > 1020)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020))
   return (int) ::CancelIo (this->handle_);
 #else
   ACE_NOTSUP_RETURN (-1);
-#endif /* (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020)) */
 }
 
 // ************************************************************
@@ -492,8 +492,8 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block,
 			   ACE_HANDLE accept_handle,
 			   const void *act)
 {
-#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (_WIN32_WINNT >= 0x0400)
-  // Sanity check: make sure that enough space has been allocated by the caller. 
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+  // Sanity check: make sure that enough space has been allocated by the caller.
   size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr);
   size_t space_in_use = message_block.wr_ptr () - message_block.base ();
   size_t total_size = message_block.size ();
@@ -566,7 +566,7 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block,
     }
 #else
   ACE_NOTSUP_RETURN (-1);
-#endif /* defined (ACE_HAS_WINSOCK2) || (_WIN32_WINNT >= 0x0400) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
 }
   
 // ************************************************************
@@ -645,7 +645,7 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
 					 u_long flags,
 					 const void *act)
 {
-#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (_WIN32_WINNT >= 0x0400)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   Result *result = 0;
   ACE_NEW_RETURN (result, 
 		  Result (*this->handler_,
@@ -697,7 +697,7 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
     }  
 #else
   ACE_NOTSUP_RETURN (-1);
-#endif /* defined (ACE_HAS_WINSOCK2) || (_WIN32_WINNT >= 0x0400) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
 }
   
 // ************************************************************
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 7010d74a154..4a3a34aac99 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -35,7 +35,7 @@ class ACE_Handler;
 class ACE_Message_Block;
 class ACE_INET_Addr;
 
-class ACE_Export ACE_Asynch_Result : protected OVERLAPPED
+class ACE_Export ACE_Asynch_Result : public OVERLAPPED
 {
   // = TITLE
   //     An abstract class which adds information to the OVERLAPPED
diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
index 1fff80d896d..a93a4412f39 100644
--- a/ace/CORBA_Ref.h
+++ b/ace/CORBA_Ref.h
@@ -22,6 +22,8 @@
 #if !defined (ACE_CORBA_REF_H)
 #define ACE_CORBA_REF_H
 
+#include "ace/ACE.h"
+
 template <class CORBA_REF>
 class ACE_CORBA_Ref
 {
diff --git a/ace/Future.h b/ace/Future.h
index 4f628074773..4677fcd164d 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -26,7 +26,8 @@
 // Forward decl.
 template <class T> class ACE_Future;
 
-template <class T> class ACE_Future_Rep
+template <class T>
+class ACE_Future_Rep
 {
   // = TITLE
   //     ACE_Future_Rep<T>
@@ -103,7 +104,8 @@ private:
   ACE_Thread_Mutex value_ready_mutex_;
 };
 
-template <class T> class ACE_Future 
+template <class T>
+class ACE_Future 
 {
   // = TITLE
   //     This class implements a ``single write, multiple read''
diff --git a/ace/LOCK_SOCK_Acceptor.cpp b/ace/LOCK_SOCK_Acceptor.cpp
index f6408e52d8a..ee5c9681add 100644
--- a/ace/LOCK_SOCK_Acceptor.cpp
+++ b/ace/LOCK_SOCK_Acceptor.cpp
@@ -4,6 +4,7 @@
 #define ACE_LOCK_SOCK_ACCEPTOR_CPP
 
 #include /**/ "ace/Synch.h"
+#include /**/ "ace/LOCK_SOCK_Acceptor.h"
 
 template <class ACE_LOCK> int
 ACE_LOCK_SOCK_Acceptor<ACE_LOCK>::accept (ACE_SOCK_Stream &stream,
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 8c5e79cb0c5..20666bd82c5 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -601,7 +601,9 @@ ACE_Log_Msg::log (const ASYS_TCHAR *format_str,
   ACE_TRACE ("ACE_Log_Msg::log");
   // External decls.
 
-  extern int sys_nerr;
+#if ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+   extern int sys_nerr;
+#endif /* ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
   typedef void (*PTF)(...);
 
   // Only print the message if <priority_mask_> hasn't been reset to
diff --git a/ace/Msg_WFMO_Reactor.cpp b/ace/Msg_WFMO_Reactor.cpp
index b3874764255..05035860a20 100644
--- a/ace/Msg_WFMO_Reactor.cpp
+++ b/ace/Msg_WFMO_Reactor.cpp
@@ -37,7 +37,7 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout,
   // ReadFile and WriteFile operations. QS_ALLINPUT allows
   // <MsgWaitForMultipleObjectsEx> to wait for any message is in the
   // queue.
-#if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
   return ::MsgWaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (),
                                         this->handler_rep_.handles (),
                                         timeout,
@@ -50,7 +50,7 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout,
                                       FALSE,
                                       timeout,
                                       QS_ALLINPUT);
-#endif /* (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 }
 
 int
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 104704fb7f7..a7f3ff6a35f 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -102,11 +102,21 @@ ACE_Time_Value::operator FILETIME () const
 {
   // ACE_TRACE ("ACE_Time_Value::operator FILETIME");
   ULARGE_INTEGER _100ns;
- _100ns.QuadPart = ((DWORDLONG) this->tv_.tv_sec * (10000 * 1000) +
-                    this->tv_.tv_usec * 10) + ACE_Time_Value::FILETIME_to_timval_skew;
+  _100ns.QuadPart = (((DWORDLONG) this->tv_.tv_sec * (10000 * 1000) +
+		      this->tv_.tv_usec * 10) +
+		     ACE_Time_Value::FILETIME_to_timval_skew);
   FILETIME file_time;
-  file_time.dwLowDateTime = _100ns.LowPart;
-  file_time.dwHighDateTime = _100ns.HighPart;
+
+#if (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+#define LOWPART(x) x.u.LowPart
+#define HIGHPART(x) x.u.HighPart
+#else
+#define LOWPART(x) x.LowPart
+#define HIGHPART(x) x.HighPart
+#endif /* (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+
+  file_time.dwLowDateTime = LOWPART(_100ns);
+  file_time.dwHighDateTime = HIGHPART(_100ns);
 
   return file_time;
 }
@@ -299,12 +309,12 @@ ACE_OS::uname (struct utsname *name)
     TCHAR processor[bufsize] = __TEXT ("Unknown");
     TCHAR subtype[bufsize] = __TEXT ("Unknown");
 
-#if defined (__BORLANDC__)
-    // Some changes should be made in winbase.h...
-    switch (sinfo.s.wProcessorArchitecture)
+#if defined(__BORLANDC__)
+#define PROCARCH(x) x.wProcessorArchitecture
 #else
-    switch (sinfo.wProcessorArchitecture)
-#endif /* __BORLAND__ */
+#define PROCARCH(x) x.s.wProcessorArchitecture
+#endif /* defined(__BORLANDC__) */
+    switch (PROCARCH(sinfo))
     {
     case PROCESSOR_ARCHITECTURE_INTEL:
       ACE_OS::strcpy (processor, __TEXT ("Intel"));
diff --git a/ace/OS.h b/ace/OS.h
index f0e9b2de4cc..8ffc414cafc 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -360,20 +360,22 @@
 
 // First, we define how to properly export/import objects.
 #if defined (ACE_WIN32)         // Only Win32 needs special treatment.
-# if !defined (_MSC_VER) /* Mark classes as exported, Borland. */
+# if defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+/*  Microsoft, Borland C++ Builder: */
+#   define ACE_Proper_Export_Flag __declspec (dllexport)
+#   define ACE_Proper_Import_Flag __declspec (dllimport)
+#   define ACE_EXPORT_SINGLETON_DECLARATION(T)  template class __declspec (dllexport) T
+#   define ACE_IMPORT_SINGLETON_DECLARATION(T)  extern template class T
+#   define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T
+# else /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+/* Non-Microsoft, other versions of Borland: */
 #   define ACE_Proper_Export_Flag _export
 #   define ACE_Proper_Import_Flag _import
 //   @@ Don't know how to handle this when using Borland's compilers.
 #   define ACE_EXPORT_SINGLETON_DECLARATION(T)
 #   define ACE_IMPORT_SINGLETON_DECLARATION(T)
 #   define ACE_PROPER_SINGLETON_INSTANTIATION(T)
-# else /* Microsoft: */
-#   define ACE_Proper_Export_Flag __declspec (dllexport)
-#   define ACE_Proper_Import_Flag __declspec (dllimport)
-#   define ACE_EXPORT_SINGLETON_DECLARATION(T)  template class __declspec (dllexport) T
-#   define ACE_IMPORT_SINGLETON_DECLARATION(T)  extern template class T
-#   define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T
-# endif /* !_MSC_VER */
+# endif /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
 #else  /* ! ACE_WIN32 */
 # define ACE_Proper_Export_Flag
 # define ACE_Proper_Import_Flag
diff --git a/ace/OS.i b/ace/OS.i
index afdafe37301..177f544e400 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -7890,7 +7890,13 @@ ACE_OS::fdopen (ACE_HANDLE handle, const char *mode)
 #endif /* __BORLANDC__ */
 
       if (!file)
-        ::_close (crt_handle);
+	{
+#if (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+	  ::_rtl_close (crt_handle);
+#else
+	  ::_close (crt_handle);
+#endif /* (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+	}
     }
 
   return file;
@@ -7905,7 +7911,7 @@ ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset)
 {
   // ACE_TRACE ("ACE_OS::ftruncate");
 #if defined (ACE_WIN32)
-  if (::SetFilePointer (handle, offset, NULL, FILE_BEGIN) != -1)
+  if (::SetFilePointer (handle, offset, NULL, FILE_BEGIN) != (unsigned) -1)
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetEndOfFile (handle), ace_result_), int, -1);
   else
     ACE_FAIL_RETURN (-1);
@@ -9080,17 +9086,20 @@ ACE_OS::fdopen (ACE_HANDLE handle, const wchar_t *mode)
 
   if (crt_handle != -1)
     {
-#if defined(__BORLANDC__) // VSB
-      //      file = ::_fdopen (crt_handle, (wchar_t *) mode);
-      // @@ Comment out the following line if you don't think you
-      // want to deal with this.
-#error "Please correct me!"
+#if defined(__BORLANDC__)
+      file = ::_wfdopen (crt_handle, (wchar_t*) mode);
 #else
       file = ::_wfdopen (crt_handle, mode);
-#endif /* __BORLANDC__ */
+#endif /* defined(__BORLANDC__) */
 
       if (!file)
-        ::_close (crt_handle);
+	{
+#if (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+	  ::_rtl_close (crt_handle);
+#else
+	  ::_close (crt_handle);
+#endif /* (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+	}
     }
 
   return file;
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 7272a1c2431..997e1b02c7f 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -500,8 +500,9 @@ public:
 #define ACE_TSS_Write_GUARD ACE_Write_Guard
 #define ACE_TSS_Read_GUARD ACE_Read_Guard
 
-#else /* ACE platform supports some form of threading and */
-      // thread-specific storage.
+#else
+ /* ACE platform supports some form of threading and
+  thread-specific storage. */
 
 template <class ACE_LOCK>
 class ACE_TSS_Guard
diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp
index c2f129ef9b0..aafecbd6560 100644
--- a/ace/TTY_IO.cpp
+++ b/ace/TTY_IO.cpp
@@ -181,9 +181,12 @@ ACE_TTY_IO::control (Control_Mode cmd,
 
       switch (arg->stopbits)
         {
-        case 1: dcb.StopBits = ONESTOPBIT ; break ;
-        case 2: dcb.StopBits = TWOSTOPBITS; break ;
-          break;
+        case 1:
+	  dcb.StopBits = ONESTOPBIT;
+	  break ;
+        case 2:
+	  dcb.StopBits = TWOSTOPBITS;
+	  break ;
         default:
           return -1;
         }
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 68305843a84..83ea5080a5b 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -93,14 +93,13 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
   size_t original_handle_count = this->handles_to_be_deleted_;
+  int result = 0;
+  size_t i;
 
   // Go through all the handles looking for <handle>.  Even if we find
   // it, we continue through the rest of the list since <handle> could
   // appear multiple times. All handles are checked.
 
-  int result = 0;
-  size_t i;
-
   // First check the current entries
   for (i = 0; i < this->max_handlep1_ && error == 0; i++)
     // Since the handle can either be the event or the I/O handle,
@@ -302,7 +301,6 @@ ACE_WFMO_Reactor_Handler_Repository::suspend_handler_i (ACE_HANDLE handle,
   // Remember this value; only if it changes do we need to wakeup
   // the other threads
   size_t original_handle_count = this->handles_to_be_suspended_;
-  int result = 0;
   size_t i = 0;
 
   // Go through all the handles looking for <handle>.  Even if we find
@@ -356,7 +354,6 @@ ACE_WFMO_Reactor_Handler_Repository::resume_handler_i (ACE_HANDLE handle,
   // Go through all the handles looking for <handle>.  Even if we find
   // it, we continue through the rest of the list since <handle> could
   // appear multiple times. All handles are checked.
-  int result = 0;
   size_t i = 0;
 
   for (i = 0; i < this->suspended_handles_; i++)
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index c411b0089f7..50de6c8828f 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -89,10 +89,10 @@ typedef unsigned __int64 ACE_UINT64;
 // Platform supports the /proc file system.
 //define ACE_HAS_PROC_FS
 
-#if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
 // Platform supports the rusage struct.
 #define ACE_HAS_GETRUSAGE
-#endif /* ! ACE_HAS_WINCE */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
@@ -113,6 +113,7 @@ typedef unsigned __int64 ACE_UINT64;
 //define ACE_HAS_SYS_SIGLIST
 
 #define ACE_WIN32
+
 #if defined (__BORLANDC__)
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 #define ACE_HAS_BROKEN_SAP_ANY
@@ -352,11 +353,11 @@ typedef unsigned __int64 ACE_UINT64;
 #endif /* !defined (_INC_WINDOWS) */
 
 // Always use WS2 when available
-#if (ACE_HAS_WINNT4 != 0)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))
         #if !defined(ACE_HAS_WINSOCK2)
                 #define ACE_HAS_WINSOCK2 1
-        #endif
-#endif
+        #endif /* !defined(ACE_HAS_WINSOCK2) */
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */
 
 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
         #if !defined (_WINSOCK2API_)
@@ -387,7 +388,7 @@ typedef unsigned __int64 ACE_UINT64;
         #pragma warning(default: 4201)  /* winnt.h uses nameless structs */
 #endif /* _MSC_VER */
 
-#if (_WIN32_WINNT >= 0x0400) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
         #define ACE_HAS_INTERLOCKED_EXCHANGEADD
         #define ACE_HAS_WIN32_TRYLOCK
         #define ACE_HAS_SIGNAL_OBJECT_AND_WAIT
@@ -395,6 +396,36 @@ typedef unsigned __int64 ACE_UINT64;
         // If CancelIO is undefined get the updated sp2-sdk
         // from MS
         #define ACE_HAS_CANCEL_IO
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) */
+
+/* Borland C++ Builder definitions. */
+#if (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
+
+#ifdef ACE_HAS_STANDARD_CPP_LIBRARY
+#undef ACE_HAS_STANDARD_CPP_LIBRARY
+#endif
+#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+
+#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+#undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
 #endif
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+
+#ifdef ACE_LACKS_STL_DEFAULT_TEMPLATE_PARAMETER
+#undef ACE_LACKS_STL_DEFAULT_TEMPLATE_PARAMETER
+#endif
+#define ACE_LACKS_STL_DEFAULT_TEMPLATE_PARAMETER 1
+
+#ifdef ACE_HAS_USING_KEYWORD
+#undef ACE_HAS_USING_KEYWORD
+#endif
+#define ACE_HAS_USING_KEYWORD 1
+
+#ifdef ACE_SIZEOF_LONG_DOUBLE
+#undef ACE_SIZEOF_LONG_DOUBLE
+#endif
+#define ACE_SIZEOF_LONG_DOUBLE 10
+
+#endif /* (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
 
 #endif /* ACE_WIN32_COMMON_H */