Mercurial > sdl-ios-xcode

diff src/audio/mint/SDL_mintaudio.h @ 4149:2325dd996f73 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check defines do not already exist in recent system headers
author Patrice Mandin <patmandin@gmail.com>
date Thu, 07 Aug 2008 20:38:35 +0000
parents e958a003b69b
children a1b03ba2fcd0
line wrap: on
line diff
--- a/src/audio/mint/SDL_mintaudio.h	Fri Jul 25 10:52:10 2008 +0000
+++ b/src/audio/mint/SDL_mintaudio.h	Thu Aug 07 20:38:35 2008 +0000
@@ -84,6 +84,7 @@
 #define MASTERPREDIV_MILAN	256
 
 /* MFP 68901 interrupt sources */
+#ifndef MFP_PARALLEL
 enum {
 	MFP_PARALLEL=0,
 	MFP_DCD,
@@ -106,14 +107,17 @@
 	MFP_RING,
 	MFP_MONODETECT
 };
+#endif
 
 /* Xbtimer() timers */
+#ifndef XB_TIMERA
 enum {
 	XB_TIMERA=0,
 	XB_TIMERB,
 	XB_TIMERC,
 	XB_TIMERD
 };
+#endif
 
 /* Variables */
 extern SDL_AudioDevice *SDL_MintAudio_device;