PERFORCE change 219778 for review

[Bjoern A. Zeeb]

http://p4web.freebsd.org/@@219778?ac=10

Change 219778 by bz at bz_zenith on 2012/11/14 01:20:37

	Define PNG_NO_CONSOLE_IO to get rid of some sprintfs and the fprintf
	calls. PNG_NO_STDIO we currently cannot do because libde4tc depends
	on it.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/Makefile#3 edit
.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngconf.h#3 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/Makefile#3 (text+ko) ====

@@ -28,6 +28,9 @@
 # Disable the stack protector, we want to be vulnerable
 SSP_CFLAGS=	
 
-CFLAGS+=	-DPNG_NO_FLOATING_POINT_SUPPORTED
+CFLAGS+=	-DPNG_NO_FLOATING_POINT_SUPPORTED \
+		-DPNG_NO_CONSOLE_IO
+# libde4tc currently requires
+# -DPNG_NO_STDIO
 
 .include <bsd.lib.mk>

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngconf.h#3 (text+ko) ====

@@ -162,6 +162,11 @@
  * #define PNG_NO_CONSOLE_IO
  * #define PNG_NO_STDIO
  */
+#define PNG_NO_CONSOLE_IO
+#if 0
+/* libde4tc currently needs this. */
+#define PNG_NO_STDIO
+#endif
 
 #if defined(_WIN32_WCE)
 #  include <windows.h>