Author: tfaber Date: Sun Nov 22 20:49:47 2015 New Revision: 70039
URL: http://svn.reactos.org/svn/reactos?rev=70039&view=rev Log: [CRT] - Don't call global constructors twice on MSVC builds CORE-10562
Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c
Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmain... ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sun Nov 22 20:49:47 2015 @@ -20,31 +20,6 @@ #error Unsupported platform #endif
-/* - * Initializer / constructor handling - * see http://msdn.microsoft.com/en-us/library/bb918180.aspx - * Destructors are registered from the initializers using atexit() - */ - -extern _PVFV __xi_a[]; -extern _PVFV __xi_z[]; -extern _PVFV __xc_a[]; -extern _PVFV __xc_z[]; - -static -void -__do_xtors( - _PVFV *start, - _PVFV *end) -{ - _PVFV *current; - for (current = start; current < end; current++) - { - if (*current != NULL) - (*current)(); - } -} - void _pei386_runtime_relocator(void) { } @@ -53,13 +28,6 @@ { /* Nothing to do */ return 1; -} - -void -__do_global_ctors(void) -{ - __do_xtors(__xi_a, __xi_z); - __do_xtors(__xc_a, __xc_z); }
BOOL @@ -114,8 +82,6 @@ initialized = 1;
_RTC_Initialize(); - - __do_global_ctors (); } }