From 7217e995d1451e30a310f8c5e3621f2ec10ae2ec Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 2 Nov 2016 00:14:40 +0100
Subject: [PATCH] <sys/cdefs.h>: Remove some duplicate definitions.

---
 sys/sys/cdefs.h | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index d1ec095160..74035c9b4d 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -438,15 +438,23 @@
 #endif
 
 #ifndef	__RCSID
-#define	__RCSID(s)	__IDSTRING(rcsid,s)
+#define	__RCSID(s)		struct __hack
 #endif
 
 #ifndef	__RCSID_SOURCE
-#define	__RCSID_SOURCE(s) __IDSTRING(rcsid_source,s)
+#define	__RCSID_SOURCE(s)	struct __hack
+#endif
+
+#ifndef	__SCCSID
+#define	__SCCSID(s)		struct __hack
+#endif
+
+#ifndef	__FBSDID
+#define	__FBSDID(s)		struct __hack
 #endif
 
 #ifndef	__COPYRIGHT
-#define	__COPYRIGHT(s)	__IDSTRING(copyright,s)
+#define	__COPYRIGHT(s)  	struct __hack
 #endif
 
 #ifndef	__DECONST
@@ -666,28 +674,4 @@
 #define	__GLOBL1(sym)	__asm__(".globl " #sym)
 #define	__GLOBL(sym)	__GLOBL1(sym)
 
-/*
- * Ignore the rcs id of a source file.
- */
-
-#ifndef __FBSDID
-#define	__FBSDID(s)	struct __hack
-#endif
-
-#ifndef __RCSID
-#define	__RCSID(s)	struct __hack
-#endif
-
-#ifndef __RCSID_SOURCE
-#define	__RCSID_SOURCE(s)	struct __hack
-#endif
-
-#ifndef __SCCSID
-#define	__SCCSID(s)	struct __hack
-#endif
-
-#ifndef __COPYRIGHT
-#define	__COPYRIGHT(s)  struct __hack
-#endif
-
 #endif /* !_SYS_CDEFS_H_ */
-- 
2.11.4.GIT