ChangeLogTag:Wed Mar 6 14:43:34 2002 Nanbor Wang <nanbor@cs.wustl.edu>

1 files changed, 18 insertions, 8 deletions

diff --git a/ace/OS.h b/ace/OS.h
index afe0e3e332f..29c4d69232e 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -7089,6 +7089,16 @@ extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args);
 #   define ACE_MAIN main
 # endif /* ! ACE_MAIN */
 
+# if !defined (ACE_WMAIN)
+#   define ACE_WMAIN wmain
+# endif /* ! ACE_WMAIN */
+
+# if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+#   define ACE_TMAIN wmain
+# else
+#   define ACE_TMAIN main
+# endif
+
 # if defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
 #   if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
 #     define ACE_HAS_NONSTATIC_OBJECT_MANAGER
@@ -7155,29 +7165,29 @@ ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 } \
 int \
 ace_main_i
-#   elif defined (ACE_WIN32) && defined (UNICODE)
-#     define wmain \
-ace_main_i (int, ACE_TCHAR *[]);                  /* forward declaration */ \
+#   else
+#     define main \
+ace_main_i (int, char *[]);                  /* forward declaration */ \
 int \
-wmain (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., main */ \
+ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \
 { \
   ACE_MAIN_OBJECT_MANAGER \
   return ace_main_i (argc, argv);           /* what the user calls "main" */ \
 } \
 int \
 ace_main_i
-#     define main wmain
-#   else
-#     define main \
+#     if defined (ACE_WIN32)
+#     define wmain \
 ace_main_i (int, ACE_TCHAR *[]);                  /* forward declaration */ \
 int \
-ACE_MAIN (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., main */ \
+ACE_WMAIN (int argc, ACE_TCHAR *argv[]) /* user's entry point, e.g., main */ \
 { \
   ACE_MAIN_OBJECT_MANAGER \
   return ace_main_i (argc, argv);           /* what the user calls "main" */ \
 } \
 int \
 ace_main_i
+#     endif /* ACE_WIN32 && UNICODE */
 #   endif   /* ACE_PSOSIM */
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */