ChangeLogTag:Wed Jul 2 23:10:25 UTC 2003 Don Hinton <dhinton@dresystems.com>

7 files changed, 79 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ec03440eb9f..86224c3dbfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,21 @@
+Wed Jul  2 23:10:25 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * tests/RMCast/Makefile:
+        * tests/RMCast/Makefile.bor:
+        * tests/RMCast/Main.cpp:
+        * tests/SSL/Makefile:
+        * tests/SSL/Makefile.bor:
+        * tests/SSL/Main.cpp:
+          Added Main.cpp and wired it up in the Makefiles.  This is
+          needed to work with Justin's changes below in preparation to
+          using MPC for all builds.
+
 Wed Jul  2 22:48:18 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/config-all.h/
           Rolled back Wed Jul  2 22:17:15 UTC 2003  Don Hinton
           <dhinton@dresystems.com> temporarily, since it is defined
-          inconsistenly and compilation will fail if ACE_HAS_ANSI_CASTS is
+          inconsistently and compilation will fail if ACE_HAS_ANSI_CASTS is
           just defined and not defined as a number.
 
 Wed Jul  2 22:17:15 UTC 2003  Don Hinton  <dhinton@dresystems.com>
@@ -81,7 +93,7 @@ Tue Jul  1 19:39:16 UTC 2003  Don Hinton  <dhinton@dresystems.com>
           Added ACE_LACKS_SYS_UN_H and ACE_LACKS_PTHREAD_H.
 
         * ace/os_include/sys/os_mman.h:
-          Added !defined (ACE_WIN32) to the intial #if for the PROT_*
+          Added !defined (ACE_WIN32) to the initial #if for the PROT_*
           define section so Windows can make it to the #ifelse section. 
 
 Sun Jun 29 01:31:52 UTC 2003  Don Hinton  <dhinton@dresystems.com>
diff --git a/tests/RMCast/Main.cpp b/tests/RMCast/Main.cpp
new file mode 100644
index 00000000000..e80f79ca2c2
--- /dev/null
+++ b/tests/RMCast/Main.cpp
@@ -0,0 +1,30 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Main.cpp
+//
+// = DESCRIPTION
+//     This is a wrapper for the test programs.  It obviates the test cpp's
+//     from having to always include OS.h.
+//
+// = AUTHOR
+//    Don Hinton <dhinton@dresystems.com>
+//
+// ============================================================================
+
+#include "ace/OS.h"
+#if defined (ACE_HAS_WINCE)
+#  include "ace/ACE.h"
+#endif /* ACE_HAS_WINCE */
+int run_main (int argc, ACE_TCHAR *argv[]);
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  return run_main (argc, argv);
+}
diff --git a/tests/RMCast/Makefile b/tests/RMCast/Makefile
index 370a034e637..ffd27bf32f1 100644
--- a/tests/RMCast/Makefile
+++ b/tests/RMCast/Makefile
@@ -20,6 +20,8 @@ LDLIBS = -lACE_RMCast -lTest_Output
 
 CPPFLAGS += -I..
 
+SRC = Main.cpp
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
diff --git a/tests/RMCast/Makefile.bor b/tests/RMCast/Makefile.bor
index 890febc1192..93bf4f7e711 100644
--- a/tests/RMCast/Makefile.bor
+++ b/tests/RMCast/Makefile.bor
@@ -16,7 +16,7 @@ NAMES = \
 	RMCast_Retransmission_Test \
 	RMCast_UDP_Best_Effort_Test
 
-OBJFILES = $(OBJDIR)\$(NAME).obj
+OBJFILES = $(OBJDIR)\$(NAME).obj $(OBJDIR)\Main.obj
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
diff --git a/tests/SSL/Main.cpp b/tests/SSL/Main.cpp
new file mode 100644
index 00000000000..e80f79ca2c2
--- /dev/null
+++ b/tests/SSL/Main.cpp
@@ -0,0 +1,30 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Main.cpp
+//
+// = DESCRIPTION
+//     This is a wrapper for the test programs.  It obviates the test cpp's
+//     from having to always include OS.h.
+//
+// = AUTHOR
+//    Don Hinton <dhinton@dresystems.com>
+//
+// ============================================================================
+
+#include "ace/OS.h"
+#if defined (ACE_HAS_WINCE)
+#  include "ace/ACE.h"
+#endif /* ACE_HAS_WINCE */
+int run_main (int argc, ACE_TCHAR *argv[]);
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  return run_main (argc, argv);
+}
diff --git a/tests/SSL/Makefile b/tests/SSL/Makefile
index fce81acae5f..34b93297fff 100644
--- a/tests/SSL/Makefile
+++ b/tests/SSL/Makefile
@@ -14,6 +14,7 @@ BIN =   Thread_Pool_Reactor_SSL_Test
 PSRC=$(addsuffix .cpp,$(BIN))
 LDLIBS = -lACE_SSL -lssl -lcrypto -lTest_Output
 CPPFLAGS += -I..
+SRC = Main.cpp
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/tests/SSL/Makefile.bor b/tests/SSL/Makefile.bor
index ff8e5be09d6..d7a0d00b6aa 100644
--- a/tests/SSL/Makefile.bor
+++ b/tests/SSL/Makefile.bor
@@ -6,7 +6,7 @@
 NAMES = \
 	Thread_Pool_Reactor_SSL_Test
 
-OBJFILES = $(OBJDIR)\$(NAME).obj
+OBJFILES = $(OBJDIR)\$(NAME).obj $(OBJDIR)\Main.obj
 
 CFLAGS = \
         $(ACE_CFLAGS) \