From c948a593912fef46e2cea6da9b0dd0c7c36054c7 Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sun, 18 May 2008 21:32:34 -0700
Subject: Removed Watcom Compiler support.

---
 src/win95/media.hpp | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'src/win95/media.hpp')

diff --git a/src/win95/media.hpp b/src/win95/media.hpp
index a7f5a2f..916e5e6 100644
--- a/src/win95/media.hpp
+++ b/src/win95/media.hpp
@@ -1,12 +1,6 @@
 #ifndef _INCLUDED_MEDIA_HPP_
 #define _INCLUDED_MEDIA_HPP_
 
-//#if defined(_WIN32) || defined(WIN32) || defined(WINDOWS) || defined(_WINDOWS)
-//	#define _MEDIA_WIN_TARGET
-//	#include <windows.h>
-//#endif // WIN32 || _WIN32 || WINDOWS || _WINDOWS
-
-
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
@@ -29,10 +23,6 @@ void MediaRead(MediaMedium * pThis, TYPE * p);
 template <class TYPE>
 void MediaWrite(MediaMedium * pThis, TYPE d);
 
-#ifdef __WATCOMC__
-template <class TYPE> class _Media_CompilerHack;
-#endif
-
 class MediaMedium
 {
 	protected:
@@ -284,15 +274,10 @@ class MediaMedium
 	friend class _Media_CompilerHack;
 };
 
-#ifdef __WATCOMC__
-template <class TYPE>
-#endif
 class _Media_CompilerHack
 {
 	public:
-		#ifndef __WATCOMC__
 		template <class TYPE>
-		#endif
 		static inline void MediaRead(MediaMedium * pThis, TYPE * p)
 		{
 			if (pThis->m_nReadBufPos + sizeof(TYPE) <= pThis->m_nBufSize)
@@ -317,9 +302,7 @@ class _Media_CompilerHack
 			}
 		}
 	
-		#ifndef __WATCOMC__
 		template <class TYPE>
-		#endif
 		static inline void MediaWrite(MediaMedium * pThis, TYPE d)
 		{
 			if (pThis->m_nWriteBufPos + sizeof(TYPE) <= pThis->m_nBufSize)
@@ -353,11 +336,7 @@ class _Media_CompilerHack
 template <class TYPE>
 inline void MediaRead(MediaMedium * pThis, TYPE * p)
 {
-	_Media_CompilerHack
-		#ifdef __WATCOMC__
-		<TYPE>
-		#endif
-		::MediaRead(pThis,p);
+	_Media_CompilerHack::MediaRead(pThis,p);
 }
 
 // use this to write simple data types
@@ -368,11 +347,7 @@ inline void MediaRead(MediaMedium * pThis, TYPE * p)
 template <class TYPE>
 inline void MediaWrite(MediaMedium * pThis, TYPE d)
 {
-	_Media_CompilerHack
-		#ifdef __WATCOMC__
-		<TYPE>
-		#endif
-		::MediaWrite(pThis,d);
+	_Media_CompilerHack::MediaWrite(pThis,d);
 }
 
 #ifdef _MEDIA_WIN_TARGET
-- 
cgit v1.3