make code compatible with mingw64

src/park.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include "addresses.h"
 #include "finance.h"
 #include "map.h"

src/rct2.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <setjmp.h>
 #include <windows.h>
-#include <ShlObj.h>
+#include <shlobj.h>
 #include <SDL.h>
 #include "addresses.h"
 #include "climate.h"
@@ -338,7 +338,7 @@ void get_system_info()
 	RCT2_GLOBAL(RCT2_ADDRESS_MEM_TOTAL_PAGEFILE, uint32) = memInfo.dwTotalPageFile;
 	RCT2_GLOBAL(RCT2_ADDRESS_MEM_TOTAL_VIRTUAL, uint32) = memInfo.dwTotalVirtual;
 
-	uint32 size = 80;
+	DWORD size = 80;
 	GetUserName((char*)RCT2_ADDRESS_OS_USER_NAME, &size);
 	size = 80;
 	GetComputerName((char*)RCT2_ADDRESS_OS_COMPUTER_NAME, &size);

src/rct2.h

@@ -44,7 +44,7 @@ typedef unsigned long long uint64;
 #define sgn(x)				((x > 0) ? 1 : ((x < 0) ? -1 : 0))
 #define clamp(l, x, h)		(min(h, max(l, x)))
 
-#define countof(x)			_countof(x)
+#define countof(x)			((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x])))))
 
 void rct2_finish();
 

src/ride.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include "addresses.h"
 #include "ride.h"
 #include "sprite.h"

src/sawyercoding.c

@@ -111,7 +111,7 @@ int sawyercoding_read_chunk(HANDLE hFile, uint8 *buffer)
 static int decode_chunk_rle(char *buffer, int length)
 {
 	int i, j, count;
-	uint8 *src, *dst, rleCodeByte;
+	char *src, *dst, rleCodeByte;
 
 	// Backup buffer
 	src = malloc(length);
@@ -145,7 +145,7 @@ static int decode_chunk_rle(char *buffer, int length)
 static int decode_chunk_repeat(char *buffer, int length)
 {
 	int i, j, count;
-	uint8 *src, *dst, *copyOffset;
+	char *src, *dst, *copyOffset;
 
 	// Backup buffer
 	src = malloc(length);

src/title.c

@@ -18,6 +18,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
+#include <windows.h>
 #include <string.h>
 #include <time.h>
 #include "addresses.h"

src/widget.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include <memory.h>
 #include <stdlib.h>
 #include "addresses.h"

src/window_about.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include <string.h>
 #include "addresses.h"
 #include "string_ids.h"

src/window_cheats.c

@@ -18,7 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include <string.h>
+#include <limits.h>
 #include "addresses.h"
 #include "park.h"
 #include "peep.h"

src/window_dropdown.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include <memory.h>
 #include "addresses.h"
 #include "scenario.h"

src/window_game_bottom_toolbar.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include <string.h>
 #include "addresses.h"
 #include "climate.h"

src/window_tooltip.c

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
+#include <windows.h>
 #include <memory.h>
 #include "addresses.h"
 #include "string_ids.h"