From fe3ada7780f0f0644f47f43bdf665311adaa00fc Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sat, 30 Sep 2006 02:23:22 +0000
Subject: [PATCH] sync with src/sys/sys/cdefs.h,v 1.11

---
 sh.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sh.h b/sh.h
index 0520500..52f49f4 100644
--- a/sh.h
+++ b/sh.h
@@ -8,29 +8,29 @@
 /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/
 /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/
 
-#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.45 2006/09/30 02:13:21 tg Exp $"
+#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.46 2006/09/30 02:23:22 tg Exp $"
 #define MKSH_VERSION "R28 2006/09/30"
 
-#include <sys/param.h>
-
+#include <sys/cdefs.h>
 #if !defined(__RCSID) || !defined(__SCCSID)
 #if !defined(__GNUC__) || defined(lint)
-#define __attribute__(x) /* deleted */
+#define __attribute__(x)		/* deleted */
 #endif
 #undef __IDSTRING
+#undef __IDSTRING_CONCAT
+#undef __IDSTRING_EXPAND
+#undef __RCSID
+#undef __SCCSID
 #define __IDSTRING_CONCAT(l,p)		__LINTED__ ## l ## _ ## p
 #define __IDSTRING_EXPAND(l,p)		__IDSTRING_CONCAT(l,p)
-#define	__IDSTRING(prefix, string)				\
+#define __IDSTRING(prefix, string)				\
 	static const char __IDSTRING_EXPAND(__LINE__,prefix) []	\
-	    __attribute__((used)) = (string)
-#ifndef __RCSID
+	    __attribute__((used)) = "@(""#)" string
 #define	__RCSID(x)	__IDSTRING(rcsid,x)
-#endif
-#ifndef __SCCSID
 #define	__SCCSID(x)	__IDSTRING(sccsid,x)
 #endif
-#endif
 
+#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>