From: dezeroex <dezeroex@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Thu, 14 Apr 2005 05:23:30 +0000 (+0000)
Subject: OS X uses -DDARWIN in /System/Library/Frameworks/CoreFoundation.framework/Headers... 
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=db805d6e2f1945f27bfa7c3a9123f8c4bef5fdc4;p=melted

OS X uses -DDARWIN in /System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h; This in combination with #include <Foundation/Foundation.h> caused compilation errors while porting consumer_sdl to OS X.


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@707 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/configure b/configure
index bdb91dd..2adb2c1 100755
--- a/configure
+++ b/configure
@@ -38,6 +38,7 @@ function build_config
 		echo "version=$version"
 		echo "prefix=$prefix"
 		echo "bindir=$prefix/bin"
+		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
 		echo "MMX_FLAGS=-DUSE_MMX"
@@ -56,7 +57,7 @@ function build_config
 
 		case $targetos in
 		Darwin)
-		echo "CFLAGS+=-DDARWIN"
+		echo "CFLAGS+=-D__DARWIN__"
 		echo "SHFLAGS=-dynamiclib"
 		;;
 		Linux)
diff --git a/src/albino/albino.c b/src/albino/albino.c
index 60667f3..4e78e8b 100644
--- a/src/albino/albino.c
+++ b/src/albino/albino.c
@@ -64,7 +64,7 @@ int main( int argc, char **argv  )
 		// Use realtime scheduling if possible
 		memset( &scp, '\0', sizeof( scp ) );
 		scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1;
-#ifndef DARWIN
+#ifndef __DARWIN__
 		sched_setscheduler( 0, SCHED_FIFO, &scp );
 #endif
 
diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c
index 5fbdff6..f7ffffc 100644
--- a/src/inigo/inigo.c
+++ b/src/inigo/inigo.c
@@ -197,7 +197,7 @@ int main( int argc, char **argv )
 	// Use realtime scheduling if possible
 	memset( &scp, '\0', sizeof( scp ) );
 	scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1;
-#ifndef DARWIN
+#ifndef __DARWIN__
 	sched_setscheduler( 0, SCHED_FIFO, &scp );
 #endif
 
diff --git a/src/miracle/miracle.c b/src/miracle/miracle.c
index cdd7f74..ce0c452 100644
--- a/src/miracle/miracle.c
+++ b/src/miracle/miracle.c
@@ -72,7 +72,7 @@ int main( int argc, char **argv )
 	// Use realtime scheduling if possible
 	memset( &scp, '\0', sizeof( scp ) );
 	scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1;
-#ifndef DARWIN
+#ifndef __DARWIN__
 	sched_setscheduler( 0, SCHED_FIFO, &scp );
 #endif