Fix Travis compiling

Bigpet · Jul 14, 2015 · 2e3113b · 2e3113b
1 parent 80b544a
commit 2e3113b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp
@@ -12,22 +12,6 @@
 
 extern Module sceNp;
 
-struct sceNpInternal
-{
-	bool m_bSceNpInitialized;
-	bool m_bScoreInitialized;
-	bool m_bLookupInitialized;
-	bool m_bSceNpUtilBandwidthTestInitialized;
-
-	sceNpInternal()
-		: m_bSceNpInitialized(false),
-		  m_bScoreInitialized(false),
-		  m_bLookupInitialized(false),
-		  m_bSceNpUtilBandwidthTestInitialized(false)
-	{
-	}
-};
-
 sceNpInternal sceNpInstance;
 
 s32 sceNpInit(u32 poolsize, vm::ptr<u32> poolptr)

diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.h b/rpcs3/Emu/SysCalls/Modules/sceNp.h
@@ -219,6 +219,24 @@ enum
 
 using SceNpBasicEventHandler = func_def<s32(s32 event, s32 retCode, u32 reqId, vm::ptr<void> arg)>;
 
+struct sceNpInternal
+{
+	bool m_bSceNpInitialized;
+	bool m_bScoreInitialized;
+	bool m_bLookupInitialized;
+	bool m_bSceNpUtilBandwidthTestInitialized;
+
+	sceNpInternal()
+		: m_bSceNpInitialized(false),
+		m_bScoreInitialized(false),
+		m_bLookupInitialized(false),
+		m_bSceNpUtilBandwidthTestInitialized(false)
+	{
+	}
+};
+
+extern sceNpInternal sceNpInstance;
+
 // NP Manager Utility statuses
 enum
 {

diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp2.cpp
@@ -2,7 +2,7 @@
 #include "Emu/Memory/Memory.h"
 #include "Emu/SysCalls/Modules.h"
 
-#include "sceNp.cpp"
+#include "sceNp.h"
 
 extern Module sceNp2;