Index: trunk/src/defs/debug.h
===================================================================
--- trunk/src/defs/debug.h	(revision 7711)
+++ trunk/src/defs/debug.h	(revision 7729)
@@ -35,10 +35,10 @@
 
 // DEFINE ERROR MODES
-#define NO              0
-#define ERR             1
-#define WARN            2
-#define INFO            3
-#define DEBUG           4
-#define vDEBUG          5
+#define ORX_NONE            0
+#define ORX_ERR             1
+#define ORX_WARN            2
+#define ORX_INFO            3
+#define ORX_DEBUG           4
+#define ORX_vDEBUG          5
 
 extern int verbose;
@@ -46,5 +46,5 @@
 //definitions
 #ifndef MODULAR_DEBUG
- #define HARD_DEBUG_LEVEL DEBUG
+ #define HARD_DEBUG_LEVEL ORX_DEBUG
  #define SOFT_DEBUG_LEVEL verbose
 #else /* MODULAR_DEBUG */
@@ -103,12 +103,12 @@
 /// PRINTF: prints with filename and linenumber ///
 ///////////////////////////////////////////////////
-#define PRINTFNO      PRINTF0
-#define PRINTFERR     PRINTF1
-#define PRINTFWARN    PRINTF2
-#define PRINTFINFO    PRINTF3
-#define PRINTFDEBUG   PRINTF4
-#define PRINTFVDEBUG  PRINTF5
-
-#if DEBUG <= 3
+#define PRINTFORX_NONE    PRINTF0
+#define PRINTFORX_ERR     PRINTF1
+#define PRINTFORX_WARN    PRINTF2
+#define PRINTFORX_INFO    PRINTF3
+#define PRINTFORX_DEBUG   PRINTF4
+#define PRINTFORX_VDEBUG  PRINTF5
+
+#if DEBUG_LEVEL <= 3
 #define PRINTF(x)        PRINT(x)
 #endif
@@ -122,52 +122,52 @@
 
 #ifndef PRINTF
-#ifdef DEBUG
+#ifdef ORX_DEBUG
 
 #define PRINTF(x) \
            PRINTF ## x
 
-#if HARD_DEBUG_LEVEL >= ERR
+#if HARD_DEBUG_LEVEL >= ORX_ERR
 #define PRINTF1 \
