[vlc-commits] commit: mp4: Don't build IOKit specific hack on iOS. (Pierre d'Herbemont )

git at videolan.org git at videolan.org
Sun Oct 31 11:17:44 CET 2010


vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sun Oct 31 10:11:03 2010 +0100| [0c8b345c6ee62b52f821b43e7e83197d45268dd3] | committer: Pierre d'Herbemont 

mp4: Don't build IOKit specific hack on iOS.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c8b345c6ee62b52f821b43e7e83197d45268dd3
---

 modules/demux/mp4/drms.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 9a29f7c..12ccd1c 100644
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -57,6 +57,13 @@
 #include <limits.h>
 
 #ifdef __APPLE__
+#include "TargetConditionals.h"
+#if !TARGET_OS_IPHONE
+#define HAVE_MACOS_IOKIT
+#endif
+#endif
+
+#ifdef HAVE_MACOS_IOKIT
 #   include <mach/mach.h>
 #   include <IOKit/IOKitLib.h>
 #   include <CoreFoundation/CFNumber.h>
@@ -1724,7 +1731,7 @@ static int GetiPodID( int64_t *p_ipod_id )
         return 0;
     }
 
-#ifdef __APPLE__
+#ifdef HAVE_MACOS_IOKIT
     CFTypeRef value;
     mach_port_t port;
     io_object_t device;



More information about the vlc-commits mailing list