Moved 'max' and 'min' because I just haven't had enough of playing with little simple...

svn path=/trunk/vorbis/; revision=414

diff --git a/lib/os.h b/lib/os.h
index 6509aee..4ae5e90 100644 (file)
--- a/lib/os.h
+++ b/lib/os.h
@@ -14,7 +14,7 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.5 2000/05/08 20:49:49 xiphmont Exp $
+ last mod: $Id: os.h,v 1.6 2000/05/27 18:43:58 jon Exp $
 
  ********************************************************************/
 
@@ -40,6 +40,14 @@
 
 #endif
 
+#ifndef min
+#  define min(x,y)  ((x)>(y)?(y):(x))
+#endif
+
+#ifndef max
+#  define max(x,y)  ((x)<(y)?(y):(x))
+#endif
+
 #include "../include/vorbis/os_types.h"
 
 #endif // _OS_H

diff --git a/lib/scales.h b/lib/scales.h
index 72f94b3..07ef516 100644 (file)
--- a/lib/scales.h
+++ b/lib/scales.h
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: linear scale -> dB, Bark and Mel scales
- last mod: $Id: scales.h,v 1.3 2000/05/27 17:28:26 jon Exp $
+ last mod: $Id: scales.h,v 1.4 2000/05/27 18:43:58 jon Exp $
 
  ********************************************************************/
 
@@ -21,12 +21,6 @@
 
 #include <math.h>
 
-#undef min   // These get defined in a win32 header file... eeyuch.
-#undef max
-
-#define min(x,y)  ((x)>(y)?(y):(x))
-#define max(x,y)  ((x)<(y)?(y):(x))
-
 /* 20log10(x) */
 #define DYNAMIC_RANGE_dB 200.
 #define todB(x)   ((x)==0?-9.e40:log(fabs(x))*8.6858896)