[ios] fixed ios build, HRESULT and ULONG only collide on osx

xbmc · May 15, 2012 · 6014bd6 · 6014bd6
1 parent 6f40b50
commit 6014bd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
@@ -13,6 +13,7 @@ ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
 NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
 ifdef NATIVE_ROOT_PATH
 ifeq ($(findstring osx,@ARCH@),osx)
+DEFINES += -DTARGET_DARWIN
 NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
 endif
 CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include

diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h
@@ -39,13 +39,15 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <string.h>
-#ifdef __APPLE__
+#if defined(TARGET_DARWIN)
 #include <stdio.h>
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <sys/sysctl.h>
 #include <mach/mach.h>
-#include <libkern/OSTypes.h>
+#if defined(TARGET_DARWIN_OSX)
+#include <MacTypes.h>
+#endif
 #elif defined(__FreeBSD__)
 #include <stdio.h>
 #include <sys/sysctl.h>
@@ -208,7 +210,7 @@ typedef long long     INT64;
 typedef unsigned long long    UINT64;
 typedef long        LONG;
 typedef long long     LONGLONG;
-#if defined(TARGET_DARWIN)
+#if defined(TARGET_DARWIN_OSX)
 typedef UInt32          ULONG;
 #else
 typedef unsigned long   ULONG;
@@ -221,7 +223,7 @@ typedef void*         LPVOID;
 #define INVALID_HANDLE_VALUE     ((HANDLE)~0U)
 typedef HANDLE        HDC;
 typedef void*       HWND;
-#if defined(TARGET_DARWIN)
+#if defined(TARGET_DARWIN_OSX)
 typedef SInt32      HRESULT;
 #else
 typedef LONG        HRESULT;