Forráskód Böngészése

Remove undefined directive-in-macro in test_util_writepid

clang 3.7 complains that using a preprocessor directive inside
a macro invocation in test_util_writepid in test_util.c is undefined.

Fix on 79e85313aa61 on 0.2.7.1-alpha.
teor 9 éve
szülő
commit
e0477de0e2
2 módosított fájl, 9 hozzáadás és 4 törlés
  1. 6 0
      changes/bug16115-undef-directive-in-macro
  2. 3 4
      src/test/test_util.c

+ 6 - 0
changes/bug16115-undef-directive-in-macro

@@ -0,0 +1,6 @@
+  o Minor fixes (threads, comments):
+    - Remove undefined directive-in-macro in test_util_writepid
+      clang 3.7 complains that using a preprocessor directive inside
+      a macro invocation in test_util_writepid in test_util.c is undefined.
+      Patch by "teor".
+      Fix on 79e85313aa61 on 0.2.7.1-alpha.

+ 3 - 4
src/test/test_util.c

@@ -4319,13 +4319,12 @@ test_util_writepid(void *arg)
 
   int n = sscanf(contents, "%lu\n%c", &pid, &c);
   tt_int_op(n, OP_EQ, 1);
-  tt_uint_op(pid, OP_EQ,
+
 #ifdef _WIN32
-             _getpid()
+  tt_uint_op(pid, OP_EQ, _getpid());
 #else
-             getpid()
+  tt_uint_op(pid, OP_EQ, getpid());
 #endif
-             );
 
  done:
   tor_free(contents);