@@ -697,12 +697,11 @@
 #ifdef HAVE_SEH_EXCEPTIONS
 typedef EXCEPTION_DISPOSITION (*seh_personality_fn)(PEXCEPTION_RECORD, void*,
     PCONTEXT, PDISPATCHER_CONTEXT);
 static seh_personality_fn __gxx_personality_seh0 = NULL;
 
-static void __attribute__((__constructor__))
-gxx_personality_init(void)
+OF_CONSTRUCTOR()
 {
 	/*
 	 * This only works if the application uses libstdc++-6.dll.
 	 * There is unfortunately no other way, as Windows does not support
 	 * proper weak linking.