[Scummvm-cvs-logs] CVS: tools extract.h,1.7,1.8 util.h,1.8,1.9

[Max Horn]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv18057

Modified Files:
	extract.h util.h 
Log Message:
useful to have type bool available in C

Index: extract.h
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- extract.h	9 Nov 2003 23:45:44 -0000	1.7
+++ extract.h	30 Dec 2003 15:19:18 -0000	1.8
@@ -25,12 +25,6 @@
 #include "util.h"
 
 
-typedef enum {
-	false = 0,
-	true = 1
-} bool;
-
-
 /* These are the defaults parameters for the Lame invocation */
 #define minBitrDef 24
 #define maxBitrDef 64

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/tools/util.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- util.h	27 Nov 2003 07:33:32 -0000	1.8
+++ util.h	30 Dec 2003 15:19:18 -0000	1.9
@@ -40,11 +40,9 @@
 
 
 /*
- * Various utility macros
+ * Some useful types
  */
 
-#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
-
 typedef unsigned char byte;
 typedef unsigned char uint8;
 typedef unsigned short uint16;
@@ -52,6 +50,17 @@
 typedef signed char int8;
 typedef signed short int16;
 typedef signed int int32;
+
+#if !defined(__cplusplus)
+typedef enum { false = 0, true = 1 } bool;
+#endif
+
+
+/*
+ * Various utility macros
+ */
+
+#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
 
 static uint32 inline SWAP_32(uint32 a) {
 	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +