diff --git a/ANNOUNCE b/ANNOUNCE
index c122fddda..ab33c2986 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -109,7 +109,7 @@ Version 1.5.1beta10 [January 27, 2010]
     argument names file_gamma, int_file_gamma, and srgb_intent consistently.
 
 Version 1.5.1beta11 [January 27, 2011]
-  Changed PNG_UNUSED from "param=param;" to "{(void)param;}".
+  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index e9a2fed7e..117233e59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3225,7 +3225,7 @@ Version 1.5.1beta10 [January 27, 2010]
     argument names file_gamma, int_file_gamma, and srgb_intent consistently.
 
 Version 1.5.1beta11 [January 27, 2011]
-  Changed PNG_UNUSED from "param=param;" to "{(void)param;}".
+  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngpriv.h b/pngpriv.h
index 9eef45b85..afc36b875 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -89,13 +89,22 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
  * the terminating semicolon.
  */
 #ifndef PNG_UNUSED
-#  define PNG_UNUSED(param) {(void)param;}
+#  define PNG_UNUSED(param) {if(param){}}
 /* Other possiblities being discussed on png-mng-implement, Jan 2011 */
-/* #  define PNG_UNUSED(param) param = param; */
-/* #  define PNG_UNUSED(param) if(param); */ /* gcc-4.2 warns about this one */
-/* #  define PNG_UNUSED(param) if(param){} */
-/* #  define PNG_UNUSED(param) {if(param){}} */
-/* #  define PNG_UNUSED(param) ((void)(param ? 0 : 0)); */
+/* #define PNG_UNUSED(param) param = param; */         /* What we used before */
+/* #define PNG_UNUSED(param) {(void)param;} */         /* Visual C complains */
+/* #define PNG_UNUSED(param) if(param);     */         /* gcc-4.2 complains */
+/* #define PNG_UNUSED(param) if(param){}    */
+/* #define PNG_UNUSED(param) ((void)(param ? 0 : 0)); */ /* 0:0 might be seen */
+/* #define PNG_UNUSED(param) {if(&param){}} */         /* gcc-4 complains */
+/* #define PNG_UNUSED(param) {if(&param-&param){}} */  /* No comment. */
+/*
+ * #if defined(__GNUC__) || defined(_MSC_VER)
+ * #  define UNUSED(param) (void)param;
+ * #else
+ * #  define UNUSED(param)
+ * #endif
+*/
 #endif
 
 /* Just a little check that someone hasn't tried to define something