From cb5202f7c45c589c20ae46038050a08f6d358997 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Jan 2019 11:09:27 -0800
Subject: [PATCH] cgo cleanup for linux

---
 formats/mpq/native.h       |  7 ++++---
 formats/mpq/native_linux.h | 16 +++++++++-------
 platform/imgui/context.go  |  1 -
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/formats/mpq/native.h b/formats/mpq/native.h
index 8e97f44..c6d6883 100644
--- a/formats/mpq/native.h
+++ b/formats/mpq/native.h
@@ -1,8 +1,9 @@
 #define bool unsigned char
 
-#define FILE_BEGIN         0
-#define FILE_CURRENT       1
-#define FILE_END           2
+#define FILE_BEGIN   0
+#define FILE_CURRENT 1
+#define FILE_END     2
+
 #define SFILE_INVALID_SIZE 0xffffffff
 
 bool  WINAPI SFileOpenArchive(const TCHAR * szMpqName, DWORD dwPriority, DWORD dwFlags, HANDLE * phMpq);
diff --git a/formats/mpq/native_linux.h b/formats/mpq/native_linux.h
index 26db077..1d001b1 100644
--- a/formats/mpq/native_linux.h
+++ b/formats/mpq/native_linux.h
@@ -1,12 +1,14 @@
-#define DWORD            unsigned int
-#define LPDWORD          unsigned int *
-#define LPOVERLAPPED     void *
-#define TCHAR            char
-#define HANDLE           void *
-#define LONG             int
-#define ERROR_HANDLE_EOF 1002
 #define WINAPI
 
+#define DWORD        unsigned long
+#define LPDWORD      unsigned long *
+#define LPOVERLAPPED void *
+#define TCHAR        char
+#define HANDLE       void *
+#define LONG         long
+
+#define ERROR_HANDLE_EOF 1002
+
 DWORD GetLastError();
 
 #include <stdlib.h>
diff --git a/platform/imgui/context.go b/platform/imgui/context.go
index 5846607..7fd83b4 100644
--- a/platform/imgui/context.go
+++ b/platform/imgui/context.go
@@ -1,6 +1,5 @@
 package imgui
 
-// #cgo linux CFLAGS: -I./cimgui
 // #cgo linux LDFLAGS: -L./cimgui -l:cimgui.a -lstdc++ -lm
 // #include "native.h"
 import "C"