diff options
Diffstat (limited to 'ace/OS_main.cpp')
| -rw-r--r-- | ace/OS_main.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp index 5d8c43ac716..79e8413bea9 100644 --- a/ace/OS_main.cpp +++ b/ace/OS_main.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- // $Id$ #include "ace/OS_main.h" @@ -26,7 +25,7 @@ ACE_RCSID(ace, OS_main, "$Id$") # if !defined (ACE_WIN32) -# if !defined (ACE_VXWORKS) +# if !(defined (ACE_VXWORKS) && !defined (__RTP__)) /* forward declaration */ extern int ace_main_i (int, char *[]); # endif @@ -70,7 +69,9 @@ ACE_MAIN () /* user's entry point, e.g., "main" w/out argc, argv */ # endif /* ACE_PSOSIM */ -# if defined (ACE_VXWORKS) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +# if defined (ACE_VXWORKS) && !defined (__RTP__) ace_main_proc_ptr vx_ace_main_i_ptr = 0; int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ @@ -78,7 +79,7 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ ACE_MAIN_OBJECT_MANAGER return vx_ace_main_i_ptr ? (*vx_ace_main_i_ptr) (argc, argv) : (-1); /* what the user calls "main" */ } -# else /* !ACE_VXWORKS */ +# else /* !ACE_VXWORKS && !__RTP__ */ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ { ACE_MAIN_OBJECT_MANAGER @@ -86,8 +87,12 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ } # endif +ACE_END_VERSIONED_NAMESPACE_DECL + # elif !defined (ACE_HAS_WINCE) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + # if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) int ACE_Main_Base::run (int argc, ACE_TCHAR *argv[]) { @@ -114,6 +119,8 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi } # endif /* ACE_WIN32 && ACE_USES_WCHAR */ +ACE_END_VERSIONED_NAMESPACE_DECL + # else /* ACE_HAS_WINCE */ // CE only gets a command line string; no argv. So we need to convert it @@ -122,6 +129,8 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi # include "ace/ACE.h" # include "ace/ARGV.h" +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + int ACE_Main_Base::run (HINSTANCE, HINSTANCE, LPWSTR lpCmdLine, @@ -137,6 +146,8 @@ int ACE_Main_Base::run (HINSTANCE, ACE::fini (); return i; } +ACE_END_VERSIONED_NAMESPACE_DECL # endif /* !ACE_HAS_WINCE */ + # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ |