rev 227 - in trunk: include/prothon src

Author: bcollins
Date: 2004-03-31 10:07:37 -0500 (Wed, 31 Mar 2004)
New Revision: 227

Modified:
   trunk/include/prothon/prothon.h
   trunk/src/parser.h
Log:
Move min/max defaines to prothon.h


Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h     2004-03-31 13:11:30 UTC (rev 226)
+++ trunk/include/prothon/prothon.h     2004-03-31 15:07:37 UTC (rev 227)
@@ -122,6 +122,13 @@
 typedef i32_t                  attr_key_t;
 typedef struct obj_s*  obj_p;
 
+#ifndef min
+# define min(a,b) (((a)<(b)) ? (a) : (b))
+#endif /* min */
+#ifndef max
+# define max(a,b) (((a)<(b)) ? (b) : (a))
+#endif /* max */
+
 // neg key value means entry is deleted
 #define ENTRY_DELETED  -1
 

Modified: trunk/src/parser.h
===================================================================
--- trunk/src/parser.h  2004-03-31 13:11:30 UTC (rev 226)
+++ trunk/src/parser.h  2004-03-31 15:07:37 UTC (rev 227)
@@ -61,13 +61,6 @@
 #include "bytecodes.h"
 #include <stdio.h>
 
-#ifndef min
-# define min(a,b) (((a)<(b)) ? (a) : (b))
-#endif /* min */
-#ifndef max
-# define max(a,b) (((a)<(b)) ? (b) : (a))
-#endif /* max */
-
 typedef struct {
        long                    param : 24;
        opcode_t                opcode:  8;