try again to be 32/64 bit agnostic

[simgrid.git] / testsuite / xbt / log_usage.c

diff --git a/testsuite/xbt/log_usage.c b/testsuite/xbt/log_usage.c
index 4266e9d..bc50ddd 100644 (file)
--- a/testsuite/xbt/log_usage.c
+++ b/testsuite/xbt/log_usage.c
@@ -10,11 +10,10 @@
 #pragma hdrstop
 #endif
 
-#include "gras.h"
+#include "xbt.h"
 
-
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top, "Logging specific to this test");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,
+                                "Logging specific to this test");
 XBT_LOG_NEW_CATEGORY(top, "Useless test channel");
 
 #ifdef __BORLANDC__
@@ -23,12 +22,12 @@ XBT_LOG_NEW_CATEGORY(top, "Useless test channel");
 
 static void dolog(const char *settings)
 {
-  INFO1("Test with the settings '%s'", settings);
+  XBT_INFO("Test with the settings '%s'", settings);
   xbt_log_control_set(settings);
-  DEBUG1("val=%d", 1);
-  WARN1("val=%d", 2);
-  CDEBUG2(top, "val=%d%s", 3, "!");
-  CRITICAL6("false alarm%s%s%s%s%s%s", "", "", "", "", "", "!");
+  XBT_DEBUG("val=%d", 1);
+  XBT_WARN("val=%d", 2);
+  XBT_CDEBUG(top, "val=%d%s", 3, "!");
+  XBT_CRITICAL("false alarm%s%s%s%s%s%s", "", "", "", "", "", "!");
 }
 
 
@@ -43,6 +42,5 @@ int main(int argc, char **argv)
   dolog(" test.thres:verbose root.thres:error ");
   dolog(" test.thres:critical ");
 
-  xbt_exit();
   return 0;
 }