Fix rebase breakage

2dlib/surface.cpp

@@ -563,8 +563,8 @@ void grSurface::xlat8_16(char *data, int w, int h, char *pal) {
   sptr = (char *)data;
   rowsize_w = m_DataRowsize / 2;
 
-  height = SET_MIN(h, ddsfObj.h);
-  width = SET_MIN(w, ddsfObj.w);
+  height = std::min(h, ddsfObj.h);
+  width = std::min(w, ddsfObj.w);
 
   for (row = 0; row < height; row++) {
     for (col = 0; col < width; col++) {
@@ -677,8 +677,8 @@ void grSurface::xlat24_16(char *data, int w, int h) {
   dptr = (uint16_t *)m_DataPtr;
   sptr = (char *)data;
   rowsize_w = m_DataRowsize / 2;
-  height = SET_MIN(h, ddsfObj.h);
-  width = SET_MIN(w, ddsfObj.w);
+  height = std::min(h, ddsfObj.h);
+  width = std::min(w, ddsfObj.w);
 
   for (row = 0; row < height; row++) {
     scol = 0;

czip/BitIO.cpp

@@ -173,9 +173,9 @@ int CZip::InputBit(BITFILE *bfile) {
   return (value ? 1 : 0);
 }
 
-ulong CZip::InputBits(BITFILE *bfile, int bitcount) {
-  ulong mask;
-  ulong return_value;
+uint32_t CZip::InputBits(BITFILE *bfile, int bitcount) {
+  uint32_t mask;
+  uint32_t return_value;
 
   mask = 1L << (bitcount - 1);
   return_value = 0;

ddebug/windebug.cpp

@@ -193,9 +193,9 @@
 #include "mono.h"
 
 #include <windows.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstdint>
 
 ///////////////////////////////////////////////////////////////////////////////
 

legacy/briefinglocalizer/briefinglocalizerDlg.cpp

@@ -24,7 +24,7 @@
 #include "briefinglocalizerDlg.h"
 
 #ifdef __LINUX__
-#include "linux/linux_fix.h"
+#include "linux_fix.h"
 #endif
 
 #include <sys/types.h>

legacy/editor/DallasMainDlg.cpp

@@ -371,7 +371,7 @@ void OutToFile(char *format, ...)
 
 	va_list marker;
         va_start(marker,format);
-	vsprintf(buffer,format,marker);
+        std::vsprintf(buffer,format,marker);
 	cf_WriteString(CurrentOutputFile,buffer);
 	va_end(marker);
 }

legacy/editor/ScriptCompilerAPI.cpp

@@ -333,7 +333,7 @@ void outputtofile(char *format, ...)
 	char buffer[1024];
 	va_list marker;
         va_start(marker,format);
-	vsprintf(buffer,format,marker);
+        std::vsprintf(buffer,format,marker);
 	cf_WriteString(CurrentFile,buffer);
 	va_end(marker);
 }

legacy/editor/ScriptMassCompile.cpp

@@ -218,7 +218,7 @@ void writeline(char *format, ... )
 	char buffer[2048];
 	va_list marker;
 	va_start(marker,format);
-	vsprintf(buffer,format,marker);
+        std::vsprintf(buffer,format,marker);
 	va_end(marker);
 
 	MassScriptEditContent += buffer;
@@ -343,7 +343,7 @@ void CScriptMassCompile::SetStepText(int step,char *format,...)
 	char buffer[1024];
 	va_list marker;
 	va_start(marker,format);
-	vsprintf(buffer,format,marker);
+        std::vsprintf(buffer,format,marker);
 	va_end(marker);
 
 	CWnd *wnd;

legacy/renderer/opengl.cpp

@@ -20,7 +20,7 @@
 #include <windows.h>
 #include "ddraw.h"
 #elif defined(__LINUX__)
-#include "linux/linux_fix.h"
+#include "linux_fix.h"
 #include "lnxscreenmode.h"
 #else
 #endif

lib/CZip.h

@@ -20,8 +20,9 @@
 #define __CZIPFILE_H_
 
 #include <cstdio>
+#include <cstdint>
 #ifdef __LINUX__
-#include "linux/linux_fix.h"
+#include "linux_fix.h"
 #endif
 
 #define OCF_VERSION 0x01

linux/linux_fix.h

@@ -31,6 +31,8 @@ void *GlobalLock(HGLOBAL hMem);
 void Sleep(int millis);
 char *strupr(char *string);
 
+#define _stat stat
+
 // Replace missing defines from stdlib.h
 #define _MAX_PATH 260  /* max. length of full pathname*/
 #define _MAX_FNAME 256 /* max. length of path component*/

scripts/DallasFuncs.cpp

@@ -708,6 +708,7 @@
  *
  */
 
+#include <cstdio>
 #include <cstring>
 #include <cstdarg>
 #include <cfloat>

scripts/generic.cpp

@@ -18,10 +18,10 @@
 
 // generic.cpp
 // 0.1
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cstdarg>
 #include "osiris_import.h"
 #include "osiris_common.h"
 

scripts/linux_lib.h

@@ -22,7 +22,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
-#include "linux/linux_fix.h"
+#include "linux_fix.h"
 
 void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext);