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 dbfb1e60700974a3f0d36887d363308e35904eb7..c3104a71c9f46d6d9fc92997e27dcf0df87eeee3 100644 (file)
--- 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