From owner-p4-projects@FreeBSD.ORG  Sat Jun 21 12:06:21 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF54437B404; Sat, 21 Jun 2003 12:06:20 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7AE5A37B401
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 12:06:20 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D480743FD7
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 12:06:19 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5LJ6J0U038692
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 12:06:19 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5LJ6Jpx038689
	for perforce@freebsd.org; Sat, 21 Jun 2003 12:06:19 -0700 (PDT)
Date: Sat, 21 Jun 2003 12:06:19 -0700 (PDT)
Message-Id: <200306211906.h5LJ6Jpx038689@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 33478 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sat, 21 Jun 2003 19:06:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=33478

Change 33478 by rwatson@rwatson_powerbook on 2003/06/21 12:05:29

	Darwin doesn't support __printflike(); they also declare
	__va_list in two different headers, so we grab the machine/ansi.h
	one indirected through a define.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sbuf.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sbuf.h#2 (text+ko) ====

@@ -31,7 +31,8 @@
 #ifndef _SYS_SBUF_H_
 #define	_SYS_SBUF_H_
 
-#include <sys/_types.h>
+#include <sys/types.h>
+#include <machine/ansi.h>
 
 /*
  * Structure definition
@@ -62,8 +63,8 @@
 int		 sbuf_bcpy(struct sbuf *, const char *, size_t);
 int		 sbuf_cat(struct sbuf *, const char *);
 int		 sbuf_cpy(struct sbuf *, const char *);
-int		 sbuf_printf(struct sbuf *, const char *, ...) __printflike(2, 3);
-int		 sbuf_vprintf(struct sbuf *, const char *, __va_list) __printflike(2, 0);
+int		 sbuf_printf(struct sbuf *, const char *, ...);
+int		 sbuf_vprintf(struct sbuf *, const char *, _BSD_VA_LIST_);
 int		 sbuf_putc(struct sbuf *, int);
 int		 sbuf_trim(struct sbuf *);
 int		 sbuf_overflowed(struct sbuf *);