diff -ruN libdv-0.99.orig/encodedv/dvavi.c libdv-0.99/encodedv/dvavi.c --- libdv-0.99.orig/encodedv/dvavi.c Tue Dec 31 18:06:31 2002 +++ libdv-0.99/encodedv/dvavi.c Sat Apr 5 15:24:07 2003 @@ -41,7 +41,11 @@ #include #endif +#ifndef __APPLE__ #include +#else +#include +#endif #include #include "libdv/headers.h" diff -ruN libdv-0.99.orig/encodedv/dvconnect.c libdv-0.99/encodedv/dvconnect.c --- libdv-0.99.orig/encodedv/dvconnect.c Tue Dec 31 18:06:31 2002 +++ libdv-0.99/encodedv/dvconnect.c Sat Apr 5 15:49:02 2003 @@ -46,7 +46,11 @@ #include #endif +#ifndef __APPLE__ #include +#else +#include +#endif static long cip_n_ntsc = 2436; static long cip_d_ntsc = 38400; @@ -870,6 +874,7 @@ /* * Verify that scheduling is available */ +#ifdef _SC_PRIORITY_SCHEDULING if (sysconf (_SC_PRIORITY_SCHEDULING) == -1) { fprintf (stderr, "WARNING: RR-scheduler not available, " "disabling.\n"); @@ -883,6 +888,11 @@ } } return (0); +#else + fprintf (stderr, "WARNING: RR-scheduler not available, " + "disabling.\n"); + return (-1); +#endif } /* ------------------------------------------------------------------------ diff -ruN libdv-0.99.orig/playdv/Makefile.in libdv-0.99/playdv/Makefile.in --- libdv-0.99.orig/playdv/Makefile.in Thu Jan 2 10:40:45 2003 +++ libdv-0.99/playdv/Makefile.in Sat Apr 5 16:16:14 2003 @@ -116,7 +116,7 @@ noinst_HEADERS = display.h oss.h playdv_SOURCES = playdv.c display.c display.h oss.c -playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) +playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -loss subdir = playdv mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h diff -ruN libdv-0.99.orig/playdv/oss.c libdv-0.99/playdv/oss.c --- libdv-0.99.orig/playdv/oss.c Tue Dec 31 16:04:04 2002 +++ libdv-0.99/playdv/oss.c Sat Apr 5 16:12:57 2003 @@ -34,7 +34,11 @@ #include #include #include +#if defined(__APPLE__) && (__GNUC__) +#include +#else #include +#endif /* Darwin liboss */ #include "oss.h"