summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-11-24 11:59:52 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-11-24 11:59:52 +0000
commitc0936ce10c3524fb7490f8aba86393ab2831ed2b (patch)
treeb165d2c1d080d9246a327e4dac7277b117796f15
parent838e6965eaa5def73eb4681f23dd76cd9e7ac025 (diff)
downloadATCD-c0936ce10c3524fb7490f8aba86393ab2831ed2b.tar.gz
-rw-r--r--ACE/ace/Rtems_init.c4
-rw-r--r--ACE/ace/config-rtems.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
index 32e5bc9f118..a6c62c66d52 100644
--- a/ACE/ace/Rtems_init.c
+++ b/ACE/ace/Rtems_init.c
@@ -205,7 +205,7 @@ struct rtems_bsdnet_config rtems_bsdnet_config = {
#endif /* ACE_LACKS_NETWORKING */
-//extern int ace_main_i (int, char *[]);
+extern int main (int, char *[]);
/*
* RTEMS Startup Task
@@ -219,7 +219,7 @@ Init (rtems_task_argument not_used)
rtems_bsdnet_initialize_network ();
rtems_bsdnet_show_inet_routes ();
#endif /* ACE_LACKS_NETWORKING */
- //int retval = ace_main_i (0, 0);
+ int retval = main (0, 0);
}
#elif !defined (__GNUC__)
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index 040ffa7c8eb..ff95c69c73a 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -37,10 +37,6 @@
#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-#if !defined (ACE_MAIN)
-# define ACE_MAIN ace_main
-#endif /* ! ACE_MAIN */
-
#define ACE_LACKS_REGEX_H
#define ACE_LACKS_STROPTS_H
#define ACE_LACKS_DLFCN_H