From owner-p4-projects@FreeBSD.ORG  Mon Jul  2 02:22:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9CCF16A46D; Mon,  2 Jul 2007 02:21:59 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 A94C516A46B
	for <perforce@freebsd.org>; Mon,  2 Jul 2007 02:21:59 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 998D413C4CE
	for <perforce@freebsd.org>; Mon,  2 Jul 2007 02:21:59 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l622LxZK040878
	for <perforce@freebsd.org>; Mon, 2 Jul 2007 02:21:59 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l622Lx4I040875
	for perforce@freebsd.org; Mon, 2 Jul 2007 02:21:59 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 2 Jul 2007 02:21:59 GMT
Message-Id: <200707020221.l622Lx4I040875@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122697 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 02 Jul 2007 02:22:00 -0000

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

Change 122697 by peter@peter_overcee on 2007/07/02 02:21:36

	Sigh.  imake (xorg/xfree86) likes to #include /usr/include/osreldate.h
	into *Makefile*s.  Luckily, it uses cc -traditional.  With -traditional,
	we can ignore the prototype entirely.  Sigh.

Affected files ...

.. //depot/projects/hammer/include/Makefile#66 edit

Differences ...

==== //depot/projects/hammer/include/Makefile#66 (text+ko) ====

@@ -102,15 +102,17 @@
 	echo "#ifdef _KERNEL" >> osreldate.h; \
 	echo "#error \"<osreldate.h> cannot be used in the kernel, use <sys/param.h>\"" >> osreldate.h; \
 	echo "#else" >> osreldate.h; \
+	echo "#undef __FreeBSD_version" >> osreldate.h; \
+	echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
+	echo "#ifdef __STDC__" >> osreldate.h; \
 	echo "#ifndef _OSRELDATE_H" >> osreldate.h; \
 	echo "#define _OSRELDATE_H" >> osreldate.h; \
 	echo "#include <sys/cdefs.h>" >> osreldate.h; \
-	echo "#undef __FreeBSD_version" >> osreldate.h; \
-	echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
 	echo "__BEGIN_DECLS" >> osreldate.h; \
 	echo "extern int getosreldate(void);" >> osreldate.h; \
 	echo "__END_DECLS" >> osreldate.h; \
 	echo "#endif /* _OSRELDATE_H */" >> osreldate.h; \
+	echo "#endif /* __STDC__ */" >> osreldate.h; \
 	echo "#endif /* _KERNEL */" >> osreldate.h
 
 .for i in ${LHDRS}