Keeping consistency between RS_Save_PNG and RS_Load_PNG

2013-10-29 22:29:05 -05:00
parent b64a766e0f
commit 62313006c1
2 changed files with 4 additions and 8 deletions
@@ -5,8 +5,6 @@
 #include "RageFile.h"
 #include "RageSurface.h"

-#include <png.h>
-
 #if defined(_MSC_VER)
 #include "../extern/libpng/include/png.h"
 #pragma comment(lib, "libpng.lib")
@@ -6,15 +6,13 @@
 #include "RageLog.h"
 #include "RageUtil.h"

-#if defined(WINDOWS)
-#include "png.h"
 #if defined(_MSC_VER)
-#  pragma comment(lib, "libpng.lib")
+#include "../extern/libpng/include/png.h"
+#pragma comment(lib, "libpng.lib")
 #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
-#endif
 #else
-#include <../extern/libpng/include/png.h>
-#endif
+#include <png.h>
+#endif // _MSC_VER

 static void SafePngError( png_struct *pPng, const RString &sStr )
 {