From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 18 Feb 2009 21:32:02 +0000 (-0500)
Subject: Both cpio/test/test.h and cpio/cpio_platform.h try to define __FBSDID
X-Git-Tag: v2.7.0~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca3ff30463bf0a0c0eaf00b44e73cb3d4e350de8;p=thirdparty%2Flibarchive.git

Both cpio/test/test.h and cpio/cpio_platform.h try to define __FBSDID
on non-FreeBSD platforms.  Avoid conflicts.

SVN-Revision: 661
---

diff --git a/cpio/cpio_platform.h b/cpio/cpio_platform.h
index dbfb1e607..c3104a71c 100644
--- a/cpio/cpio_platform.h
+++ b/cpio/cpio_platform.h
@@ -48,7 +48,7 @@
 /* No non-FreeBSD platform will have __FBSDID, so just define it here. */
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>  /* For __FBSDID */
-#else
+#elif !defined(__FBSDID)
 /* Just leaving this macro replacement empty leads to a dangling semicolon. */
 #define	__FBSDID(a)     struct _undefined_hack
 #endif