[devel] Simplified the PNG_UNUSED macro.
diff --git a/ANNOUNCE b/ANNOUNCE
index c8c6436..c122fdd 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -109,7 +109,7 @@
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 ? 0 : 0));" (Cosmin)
+ Changed PNG_UNUSED from "param=param;" to "{(void)param;}".
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 59b3c3d..e9a2fed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3225,7 +3225,7 @@
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 ? 0 : 0));" (Cosmin)
+ Changed PNG_UNUSED from "param=param;" to "{(void)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 21c8a44..9eef45b 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -89,13 +89,13 @@
* the terminating semicolon.
*/
#ifndef PNG_UNUSED
-/* Different possiblities being discussed on png-mng-implement, Jan 2011 */
+# define PNG_UNUSED(param) {(void)param;}
+/* Other possiblities being discussed on png-mng-implement, Jan 2011 */
/* # define PNG_UNUSED(param) param = param; */
-/* # define PNG_UNUSED(param) if(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;} */
-# define PNG_UNUSED(param) ((void)(param ? 0 : 0));
+/* # define PNG_UNUSED(param) ((void)(param ? 0 : 0)); */
#endif
/* Just a little check that someone hasn't tried to define something
