1 files changed, 33 insertions, 87 deletions

diff --git a/src/fixer.h b/src/fixer.h
index 19a049d..ced3c91 100644
--- a/src/fixer.h
+++ b/src/fixer.h
@@ -27,79 +27,20 @@
 // not sure where this was originally defined.
 #define RGBA_MAKE(r, g, b, a)   ((((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
 
-// unused placeholder directplay code.
-typedef int DPID;
-
-typedef struct DPNAME
-{
-	int dwSize;
-	
-	char *lpszShortNameA;
-	char *lpszLongNameA;
-} DPNAME;
-
-#define DP_OK	0
-
-#define DPRECEIVE_ALL			1
-#define DPSYS_ADDPLAYERTOGROUP		2
-#define	DPSYS_CREATEPLAYERORGROUP	3
-#define DPPLAYERTYPE_PLAYER		4
-#define DPSYS_DELETEPLAYERFROMGROUP	5
-#define DPSYS_HOST			6
-#define DPSYS_SESSIONLOST		7
-#define DPSYS_SETPLAYERORGROUPDATA	8
-#define DPSYS_SETPLAYERORGROUPNAME	9
-#define DPEXT_HEADER_SIZE		10
-#define DPERR_BUSY			11
-#define DPERR_CONNECTIONLOST		12
-#define DPERR_INVALIDPARAMS		13
-#define DPERR_INVALIDPLAYER		14
-#define DPERR_NOTLOGGEDIN		15
-#define DPERR_SENDTOOBIG		16
-#define DPERR_BUFFERTOOSMALL		17
-#define DPID_SYSMSG			18
-#define DPSYS_DESTROYPLAYERORGROUP	19
-#define DPID_ALLPLAYERS			20
-
-typedef struct DPMSG_GENERIC
-{
-	int dwType;
-} DPMSG_GENERIC;
-typedef DPMSG_GENERIC * LPDPMSG_GENERIC;
-
-typedef struct DPMSG_CREATEPLAYERORGROUP
-{
-	int dwType;
-	
-	DPID dpId;
-	int dwPlayerType;
-	
-	DPNAME dpnName;
-} DPMSG_CREATEPLAYERORGROUP;
-typedef DPMSG_CREATEPLAYERORGROUP * LPDPMSG_CREATEPLAYERORGROUP;
-
-typedef struct DPMSG_DESTROYPLAYERORGROUP
-{
-	int dwType;
-	
-	DPID dpId;
-	int dwPlayerType;	
-} DPMSG_DESTROYPLAYERORGROUP;
-typedef DPMSG_DESTROYPLAYERORGROUP * LPDPMSG_DESTROYPLAYERORGROUP;
-
 #else
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-//#include <stdint.h> /* int64_t */
+#include <inttypes.h> /* int64_t */
 
 #include "files.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define PACKED_PUSH
 #define PACKED_POP
 #define PACKED __attribute__((packed))
@@ -141,7 +82,6 @@ size_t _mbclen(const unsigned char *s);
 #define MAX_PATH	PATH_MAX
 
 typedef int GUID;
-typedef int DPID;
 typedef int HINSTANCE;
 typedef int WPARAM;
 typedef int LPARAM;
@@ -167,8 +107,6 @@ typedef struct RECT
 	int bottom;
 } RECT;
 
-typedef RECT RECT_AVP;
-
 #if !defined(__INTEL_COMPILER)
 typedef int64_t __int64;
 #else
@@ -225,6 +163,34 @@ int SetEndOfFile(HANDLE file);
 unsigned int timeGetTime();
 unsigned int GetTickCount();
 
+#define JOYCAPS_HASR		1
+
+typedef struct JOYINFOEX
+{
+	DWORD dwXpos;
+	DWORD dwYpos;
+	DWORD dwRpos;
+	DWORD dwUpos;
+	DWORD dwVpos;
+	DWORD dwPOV;
+} JOYINFOEX;
+
+typedef struct JOYCAPS
+{
+	int wCaps;
+} JOYCAPS;
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+// unused placeholder directplay code.
+typedef int DPID;
 
 typedef struct DPNAME
 {
@@ -282,28 +248,8 @@ typedef struct DPMSG_DESTROYPLAYERORGROUP
 	int dwPlayerType;	
 } DPMSG_DESTROYPLAYERORGROUP;
 typedef DPMSG_DESTROYPLAYERORGROUP * LPDPMSG_DESTROYPLAYERORGROUP;
-
-#define JOYCAPS_HASR		1
-
-typedef struct JOYINFOEX
-{
-	DWORD dwXpos;
-	DWORD dwYpos;
-	DWORD dwRpos;
-	DWORD dwUpos;
-	DWORD dwVpos;
-	DWORD dwPOV;
-} JOYINFOEX;
-
-typedef struct JOYCAPS
-{
-	int wCaps;
-} JOYCAPS;
-
 #ifdef __cplusplus
 };
 #endif
 
 #endif
-
-#endif