[Xbubble-commits] xbubble-sdl/src setting.h, 1.5, 1.6 utils.h, 1.3, 1.4

[Martin Quinson]

Update of /cvsroot/xbubble/xbubble-sdl/src
In directory haydn:/tmp/cvs-serv7039

Modified Files:
	setting.h utils.h 
Log Message:
Put min et max macro in a more logical location

Index: utils.h
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/utils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- utils.h	12 Sep 2006 08:04:08 -0000	1.3
+++ utils.h	15 Sep 2006 09:50:35 -0000	1.4
@@ -77,6 +77,9 @@
 #define DEFAULT_STATE 666
 #define DEFAULT_STATE_NAME "DEFAULT"
 
+
+#define MIN(a,b) ((a)<(b)? (a):(b))
+#define MAX(a,b) ((a)>(b)? (a):(b))
 #define clip( X, m, M ) (( X < m )? m : (( X > M )? M : X ))
 
 char *file_resolve_path(const char *name, const char *theme);

Index: setting.h
===================================================================
RCS file: /cvsroot/xbubble/xbubble-sdl/src/setting.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setting.h	14 Sep 2006 07:47:11 -0000	1.5
+++ setting.h	15 Sep 2006 09:50:35 -0000	1.6
@@ -78,9 +78,4 @@
 #define MENUFONT_SELECTED_COLOR {0xc0, 0xc0, 0x00}
 #define MAX_NB_LEVELS  100
 
-/* game screens */
-
-#define MIN(a,b) ((a)<(b)? (a):(b))
-#define MAX(a,b) ((a)>(b)? (a):(b))
-
 #endif /* _SETTING_H */