From cea8c08328e6c650c43851813497589647fb6b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Tue, 3 Dec 2013 15:19:58 -0500
Subject: [PATCH] ifreerdp: fix iOS/OSX platform detection

---
 client/iOS/.gitignore                    |  2 ++
 winpr/include/winpr/platform.h           | 23 ++++++++++++++++-------
 winpr/libwinpr/environment/environment.c |  4 +++-
 winpr/libwinpr/sysinfo/sysinfo.c         |  2 +-
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/client/iOS/.gitignore b/client/iOS/.gitignore
index 8bcaf57e4..20d3653e6 100644
--- a/client/iOS/.gitignore
+++ b/client/iOS/.gitignore
@@ -6,3 +6,5 @@ bin/
 build/
 project.pbxproj
 !iFreeRDP.xcodeproj/
+iFreeRDP.app/
+
diff --git a/winpr/include/winpr/platform.h b/winpr/include/winpr/platform.h
index ad2f6187c..6722fe368 100644
--- a/winpr/include/winpr/platform.h
+++ b/winpr/include/winpr/platform.h
@@ -154,19 +154,28 @@
 
 /* GNU/Linux (__gnu_linux__) */
 
-/* Mac OS X (__MACOSX__) */
+/* Apple Platforms (iOS, Mac OS X) */
 
 #if (defined(__APPLE__) && defined(__MACH__))
+
+#include <TargetConditionals.h>
+
+#if (TARGET_OS_IPHONE == 1) || (TARGET_IPHONE_SIMULATOR == 1)
+
+/* iOS (__IOS__) */
+
+#ifndef __IOS__
+#define __IOS__		1
+#endif
+
+#elif (TARGET_OS_MAC == 1)
+
+/* Mac OS X (__MACOSX__) */
+
 #ifndef __MACOSX__
 #define __MACOSX__	1
 #endif
-#endif
 
-/* iOS (__IOS__)*/
-
-#if (defined(__APPLE__) && defined(TARGET_OS_IPHONE))
-#ifndef __IOS__
-#define __IOS__		1
 #endif
 #endif
 
diff --git a/winpr/libwinpr/environment/environment.c b/winpr/libwinpr/environment/environment.c
index 272aabdc4..d67d33ea0 100644
--- a/winpr/libwinpr/environment/environment.c
+++ b/winpr/libwinpr/environment/environment.c
@@ -37,7 +37,9 @@
 #include <unistd.h>
 #endif
 
-#ifdef __MACOSX__
+#if defined(__IOS__)
+
+#elif defined(__MACOSX__)
 #include <crt_externs.h>
 #define environ (*_NSGetEnviron())
 #endif
diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c
index 9091c5e84..6161043cd 100644
--- a/winpr/libwinpr/sysinfo/sysinfo.c
+++ b/winpr/libwinpr/sysinfo/sysinfo.c
@@ -84,7 +84,7 @@
 #include <winpr/crt.h>
 #include <winpr/platform.h>
 
-#if defined(__MACOSX__) || \
+#if defined(__MACOSX__) || defined(__IOS__) || \
 defined(__FreeBSD__) || defined(__NetBSD__) || \
 defined(__OpenBSD__) || defined(__DragonFly__)
 #include <sys/sysctl.h>