src/share/bin/java.h

@@ -240,15 +240,20 @@
     int    mode;
     char  *what;
     InvocationFunctions ifn;
 } JavaMainArgs;
 
-#define NULL_CHECK_RV(e, rv) if ((e) == 0) { \
+#define NULL_CHECK_RETURN_VALUE(NCRV_check_pointer, NCRV_return_value) \
+    do { \
+        if ((NCRV_check_pointer) == NULL) { \
     JLI_ReportErrorMessage(JNI_ERROR); \
-    return rv; \
-  }
+            return NCRV_return_value; \
+        } \
+    } while (JNI_FALSE)
 
-#define NULL_CHECK0(e) NULL_CHECK_RV(e, 0)
+#define NULL_CHECK0(NC0_check_pointer) \
+    NULL_CHECK_RETURN_VALUE(NC0_check_pointer, 0)
 
-#define NULL_CHECK(e) NULL_CHECK_RV(e, )
+#define NULL_CHECK(NC_check_pointer) \
+    NULL_CHECK_RETURN_VALUE(NC_check_pointer, )
 
 #endif /* _JAVA_H_ */