From owner-p4-projects@FreeBSD.ORG  Wed Nov 14 01:21:27 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id AF50C733; Wed, 14 Nov 2012 01:21:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 67823731
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 01:21:27 +0000 (UTC)
 (envelope-from bz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 4DB558FC0C
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 01:21:27 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAE1LRl8051365
 for <perforce@freebsd.org>; Wed, 14 Nov 2012 01:21:27 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAE1LRkI051362
 for perforce@freebsd.org; Wed, 14 Nov 2012 01:21:27 GMT
 (envelope-from bz@freebsd.org)
Date: Wed, 14 Nov 2012 01:21:27 GMT
Message-Id: <201211140121.qAE1LRkI051362@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 219778 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 01:21:27 -0000

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

Change 219778 by bz@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>