From 092110eb066b381f33451a4004eef3802e5ee8a5 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@a6443dda-0b58-4228-96e9-037be469359c>
Date: Thu, 25 Dec 2008 09:02:49 +0000
Subject: [PATCH] Fix Windows build of pcsx2 and Linux build of CDVDiso.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@492 a6443dda-0b58-4228-96e9-037be469359c
---
 pcsx2/SaveState.h             | 4 ++++
 plugins/CDVDiso/src/CDVDiso.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h
index 8126db6218..348ca6443e 100644
--- a/pcsx2/SaveState.h
+++ b/pcsx2/SaveState.h
@@ -20,7 +20,11 @@
 #define _SAVESTATE_H_
 
 #include <zlib.h>
+
+// This shouldn't break Win compiles, but it does.
+#ifdef __LINUX__
 #include "PS2Edefs.h"
+#endif
 
 // Savestate Versioning!
 //  If you make changes to the savestate version, please increment the value below.
diff --git a/plugins/CDVDiso/src/CDVDiso.h b/plugins/CDVDiso/src/CDVDiso.h
index d116043287..96e92e1b27 100644
--- a/plugins/CDVDiso/src/CDVDiso.h
+++ b/plugins/CDVDiso/src/CDVDiso.h
@@ -25,7 +25,11 @@
 #include "PS2Edefs.h"
 #include "libiso.h"
 
+#ifndef __LINUX__
 #define EXPORT_C(type) __declspec(dllexport) type __stdcall
+#else
+#define EXPORT_C(type) type
+#endif
 
 EXPORT_C(u32)   PS2EgetLibType();
 EXPORT_C(u32)   PS2EgetLibVersion2(u32 type);