PERFORCE change 122697 for review

Peter Wemm peter at FreeBSD.org
Mon Jul 2 02:22:00 UTC 2007


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

Change 122697 by peter at 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}


More information about the p4-projects mailing list