From owner-freebsd-current  Wed Nov  6 13: 5:21 2002
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 62D6637B401
	for <current@freebsd.org>; Wed,  6 Nov 2002 13:05:20 -0800 (PST)
Received: from blarf.homeip.net (adsl-209-204-188-56.sonic.net [209.204.188.56])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C608143E7B
	for <current@freebsd.org>; Wed,  6 Nov 2002 13:05:19 -0800 (PST)
	(envelope-from sonicmail@blarf.homeip.net)
Received: by blarf.homeip.net (Postfix, from userid 1006)
	id 836911BAE; Wed,  6 Nov 2002 13:05:17 -0800 (PST)
Date: Wed, 6 Nov 2002 13:05:16 -0800
From: Alex Zepeda <zipzippy@sonic.net>
To: current@freebsd.org
Subject: Re: uuid.h is not C++ safe
Message-ID: <20021106210516.GA90522@blarf.homeip.net>
References: <3DC71B56.1050102@137.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo"
Content-Disposition: inline
In-Reply-To: <3DC71B56.1050102@137.org>
User-Agent: Mutt/1.5.1i
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG


--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Neither is devinfo.h.  The attached patch should fix it.

- alex

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="devinfo.diff"

--- devinfo.h.orig	Wed Nov  6 13:03:22 2002
+++ devinfo.h	Wed Nov  6 13:04:37 2002
@@ -27,6 +27,9 @@
  *	$FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.4 2002/09/20 02:16:33 imp Exp $
  */
 
+#ifndef _DEVINFO_H
+#define _DEVINFO_H
+
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
@@ -77,6 +80,8 @@
 	/* XXX add flags */
 };
 
+__BEGIN_DECLS
+
 /*
  * Acquire a coherent copy of the kernel's device and resource tables.
  * This must return success (zero) before any other interfaces will
@@ -136,3 +141,6 @@
 extern int
 	devinfo_foreach_rman(int (* fn)(struct devinfo_rman *rman, void *arg),
 	    void *arg);
+__END_DECLS
+
+#endif /* _DEVINFO_H */

--envbJBWh7q8WU6mo--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message