use -Wl on -no-undefined as it is a linker option:

[oweals/gnunet.git] / src / include / gauger.h

diff --git a/src/include/gauger.h b/src/include/gauger.h
index eb2f6d10958f8a23e106346ec5b8dea4ca9c9f1d..10ada9065b6bbdd1f5d8307ff4093c6d37f27a60 100644 (file)
--- a/src/include/gauger.h
+++ b/src/include/gauger.h
@@ -11,6 +11,8 @@
 #ifndef __GAUGER_H__
 #define __GAUGER_H__
 
+#ifndef WINDOWS
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/wait.h>
@@ -21,20 +23,21 @@
     char __gauger_s[32];\
     pid_t __gauger_p;\
     if(!(__gauger_p=fork())){\
+        close (1);          \
+        close (2);          \
         if(!fork()){\
             sprintf(__gauger_s,"%Lf", (long double) (value));\
-            __gauger_v[0] = "gauger-cli.py";\
+            __gauger_v[0] = "gauger";\
             __gauger_v[1] = "-n";\
-            __gauger_v[2] = counter;\
+            __gauger_v[2] = (char*) (counter); \
             __gauger_v[3] = "-d";\
             __gauger_v[4] = __gauger_s;\
             __gauger_v[5] = "-u";\
-            __gauger_v[6] = unit;\
+            __gauger_v[6] = (char*) (unit);    \
             __gauger_v[7] = "-c";\
-            __gauger_v[8] = category;\
-            __gauger_v[9] = (char *)NULL;\
-            execvp("gauger-cli.py",__gauger_v);\
-            perror("gauger");\
+            __gauger_v[8] = (char*) (category);        \
+            __gauger_v[9] = (char*) NULL;\
+            execvp("gauger",__gauger_v);\
             _exit(1);\
         }else{\
             _exit(0);\
@@ -50,29 +53,58 @@
     char __gauger_s[32];\
     pid_t __gauger_p;\
     if(!(__gauger_p=fork())){\
+        close (1);          \
+        close (2);          \
         if(!fork()){\
             sprintf(__gauger_s,"%Lf", (long double) (value));\
-            __gauger_v[0] = "gauger-cli.py";\
+            __gauger_v[0] = "gauger";\
             __gauger_v[1] = "-n";\
-            __gauger_v[2] = counter;\
+            __gauger_v[2] = (char*) (counter); \
             __gauger_v[3] = "-d";\
             __gauger_v[4] = __gauger_s;\
             __gauger_v[5] = "-u";\
-            __gauger_v[6] = unit;\
+            __gauger_v[6] = (char*) (unit);    \
             __gauger_v[7] = "-i";\
             __gauger_v[8] = id;\
             __gauger_v[9] = "-c";\
-            __gauger_v[10] = category;\
-            __gauger_v[11] = (char *)NULL;\
-            execvp("gauger-cli.py",__gauger_v);\
-            perror("gauger");\
+            __gauger_v[10] = (char *) (category);      \
+            __gauger_v[11] = (char *) NULL;\
+            execvp("gauger",__gauger_v);\
             _exit(1);\
         }else{\
             _exit(0);\
         }\
     }else{\
-        waitpid(__gauger_p,NULL,0);\
+        waitpid(__gauger_p, NULL, 0);\
     }\
 }
 
+#else /* WINDOWS */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <windef.h>
+
+#define GAUGER(category, counter, value, unit)\
+{\
+    char __gauger_commandline[MAX_PATH];\
+    \
+    snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -c \"%s\"",\
+             (counter), (long double) (value), (unit), (category));    \
+    __gauger_commandline[MAX_PATH - 1] = '\0';\
+    system (__gauger_commandline);\
+}
+
+#define GAUGER_ID(category, counter, value, unit, id)\
+{\
+    char __gauger_commandline[MAX_PATH];\
+    \
+    snprintf (__gauger_commandline, MAX_PATH, "gauger.py -n \"%s\" -d \"%Lf\" -u \"%s\" -i \"%s\" -c \"%s\"",\
+             (counter), (long double) (value), (unit), (id), (category)); \
+    __gauger_commandline[MAX_PATH - 1] = '\0';\
+    system (__gauger_commandline);\
+}
+
+#endif // WINDOWS
+
 #endif