From 4db15e7459ab06860cb7a7e162ca6d2b52a68b9c Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sun, 29 Jul 2001 20:57:33 +0000
Subject: More compiling.  Things are starting to get hacky (adding stubs,
 commenting out unimplemented windows stuff, and so on).

---
 src/win95/chnktexi.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'src/win95/chnktexi.cpp')

diff --git a/src/win95/chnktexi.cpp b/src/win95/chnktexi.cpp
index 7dad3d9..8fe0345 100644
--- a/src/win95/chnktexi.cpp
+++ b/src/win95/chnktexi.cpp
@@ -1,11 +1,15 @@
-#include <windows.h>
 #include <string.h>
+
+#include "fixer.h"
+
 #include "string.hpp"
 #ifndef DB_LEVEL
 	#define DB_LEVEL 4
 #endif
 #include "db.h"
-#include "awTexLd.h"
+
+#include "awtexld.h"
+
 #include "chnkload.hpp"
 #include "chunkpal.hpp"
 
@@ -16,12 +20,12 @@
 	#include "ffstdio.h"
 #endif
 
-#ifndef CL_SUPPORT_ALTTAB
-	#error "Please #define CL_SUPPORT_ALTTAB to 0 or 1 in projload.hpp"
-#endif
-#if CL_SUPPORT_ALTTAB
-	#include "alt_tab.h"
-#endif
+//#ifndef CL_SUPPORT_ALTTAB
+//	#error "Please #define CL_SUPPORT_ALTTAB to 0 or 1 in projload.hpp"
+//#endif
+//#if CL_SUPPORT_ALTTAB
+//	#include "alt_tab.h"
+//#endif
 
 #include "chnktexi.h"
 
@@ -36,7 +40,9 @@ char const * cl_pszGameMode = NULL;
 // used to determine if the display is palettized
 // currently assuming that if this is <= 8 then all
 // surfaces et. except d3d textures have a global palette
-extern "C" extern int VideoModeColourDepth;
+extern "C" {
+	extern int VideoModeColourDepth;
+};
 
 // useful filename handling functions
 
@@ -649,7 +655,9 @@ char * CL_GetImageFileName(char * pszDestBuf, unsigned nBufSize, char const * ps
 	}
 }
 
-extern "C" extern void CheckForWindowsMessages(void);
+extern "C" {
+	extern void CheckForWindowsMessages(void);
+};
 
 int CL_LoadImageOnce(char const * pszFileName, unsigned fFlagsEtc)
 {
-- 
cgit v1.3