-    if (SOFT_DEBUG_LEVEL >= ERR) \
+    if (SOFT_DEBUG_LEVEL >= ORX_ERR) \
       printf("(EE)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
-#define PRINTF1 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= WARN
+#define PRINTF1 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_WARN
 #define PRINTF2 \
-     if (SOFT_DEBUG_LEVEL >= WARN) \
+     if (SOFT_DEBUG_LEVEL >= ORX_WARN) \
        printf("(WW)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 
 #else
-#define PRINTF2 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= INFO
+#define PRINTF2 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_INFO
 #define PRINTF3 \
-     if (SOFT_DEBUG_LEVEL >= INFO) \
+     if (SOFT_DEBUG_LEVEL >= ORX_INFO) \
        printf("(II)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
-#define PRINTF3 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= DEBUG
+#define PRINTF3 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_DEBUG
 #define PRINTF4 \
-     if (SOFT_DEBUG_LEVEL >= DEBUG) \
+     if (SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
        printf("(DD)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
-#define PRINTF4 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= vDEBUG
+#define PRINTF4 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_vDEBUG
 #define PRINTF5 \
-     if (SOFT_DEBUG_LEVEL >= vDEBUG) \
+     if (SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
        printf("(VD)::%s:%d:", __FILE__, __LINE__) && PRINT_EXEC
 #else
-#define PRINTF5 if (NO)
-#endif
-
-#else
-#define PRINTF(x) if (NO)
+#define PRINTF5 if (ORX_NONE)
+#endif
+
+#else
+#define PRINTF(x) if (ORX_NONE)
 #endif
 
@@ -179,59 +179,59 @@
 ///  PRINT: just prints output as is            ///
 ///////////////////////////////////////////////////
-#define PRINTNO      PRINT0
-#define PRINTERR     PRINT1
-#define PRINTWARN    PRINT2
-#define PRINTINFO    PRINT3
-#define PRINTDEBUG   PRINT4
-#define PRINTVDEBUG  PRINT5
-
-#ifdef  DEBUG
+#define PRINTORX_NONE    PRINT0
+#define PRINTORX_ERR     PRINT1
+#define PRINTORX_WARN    PRINT2
+#define PRINTORX_INFO    PRINT3
+#define PRINTORX_DEBUG   PRINT4
+#define PRINTORX_vDEBUG  PRINT5
+
+#ifdef  DEBUG_LEVEL
 #define PRINT(x) \
   PRINT ## x
 
-#if HARD_DEBUG_LEVEL >= ERR
+#if HARD_DEBUG_LEVEL >= ORX_ERR
 #define PRINT1  \
-  if (SOFT_DEBUG_LEVEL >= ERR)  \
+  if (SOFT_DEBUG_LEVEL >= ORX_ERR)  \
     PRINT_EXEC
 #else
-#define PRINT1 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= WARN
+#define PRINT1 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_WARN
 #define PRINT2 \
-  if (SOFT_DEBUG_LEVEL >= WARN) \
+  if (SOFT_DEBUG_LEVEL >= ORX_WARN) \
     PRINT_EXEC
 
 #else
-#define PRINT2 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= INFO
+#define PRINT2 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_INFO
 #define PRINT3 \
-  if (SOFT_DEBUG_LEVEL >= INFO) \
+  if (SOFT_DEBUG_LEVEL >= ORX_INFO) \
     PRINT_EXEC
 #else
-#define PRINT3 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= DEBUG
+#define PRINT3 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_DEBUG
 #define PRINT4 \
-  if (SOFT_DEBUG_LEVEL >= DEBUG) \
+  if (SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
     PRINT_EXEC
 #else
-#define PRINT4 if (NO)
-#endif
-
-#if HARD_DEBUG_LEVEL >= vDEBUG
+#define PRINT4 if (ORX_NONE)
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_vDEBUG
 #define PRINT5 \
-     if (SOFT_DEBUG_LEVEL >= vDEBUG) \
+     if (SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
        PRINT_EXEC
 #else
-#define PRINT5 if (NO)
-#endif
-
-
-#else
-#define PRINT(x) if (NO)
+#define PRINT5 if (ORX_NONE)
+#endif
+
+
+#else
+#define PRINT(x) if (ORX_NONE)
 #endif
 
@@ -244,64 +244,64 @@
 ///  COUT: just prints output as is with std::cout   ///
 ////////////////////////////////////////////////////////
-#define COUTNO      COUT0
-#define COUTERR     COUT1
-#define COUTWARN    COUT2
-#define COUTINFO    COUT3
-#define COUTDEBUG   COUT4
-#define COUTVDEBUG  COUT5
-
-#ifdef  DEBUG
+#define COUTORX_NONE    COUT0
+#define COUTORX_ERR     COUT1
+#define COUTORX_WARN    COUT2
+#define COUTORX_INFO    COUT3
+#define COUTORX_DEBUG   COUT4
+#define COUTORX_vDEBUG  COUT5
+
+#ifdef  DEBUG_LEVEL
 #define COUT(x) \
   COUT ## x
 
-#if HARD_DEBUG_LEVEL >= ERR
+#if HARD_DEBUG_LEVEL >= ORX_ERR
 #define COUT1  \
-  if (SOFT_DEBUG_LEVEL >= ERR)  \
-    COUT_EXEC
-#else
-#define COUT1 if (NO)\
-    COUT_EXEC
-#endif
-
-#if HARD_DEBUG_LEVEL >= WARN
+  if (SOFT_DEBUG_LEVEL >= ORX_ERR)  \
+    COUT_EXEC
+#else
+#define COUT1 if (ORX_NONE)\
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_WARN
 #define COUT2 \
-  if (SOFT_DEBUG_LEVEL >= WARN) \
-    COUT_EXEC
-
-#else
-#define COUT2 if (NO) \
-    COUT_EXEC
-#endif
-
-#if HARD_DEBUG_LEVEL >= INFO
+  if (SOFT_DEBUG_LEVEL >= ORX_WARN) \
+    COUT_EXEC
+
+#else
+#define COUT2 if (ORX_NONE) \
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_INFO
 #define COUT3 \
-  if (SOFT_DEBUG_LEVEL >= INFO) \
-    COUT_EXEC
-#else
-#define COUT3 if (NO) \
-    COUT_EXEC
-#endif
-
-#if HARD_DEBUG_LEVEL >= DEBUG
+  if (SOFT_DEBUG_LEVEL >= ORX_INFO) \
+    COUT_EXEC
+#else
+#define COUT3 if (ORX_NONE) \
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_DEBUG
 #define COUT4 \
-  if (SOFT_DEBUG_LEVEL >= DEBUG) \
-    COUT_EXEC
-#else
-#define COUT4 if (NO) \
-    COUT_EXEC
-#endif
-
-#if HARD_DEBUG_LEVEL >= vDEBUG
+  if (SOFT_DEBUG_LEVEL >= ORX_DEBUG) \
+    COUT_EXEC
+#else
+#define COUT4 if (ORX_NONE) \
+    COUT_EXEC
+#endif
+
+#if HARD_DEBUG_LEVEL >= ORX_vDEBUG
 #define COUT5 \
-     if (SOFT_DEBUG_LEVEL >= vDEBUG) \
+     if (SOFT_DEBUG_LEVEL >= ORX_vDEBUG) \
        COUT_EXEC
 #else
-#define COUT5 if (NO) \
-    COUT_EXEC
-#endif
-
-
-#else
-#define COUT(x) if (NO) \
+#define COUT5 if (ORX_NONE) \
+    COUT_EXEC
+#endif
+
+
+#else
+#define COUT(x) if (ORX_NONE) \
     COUT_EXEC
 #endif
