Revert "Merge branch 'master' into jm-linux"

This reverts commit bbfefbf9ab, reversing
changes made to 48ba992ee7.

code/REDALERT/WIN32LIB/BUFFER.CPP

@@ -35,7 +35,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #ifndef BUFFER_H
-#include "BUFFER.H"
+#include "buffer.h"
 #endif
 
 /*=========================================================================*/

code/REDALERT/WIN32LIB/BUFFGLBL.CPP

@@ -31,7 +31,7 @@
  *-------------------------------------------------------------------------*
  * Functions:                                                              *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#include "GBUFFER.H"
+#include "gbuffer.h"
 
 /*=========================================================================*/
 /* The following PRIVATE functions are in this file:                       */

code/REDALERT/WIN32LIB/DIPTHONG.CPP

@@ -41,10 +41,7 @@
 
 //#include	"function.h"
 //#include	"ems.h"
-#ifdef WINDOWS
 #include <keyboard.h>
-#endif
-
 #include "dipthong.h"
 
 /***************************************************************************

code/REDALERT/WIN32LIB/DRAWRECT.CPP

@@ -31,7 +31,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #ifndef GBUFFER_H
-#include "GBUFFER.H"
+#include "gbuffer.h"
 #include "misc.h"
 #endif
 

code/REDALERT/WIN32LIB/DrawMisc.cpp

@@ -32,7 +32,7 @@
 */
 
 #include <stdint.h>
-#include "GBUFFER.H"
+#include "gbuffer.h"
 #include "MISC.H"
 #include "WSA.H"
 

code/REDALERT/WIN32LIB/GBUFFER.CPP

@@ -44,7 +44,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #ifndef GBUFFER_H
-#include "GBUFFER.H"
+#include "gbuffer.h"
 #include "misc.h"
 #endif
 //#pragma inline

code/REDALERT/WIN32LIB/IRANDOM.CPP

@@ -31,7 +31,7 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include "MISC.H"
+#include "misc.h"
 
 
 
@@ -180,4 +180,4 @@ RandNumb	DD	12349876H
 ;----------------------------------------------------------------------------
 
 	END
-#endif
+#endif

code/REDALERT/WIN32LIB/MISC.H

@@ -34,18 +34,13 @@
 #ifndef MISC_H
 #define MISC_H
 
-
-#ifndef _WIN32 // Denzil 6/2/98 Watcom 11.0 complains without this check
-// NO! This is wtong
-//#define _WIN32
-#endif // _WIN32
-
-#ifdef WIN32
 #define WIN32_LEAN_AND_MEAN	// eliminates unecessary definitions in windows.h
+#ifndef _WIN32 // Denzil 6/2/98 Watcom 11.0 complains without this check
+#define _WIN32
+#endif // _WIN32
 #include <windows.h>
 #include <windowsx.h>
 //#include <ddraw.h>
-#endif
 
 /*========================= C++ Routines ==================================*/
 

code/REDALERT/WIN32LIB/TOBUFF.CPP

@@ -15,7 +15,7 @@
  */
 
 #include <stdint.h>
-#include "GBUFFER.H"
+#include "gbuffer.h"
 #include "misc.h"
 
 long __cdecl Buffer_To_Buffer(GraphicViewPortClass* vp, int x, int y, int w, int h, void* buffer, int length)

code/REDALERT/WIN32LIB/wwstd.h

@@ -48,9 +48,8 @@
 #include <windows.h>
 #include <windowsx.h>
 #else
-// THIS BLOCK IS WHOLE WAYS OF WRONG
-// #include <windows.h>
-// #include <windowsx.h>
+#include <windows.h>
+#include <windowsx.h>
 #endif
 
 // Note: SKB 4/11/94