summaryrefslogtreecommitdiff
path: root/psxdev
diff options
context:
space:
mode:
authorpixel <pixel>2006-02-02 14:09:48 +0000
committerpixel <pixel>2006-02-02 14:09:48 +0000
commit530453376c1cef29b7c099f4e9e8b4e4dbf99db7 (patch)
tree2ac064392f5961646987139297c27c0f0d1791c5 /psxdev
parent074b784bfd03f248aa13cb50ad45479db03ba5ca (diff)
Removing a lot of warnings, as well as a bunch of terrible bugs!
Diffstat (limited to 'psxdev')
-rw-r--r--psxdev/xadecode.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/psxdev/xadecode.h b/psxdev/xadecode.h
index b886285..560ae73 100644
--- a/psxdev/xadecode.h
+++ b/psxdev/xadecode.h
@@ -28,8 +28,10 @@
#define XANONE 0x200 /* for application use only! */
#define XAAV 0x400 /* for application use only! */
+#ifndef max
#define max(a,b) (a<b?b:a)
#define min(a,b) (a>b?b:a)
+#endif
#define FXD_FxdToPCM(dt) (max(min((short)((dt)>>16), 32767), -32768))
#define DblToPCM(dt) (short)(max(min((dt), 32767), -32768))