diff options
6 files changed, 19 insertions, 9 deletions
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 28a01e93b28..8c5b4c7bd21 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -25,7 +25,7 @@ // executable and initialized for static builds. #include "tao/Strategies/advanced_resource.h" -#if defined (VXWORKS) +#if defined (ACE_VXWORKS) && !defined (__RTP__) # undef ACE_MAIN # define ACE_MAIN testClient #endif diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index 2e968cb9eb6..acc84689614 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -25,6 +25,12 @@ // executable and initialized for static builds. #include "tao/Strategies/advanced_resource.h" +#if defined (ACE_VXWORKS) && !defined (__RTP__) +# undef ACE_MAIN +# define ACE_MAIN testServer +#endif + + const char *ior_output_file = "test.ior"; int main (int argc, char *argv[]) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp index 637f330ddf2..16fad32ff86 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp @@ -1,10 +1,11 @@ // $Id$ #include "ace/config-all.h" -#if defined (VXWORKS) + +#if defined (ACE_VXWORKS) && !defined (__RTP__) # undef ACE_MAIN # define ACE_MAIN client -#endif /* VXWORKS */ +#endif /* ACE_VXWORKS && !__RTP__ */ #include "Cubit_Client.h" #include "tao/Timeprobe.h" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp index 89963eaf808..f28cd411ef0 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -1,10 +1,11 @@ // $Id$ #include "ace/config-all.h" -#if defined (VXWORKS) + +#if defined (ACE_VXWORKS) && !defined (__RTP__) # undef ACE_MAIN # define ACE_MAIN server -#endif /* VXWORKS */ +#endif /* ACE_VXWORKS && !__RTP__ */ #include "Cubit_Server.h" #include "tao/Timeprobe.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp index e86ec5ebd87..e0d97da8166 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp @@ -1,10 +1,11 @@ // $Id$ #include "ace/config-all.h" -#if defined (ACE_VXWORKS) + +#if defined (ACE_VXWORKS) && !defined (__RTP__) # undef ACE_MAIN # define ACE_MAIN client -#endif /* ACE_VXWORKS */ +#endif /* ACE_VXWORKS && !__RTP__ */ #include "ace/Sched_Params.h" #include "tao/Strategies/advanced_resource.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index 33962326f77..9235f275e82 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -17,10 +17,11 @@ // ============================================================================ #include "ace/config-all.h" -#if defined (VXWORKS) + +#if defined (ACE_VXWORKS) && !defined (__RTP__) # undef ACE_MAIN # define ACE_MAIN server -#endif /* VXWORKS */ +#endif /* ACE_VXWORKS && !__RTP__ */ #include "server.h" #include "ace/Sched_Params.h" |