Sat Aug 7 21:03:18 2010 UTC ()

Add __BEGIN_PUBLIC / __END_PUBLIC, __BEGIN_HIDDEN / __END_HIDDEN and
__dso_public and __dso_hidden markers. Change __BEGIN_DECLS /
__END_DECLS to include __BEGIN_PUBLIC / __END_PUBLIC.


(joerg)

diff -r1.79 -r1.80 src/sys/sys/cdefs.h

--- src/sys/sys/cdefs.h 2010/07/31 00:04:43	1.79
+++ src/sys/sys/cdefs.h 2010/08/07 21:03:18	1.80

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cdefs.h,v 1.79 2010/07/31 00:04:43 joerg Exp $	*/
+/*	$NetBSD: cdefs.h,v 1.80 2010/08/07 21:03:18 joerg Exp $	*/
 /*
  * 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.
 @@ -53,36 +53,26 @@
 	((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) ||			\
 	 (__GNUC__ > (x)))
 #else
 #define	__GNUC_PREREQ__(x, y)	0
 #endif
 #include <machine/cdefs.h>
 #ifdef __ELF__
 #include <sys/cdefs_elf.h>
 #else
 #include <sys/cdefs_aout.h>
 #endif
 #if defined(__cplusplus)
 #define	__BEGIN_DECLS		extern "C" {
 #define	__END_DECLS		}
 #define	__static_cast(x,y)	static_cast<x>(y)
 #else
 #define	__BEGIN_DECLS
 #define	__END_DECLS
 #define	__static_cast(x,y)	(x)y
 #endif
 /*
  * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
  * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
  * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
  * in between its arguments.  __CONCAT can also concatenate double-quoted
  * strings produced by the __STRING macro, but this only works with ANSI C.
  */
 #define	___STRING(x)	__STRING(x)
 #define	___CONCAT(x,y)	__CONCAT(x,y)
 #if __STDC__ || defined(__cplusplus)
 #define	__P(protos)	protos		/* full-blown ANSI C */
 @@ -218,26 +208,53 @@
 #if __GNUC_PREREQ__(2, 7)
 #define	__unused	__attribute__((__unused__))
 #else
 #define	__unused	/* delete */
 #endif
 #if __GNUC_PREREQ__(3, 1)
 #define	__used		__attribute__((__used__))
 #else
 #define	__used		__unused
 #endif
 #if __GNUC_PREREQ__(4, 0)
 #  define __dso_public	__attribute__((__visibility__("default")))
 #  define __dso_hidden	__attribute__((__visibility__("hidden")))
 #  define __BEGIN_PUBLIC	_Pragma("GCC visibility push(default)")
 #  define __END_PUBLIC		_Pragma("GCC visibility pop")
 #  define __BEGIN_HIDDEN	_Pragma("GCC visibility push(hidden)")
 #  define __END_HIDDEN		_Pragma("GCC visibility pop")
 #else
 #  define __dso_public
 #  define __dso_hidden
 #  define __BEGIN_PUBLIC
 #  define __END_PUBLIC
 #  define __BEGIN_HIDDEN
 #  define __END_HIDDEN
 #endif
 #if defined(__cplusplus)
 #define	__BEGIN_DECLS		__BEGIN_PUBLIC extern "C" {
 #define	__END_DECLS		} __END_PUBLIC
 #define	__static_cast(x,y)	static_cast<x>(y)
 #else
 #define	__BEGIN_DECLS		__BEGIN_PUBLIC
 #define	__END_DECLS		__END_PUBLIC
 #define	__static_cast(x,y)	(x)y
 #endif
 /*
  * Non-static C99 inline functions are optional bodies.  They don't
  * create global symbols if not used, but can be replaced if desirable.
  * This differs from the behavior of GCC before version 4.3.  The nearest
  * equivalent for older GCC is `extern inline'.  For newer GCC, use the
  * gnu_inline attribute additionally to get the old behavior.
+ *
  * For C99 compilers other than GCC, the C99 behavior is expected.
  */
 #if defined(__GNUC__) && defined(__GNUC_STDC_INLINE__)
 #define	__c99inline	extern __attribute__((__gnu_inline__)) __inline
 #elif defined(__GNUC__)
 #define	__c99inline	extern __inline