Changeset 5135 for trunk/src/DPlayX

Timestamp:

Feb 14, 2001, 4:14:46 PM (25 years ago)

Author:

sandervl

Message:

VAC 3.6.5 bug workaround

Location:

trunk/src/DPlayX

Files:

• dplayx_main.cpp (modified) (4 diffs)
• initterm.cpp (modified) (1 diff)

trunk/src/DPlayX/dplayx_main.cpp

@@ -1 @@
-// $Id: dplayx_main.cpp,v 1.2 2000-09-24 22:47:37 hugh Exp $
+// $Id: dplayx_main.cpp,v 1.3 2001-02-14 15:14:41 sandervl Exp $
 /*
  * DPLAYX.DLL LibMain
@@ -18 +18 @@
 #include "dplaysp.h"
 #include "dplayx_global.h"
+#ifdef __WIN32OS2__
+#include <initdll.h>
+#endif
 
 DEFAULT_DEBUG_CHANNEL(dplay);
@@ -27 +30 @@
 /* This is a globally exported variable at ordinal 6 of DPLAYX.DLL */
 DWORD gdwDPlaySPRefCount = 0; /* FIXME: Should it be initialized here? */
-
-extern "C" {
-void CDECL _ctordtorTerm( void );
-}
 
 BOOL WINAPI DPLAYX_LibMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
@@ -59 +58 @@
         /* Last instance performs destruction of global processor data */
         rc = DPLAYX_DestructData();
-        _ctordtorTerm();
+#ifdef __WIN32OS2__
+        ctordtorTerm();
+#endif
         return rc;
       }

trunk/src/DPlayX/initterm.cpp

@@ -66 +66 @@
    switch (ulFlag) {
       case 0:
-         __ctordtorInit();
+         ctordtorInit();
 
          CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/