Merge win32/win_dll.c

This commit is contained in:
SteelT 2020-08-10 15:41:49 -04:00
parent 7ad5057fe9
commit 5271db81b7

View file

@ -86,9 +86,6 @@ static VOID UnloadDLL (HMODULE* pModule)
// ==========================================================================
// note : the 3D driver loading should be put somewhere else..
<<<<<<< HEAD
=======
#ifdef HWRENDER
static HMODULE hwdModule = NULL;
@ -173,7 +170,6 @@ VOID Shutdown3DDriver (VOID)
}
#endif
>>>>>>> srb2/next
#ifdef HW3SOUND
static HMODULE hwsModule = NULL;