summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-26 17:46:56 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-26 17:46:56 +0000
commit705bd1545ebc5dbe13fda4f4eaba58da883d6a3f (patch)
treea17971ff1988df8f0e714a500c592aee963c902f
parent3b35581efccfc28b8c345e60deab262dd29ec994 (diff)
downloadATCD-705bd1545ebc5dbe13fda4f4eaba58da883d6a3f.tar.gz
cleaned up ACE_HAS_NONSTATIC_OBJECT_MANAGER hack
-rw-r--r--ace/OS.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 7ca42450b1f..74e5353bf92 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4038,16 +4038,15 @@ extern "C" ssize_t writev_timedwait (ACE_HANDLE handle,
#include "ace/Object_Manager.h"
#define main \
-ace_internal_main (int, char *[]); /* forward declaration */ \
+ace_main_i (int, char *[]); /* forward declaration */ \
int \
-ACE_MAIN (int argc, char *argv[]) /* user's entry point, \
- e.g., ace_main */ \
+ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., "main" */ \
{ \
ACE_Object_Manager ace_object_manager; /* has program lifetime */ \
- return ace_internal_main (argc, argv); /* what the user calls "main" */ \
+ return ace_main_i (argc, argv); /* what the user calls "main" */ \
} \
int \
-ace_internal_main
+ace_main_i
#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
#if defined (UNICODE)