Changeset 539 in MondoRescue for trunk/mondo/mondo/common/my-stuff.h

Timestamp:

May 13, 2006, 7:38:44 PM (18 years ago)

Author:

bcornec

Message:

merge -r 534:538 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/my-stuff.h (modified) (8 diffs)

trunk/mondo/mondo/common/my-stuff.h

@@ -1 @@
-/* $Id$ */
-
+/*
+ * Common defines across the project
+ *
+ *  $Id$
+ */
+
+#ifndef _MY_STUFF_H_
+#define _MY_STUFF_H_
+
+/* BERLIOS
 #define HAVE_MALLOC 1
+*/
 
 // Extra info for ACLs and SELINUX users
@@ -26 +35 @@
  * Create the illusion of a Boolean type.
  */
-#define bool int
+#define bool unsigned char
 #define TRUE 1
 #define FALSE 0
@@ -34 +43 @@
 #include <config.h>
 #endif
+/* BERLIOS
+ * Useful ?
+*/
 
 #ifndef __FreeBSD__
@@ -47 +59 @@
 
 #include <stdlib.h>
+/* BERLIOS
 #ifndef  __USE_FILE_OFFSET64
 #define  __USE_FILE_OFFSET64
@@ -53 +66 @@
 #define  __USE_LARGEFILE64
 #endif
+*/
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -64 +78 @@
 #include <signal.h>
 #endif
-//#include <curses.h>
 #include <newt.h>
 #include <ctype.h>
@@ -70 +83 @@
 #ifndef S_SPLINT_S
 #include <pthread.h>
-#endif
 #include <assert.h>
 
-#include "../../config.h"
-
+/*
 #if defined(DEBUG) && !__cplusplus
 int count;
-char trace_log[255];            /*buffer for logging */
+char trace_log[255];
 char *trace_log_ptr;
-#endif                          /* DEBUG */
-
-#define IA64_BOOT_SIZE "8192"   /* Should be coherent with mindi */
-#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
+#endif
+*/
+
+#define STD_PREFIX "mondorescue"
 
 /**
@@ -129 +140 @@
 #define CRC_M16 0xA001          ///< Mask for crc16.
 #define CRC_MTT 0x1021          ///< Mask for crc-ccitt.
-
-#define FALSE 0                 ///< The ubiquitous FALSE macro.
-#define TRUE 1                  ///< The even more ubiquitous TRUE macro.
 
 #define SCREEN_LENGTH 25        ///< The default size of the screen.