[Glibc-bsd-commits] r4024 - in trunk/freebsd-buildutils/debian: . local/include/sys

[Robert Millan]

Author: rmh
Date: 2012-01-28 21:44:00 +0000 (Sat, 28 Jan 2012)
New Revision: 4024

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h
Log:
Add a few more definitions to local sys/cdefs.h.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-01-28 21:17:33 UTC (rev 4023)
+++ trunk/freebsd-buildutils/debian/changelog	2012-01-28 21:44:00 UTC (rev 4024)
@@ -5,8 +5,9 @@
   * Add __BEGIN_DECLS / __END_DECLS in local unistd.h.
   * Fix local endian.h to use native <sys/endian.h> on GNU/kFreeBSD.
   * Add local sys/errno.h.
+  * Add a few more definitions to local sys/cdefs.h.
 
- -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 22:17:24 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 22:43:54 +0100
 
 freebsd-buildutils (9.0-2) unstable; urgency=low
 

Modified: trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h
===================================================================
--- trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h	2012-01-28 21:17:33 UTC (rev 4023)
+++ trunk/freebsd-buildutils/debian/local/include/sys/cdefs.h	2012-01-28 21:44:00 UTC (rev 4024)
@@ -1,9 +1,78 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Berkeley Software Design, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)cdefs.h     8.8 (Berkeley) 1/9/95
+ * $FreeBSD$
+ */
+
 #ifndef	_SYS_CDEFS_H_
 #define	_SYS_CDEFS_H_
+
 #include_next <sys/cdefs.h>
-#define	__FBSDID(s)
+
 #define __dead2		__attribute__((__noreturn__))
 #define __unused	__attribute__((__unused__))
 #define __printflike(fmtarg, firstvararg) \
 	__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
+
+#ifndef __FBSDID
+#if !defined(lint) && !defined(STRIP_FBSDID)
+#define __FBSDID(s)     __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
+#else
+#define __FBSDID(s)     struct __hack
 #endif
+#endif
+
+#ifndef __RCSID
+#ifndef NO__RCSID
+#define __RCSID(s)      __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
+#else
+#define __RCSID(s)      struct __hack
+#endif
+#endif
+
+#define __RCSID_SOURCE(s)	struct __hack
+#define __SCCSID(s)		struct __hack
+#define __COPYRIGHT(s)		struct __hack
+
+#ifndef __DECONST
+#define __DECONST(type, var)	((type)(__uintptr_t)(const void *)(var))
+#endif
+
+#ifndef __DEVOLATILE
+#define __DEVOLATILE(type, var)	((type)(__uintptr_t)(volatile void *)(var))
+#endif
+
+#ifndef __DEQUALIFY
+#define __DEQUALIFY(type, var)	((type)(__uintptr_t)(const volatile void *)(var))
+#endif
+
+#endif