From 530453376c1cef29b7c099f4e9e8b4e4dbf99db7 Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Thu, 2 Feb 2006 14:09:48 +0000
Subject: Removing a lot of warnings, as well as a bunch of terrible bugs!

---
 psxdev/xadecode.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'psxdev/xadecode.h')

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))
-- 
cgit v1.2.3