--- old/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h	2016-07-29 13:36:32.903231108 -0700
+++ new/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h	2016-07-29 13:36:32.751231112 -0700
@@ -34,11 +34,9 @@
 // Shared macro defined for cleanup of allocated memory.
 #ifndef FREE_AND_RETURN_STATUS
 #define FREE_AND_RETURN_STATUS \
-{ \
 if (pbuff != buff) mlib_free(pbuff); \
 if (k != akernel) mlib_free(k); \
-return status; \
-}
+return status
 #endif /* FREE_AND_RETURN_STATUS */
 
 mlib_status mlib_c_convMxNnw_u8(mlib_image       *dst,