Changeset 570

Timestamp:

Aug 10, 2003, 11:40:53 PM (22 years ago)

Author:

bird

Message:

#577: Removed eh stuff + little cleanup.

File:

• trunk/src/emx/src/lib/startup/dllinit.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/startup/dllinit.c

@@ -5 +5 @@
 
 #include <emx/startup.h>
-extern int _CRT_init (void);
-extern void __ctordtorInit (void);
-extern void __ctordtorTerm (void);
-extern void __ehInit (void);
-#pragma weak __ehInit
-extern void __ehTerm (void);
-#pragma weak __ehTerm
-
-#ifndef _System
-# define _System
-#endif
 
 /**
- * This is the typical DLL startup code. __ehInit and __ehTerm is called
- * are for exception handler stuff in gcc, the two functions will be linked if 
- * there is exception handler info in the module. (Btw. if these calls wasn't 
- * made we would fail to catch exceptions in C++ code.)
+ * This is the typical DLL startup code.
+ *
  * @returns 1 on success.
  * @returns 0 on failure.
@@ -28 +15 @@
  *                  1 term.
  * @remark  This function is called from dll0.asm.
+ * @todo    _CRT_term() needs a checkup, it used to be called from here too..
  */
 unsigned _System _DLL_InitTerm (unsigned hmod, unsigned flag)
@@ -36 +24 @@
       if (_CRT_init () != 0)
         break;
-#if 0 /** @todo Weaks aren't working too well with ld at the moment.
-       * Andy added the calls to the static constructor and destructor lists
-       * which means we don't guarantee that throw/catch works during init
-       * and destruction of static objects. Don't belive it'll cause any
-       * trouble. Before too long we should put back this code.
-       */
-      if (__ehInit)
-        __ehInit ();
-#endif
       __ctordtorInit ();
       return 1;
     case 1:
       __ctordtorTerm ();
-#if 0 /* weaks aren't working at the moment */
-      if (__ehTerm)
-        __ehTerm ();
-#endif
       return 1;
   }
   return 0;
 }
+