Update of /cvsroot/plib/plib/src/sl
In directory sc8-pr-cvs1:/tmp/cvs-serv491/plib/src/sl
Modified Files:
sl.h slPortability.h
Log Message:
Fixed a couple of conditional compilations for MacOSX.
Index: sl.h
===================================================================
RCS file: /cvsroot/plib/plib/src/sl/sl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sl.h 30 Nov 2002 00:41:49 -0000 1.18
+++ sl.h 30 Nov 2002 13:18:56 -0000 1.19
@@ -115,7 +115,7 @@
#endif
-#if !defined(UL_WIN32) && !defined(UL_MACINTOSH)
+#if !defined(UL_WIN32) && !defined(UL_MACINTOSH) && !defined(UL_MAC_OSX)
int ioctl ( int cmd, int param = 0 )
{
if ( error ) return param ;
Index: slPortability.h
===================================================================
RCS file: /cvsroot/plib/plib/src/sl/slPortability.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- slPortability.h 30 Nov 2002 00:41:49 -0000 1.12
+++ slPortability.h 30 Nov 2002 13:18:56 -0000 1.13
@@ -33,12 +33,15 @@
#include <stdio.h>
#include <stdlib.h>
-#ifdef UL_MAC_OSX
+#ifdef UL_MACINTOSH
#include <Sound.h>
#include <Timer.h>
#ifdef __MWERKS__
#include <unix.h>
#endif
+#endif
+
+#ifdef UL_MAC_OSX
#include <Carbon/Carbon.h>
#endif
|
