ENH: Change NPY_AUXDATA_FREE macro based on PR feedback

akleeman · May 10, 2012 · 9d63dae · 9d63dae
1 parent b7cb21a
commit 9d63dae
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
@@ -303,10 +303,11 @@ struct NpyAuxData_tag {
 
 /* Macros to use for freeing and cloning auxiliary data */
 #define NPY_AUXDATA_FREE(auxdata) \
-    if ((auxdata) == NULL) \
-        ; \
-    else \
-        ((auxdata)->free(auxdata))
+    do { \
+        if ((auxdata) != NULL) { \
+            (auxdata)->free(auxdata); \
+        } \
+    } while(0)
 #define NPY_AUXDATA_CLONE(auxdata) \
     ((auxdata)->clone(auxdata))