Miscellaneous changes for WinRT

logikstate · Apr 1, 2015 · e49148f · e49148f
1 parent 06e9882
commit e49148f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/libnetwork/libnetwork.cpp b/libnetwork/libnetwork.cpp
@@ -37,7 +37,7 @@ Winsock behavior
 */  
 
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 
 typedef int socklen_t;
 

diff --git a/libplatform/platformutil.cpp b/libplatform/platformutil.cpp
@@ -26,7 +26,11 @@ off_t fileSize(const char* file)
 	return s.st_size;
 }
 
-#ifdef _WIN32
+#if defined(WINSTORE)
+void getDirectoryListing(const char* dir, std::vector<std::string>* files, std::vector<std::string>* directories)
+{
+}
+#elif defined(_WIN32)
 #include <Windows.h>
 void getDirectoryListing(const char* dir, std::vector<std::string>* files, std::vector<std::string>* directories)
 {
@@ -128,7 +132,15 @@ void getDirectoryListingR(const char* dir, std::vector<std::string>* filesout, s
 }
 
 
-#ifdef _WIN32
+#if defined(WINSTORE)
+std::vector<std::string> getLocalIPs()
+{
+	std::vector<std::string> result;
+	result.clear();
+	result.push_back("WINSTORE placeholder getLocalIPs");
+	return result;
+}
+#elif defined(_WIN32)
 #include <winsock2.h>
 #include <iphlpapi.h>
 #pragma comment(lib, "IPHLPAPI.lib")
@@ -382,7 +394,7 @@ std::vector<std::string> getLocalIPs()
 #endif
 
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(WINSTORE)
 double iclock()
 {
 	static LARGE_INTEGER freq;

diff --git a/libpvrt/PVRTGlobal.h b/libpvrt/PVRTGlobal.h
@@ -30,7 +30,7 @@
 	#include <tchar.h>
 
 	#ifndef _ASSERT
-		#ifdef _DEBUG
+        #if defined(_DEBUG) && !defined(WINSTORE)
 			#define _ASSERT(X) { (X) ? 0 : DebugBreak(); }
 		#else
 			#define _ASSERT(X)
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ Winsock behavior @@
     */
-    #ifdef WIN32
+    #if defined(WIN32) || defined(_WIN32)
     typedef int socklen_t;
@@ Expand Down @@