From 7ec974a923006e2886b1d5397e4e54ece0281173 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 24 Dec 2009 16:36:41 +0000
Subject: [PATCH] change a few WIN64 checks to _WIN64 (which actually works),
 and remove the rest (dll names are the same, and ssize_t needs to be
 declared)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9679 d7cf8633-e32d-0410-b094-e92efae38249
---
 cap_ogg.c     | 16 ++++------------
 cl_gecko.c    |  6 ++----
 fs.c          |  4 +---
 ft2.c         |  4 +---
 image_png.c   |  4 +---
 jpeg.c        |  4 +---
 libcurl.c     |  4 +---
 qtypes.h      |  2 +-
 quakedef.h    |  4 ++--
 snd_3dras.c   | 10 ++++------
 snd_modplug.c |  4 +---
 snd_ogg.c     |  8 ++------
 world.c       |  4 +---
 13 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/cap_ogg.c b/cap_ogg.c
index 626efe4a..424eac41 100644
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -521,9 +521,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 {
 	const char* dllnames_og [] =
 	{
-#if defined(WIN64)
-		"libogg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libogg.dll",
 		"ogg.dll",
 #elif defined(MACOSX)
@@ -536,9 +534,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 	};
 	const char* dllnames_vo [] =
 	{
-#if defined(WIN64)
-		"libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libvorbis.dll",
 		"vorbis.dll",
 #elif defined(MACOSX)
@@ -551,9 +547,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 	};
 	const char* dllnames_ve [] =
 	{
-#if defined(WIN64)
-		"libvorbisenc64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libvorbisenc.dll",
 		"vorbisenc.dll",
 #elif defined(MACOSX)
@@ -566,9 +560,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 	};
 	const char* dllnames_th [] =
 	{
-#if defined(WIN64)
-		"libtheora64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libtheora.dll",
 		"theora.dll",
 #elif defined(MACOSX)
diff --git a/cl_gecko.c b/cl_gecko.c
index 634b4d61..2aade4b4 100644
--- a/cl_gecko.c
+++ b/cl_gecko.c
@@ -551,7 +551,7 @@ static OSGK_ScriptResult dpGlobal_query (void* objTag, void* methTag,
   return result;
 }
 
-#if defined(WIN64)
+#if defined(_WIN64)
 # define XULRUNNER_DIR_SUFFIX	"win64"
 #elif defined(WIN32)
 # define XULRUNNER_DIR_SUFFIX	"win32"
@@ -848,9 +848,7 @@ qboolean CL_Gecko_OpenLibrary (void)
 {
 	const char* dllnames_gecko [] =
 	{
-#if defined(WIN64)
-		"OffscreenGecko64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"OffscreenGecko.dll",
 #elif defined(MACOSX)
 		"OffscreenGecko.dylib",
diff --git a/fs.c b/fs.c
index fcc4470a..8092ee1f 100644
--- a/fs.c
+++ b/fs.c
@@ -428,9 +428,7 @@ qboolean PK3_OpenLibrary (void)
 #else
 	const char* dllnames [] =
 	{
-#if defined(WIN64)
-		"zlib64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 # ifdef ZLIB_USES_WINAPI
 		"zlibwapi.dll",
 		"zlib.dll",
diff --git a/ft2.c b/ft2.c
index e27f95b6..7ed5ae52 100644
--- a/ft2.c
+++ b/ft2.c
@@ -169,9 +169,7 @@ qboolean Font_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
-#if defined(WIN64)
-		"freetype6_x64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"freetype6.dll",
 #elif defined(MACOSX)
 		"libfreetype.dylib",
diff --git a/image_png.c b/image_png.c
index ca090b2c..d57c1893 100644
--- a/image_png.c
+++ b/image_png.c
@@ -103,9 +103,7 @@ qboolean PNG_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
-#ifdef WIN64
-		"libpng12_64.dll",
-#elif WIN32
+#if WIN32
 		"libpng12.dll",
 #elif defined(MACOSX)
 		"libpng12.0.dylib",
diff --git a/jpeg.c b/jpeg.c
index 6fbf0eec..d120ed8a 100644
--- a/jpeg.c
+++ b/jpeg.c
@@ -490,9 +490,7 @@ qboolean JPEG_OpenLibrary (void)
 #else
 	const char* dllnames [] =
 	{
-#if defined(WIN64)
-		"libjpeg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libjpeg.dll",
 #elif defined(MACOSX)
 		"libjpeg.62.dylib",
diff --git a/libcurl.c b/libcurl.c
index df2db7f9..9824a46a 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -318,9 +318,7 @@ static qboolean CURL_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
-#if defined(WIN64)
-		"libcurl64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libcurl-4.dll",
 		"libcurl-3.dll",
 #elif defined(MACOSX)
diff --git a/qtypes.h b/qtypes.h
index 7c525a69..a9457857 100644
--- a/qtypes.h
+++ b/qtypes.h
@@ -11,7 +11,7 @@ typedef enum qboolean_e {false, true} qboolean;
 typedef bool qboolean;
 #endif
 
-#if defined(WIN32) && !defined(WIN64)
+#if defined(WIN32)
 # define ssize_t long
 #endif
 
diff --git a/quakedef.h b/quakedef.h
index bb586b19..a3efa6a1 100644
--- a/quakedef.h
+++ b/quakedef.h
@@ -372,7 +372,7 @@ extern cvar_t developer_loading;
 #if defined(__linux__)
 # define DP_OS_NAME		"Linux"
 # define DP_OS_STR		"linux"
-#elif defined(WIN64)
+#elif defined(_WIN64)
 # define DP_OS_NAME		"Windows64"
 # define DP_OS_STR		"win64"
 #elif defined(WIN32)
@@ -405,7 +405,7 @@ extern cvar_t developer_loading;
 # elif defined(__powerpc__)
 #  define DP_ARCH_STR		"ppc"
 # endif
-#elif defined(WIN64)
+#elif defined(_WIN64)
 # define DP_ARCH_STR		"x86_64"
 #elif defined(WIN32)
 # define DP_ARCH_STR		"x86"
diff --git a/snd_3dras.c b/snd_3dras.c
index c984a3b4..18860a5d 100644
--- a/snd_3dras.c
+++ b/snd_3dras.c
@@ -114,15 +114,13 @@ static dllfunction_t ras_funcs[] =
 };
 static const char* ras_dllname [] =
 {
-	#if defined(WIN64)
-		"3dras64.dll",
-	#elif defined(WIN32)
+#if defined(WIN32)
 		"3dras32.dll",
-	#elif defined(MACOSX)
+#elif defined(MACOSX)
 		"3dras.dylib",
-	#else
+#else
 		"3dras.so",
-	#endif
+#endif
 		NULL
 };
 
diff --git a/snd_modplug.c b/snd_modplug.c
index 9cb48693..98d37069 100644
--- a/snd_modplug.c
+++ b/snd_modplug.c
@@ -133,9 +133,7 @@ qboolean ModPlug_OpenLibrary (void)
 {
 	const char* dllnames_modplug [] =
 	{
-#if defined(WIN64)
-		"libmodplug64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libmodplug-0.dll",
 		"modplug.dll",
 #elif defined(MACOSX)
diff --git a/snd_ogg.c b/snd_ogg.c
index 693ed0a2..a5dba1da 100644
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -312,9 +312,7 @@ qboolean OGG_OpenLibrary (void)
 {
 	const char* dllnames_vo [] =
 	{
-#if defined(WIN64)
-		"libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libvorbis.dll",
 		"vorbis.dll",
 #elif defined(MACOSX)
@@ -327,9 +325,7 @@ qboolean OGG_OpenLibrary (void)
 	};
 	const char* dllnames_vf [] =
 	{
-#if defined(WIN64)
-		"libvorbisfile64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libvorbisfile.dll",
 		"vorbisfile.dll",
 #elif defined(MACOSX)
diff --git a/world.c b/world.c
index 3977a5db..935abfbf 100644
--- a/world.c
+++ b/world.c
@@ -1449,9 +1449,7 @@ static void World_Physics_Init(void)
 #ifdef ODE_DYNAMIC
 	const char* dllnames [] =
 	{
-# if defined(WIN64)
-		"libode1_64.dll",
-# elif defined(WIN32)
+# if defined(WIN32)
 		"libode1.dll",
 # elif defined(MACOSX)
 		"libode.1.dylib",
-- 
2.39.2