[Glibc-bsd-commits] r4869 - trunk/kfreebsd-kernel-headers/debian

[Robert Millan]

Author: rmh
Date: 2013-08-06 10:37:27 +0000 (Tue, 06 Aug 2013)
New Revision: 4869

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Use 'defined(__GNUC__)' rather than '1' when replacing __GNUCLIKE_* macros.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-08-04 21:49:45 UTC (rev 4868)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-08-06 10:37:27 UTC (rev 4869)
@@ -2,6 +2,8 @@
 
   * Disable a few function declarations in <sys/types.h> which may
     potentially collide with the ones from Glibc.
+  * Use 'defined(__GNUC__)' rather than '1' when replacing __GNUCLIKE_*
+    macros.
 
  -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 18:07:05 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-08-04 21:49:45 UTC (rev 4868)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-08-06 10:37:27 UTC (rev 4869)
@@ -52,7 +52,7 @@
 		\
 		-e "s/__FreeBSD_version/__FreeBSD_kernel_version/g" \
 		\
-		-e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/1/g' \
+		-e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/defined(__GNUC__)/g' \
 		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if defined(__GNUC__)/g' \
 		-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if !defined(__GNUC__)/g' \
 		\