Replace all __BEGIN_DELCS with LIBGTOP_BEGIN_DECLS and all __END_DECLS

1999-02-19  Martin Baulig  <martin@home-of-linux.org>

	* Replace all __BEGIN_DELCS with LIBGTOP_BEGIN_DECLS and all
	__END_DECLS with LIBGTOP_END_DECLS; remove all __P macros and
	use real function prototypes.
This commit is contained in:
Martin Baulig
1999-02-19 09:54:18 +00:00
committed by Martin Baulig
parent 2b96f77245
commit 1272d38f72
72 changed files with 198 additions and 186 deletions

View File

@@ -26,37 +26,22 @@
#include <config.h>
#endif
#ifdef WITHOUT_GNOME
/* __BEGIN_DECLS should be used at the beginning of your declarations,
so that C++ compilers don't mangle their names. Use __END_DECLS at
the end of C declarations. */
/*
* All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
* END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
*
*/
#undef __BEGIN_DECLS
#undef __END_DECLS
#undef BEGIN_LIBGTOP_DECLS
#undef END_LIBGTOP_DECLS
#ifdef __cplusplus
# define __BEGIN_DECLS extern "C" {
# define __END_DECLS }
# define BEGIN_LIBGTOP_DECLS extern "C" {
# define END_LIBGTOP_DECLS }
#else
# define __BEGIN_DECLS /* empty */
# define __END_DECLS /* empty */
# define BEGIN_LIBGTOP_DECLS /* empty */
# define END_LIBGTOP_DECLS /* empty */
#endif
/* __P is a macro used to wrap function prototypes, so that compilers
that don't understand ANSI C prototypes still work, and ANSI C
compilers can issue warnings about type mismatches. */
#undef __P
#if defined (__STDC__) || defined (_AIX) \
|| (defined (__mips) && defined (_SYSTYPE_SVR4)) \
|| defined(WIN32) || defined(__cplusplus)
# define __P(protos) protos
#else
# define __P(protos) ()
#endif
#endif /* WITHOUT_GNOME */
#ifdef _IN_LIBGTOP
/* Provide macros to feature the GCC function attribute.
@@ -137,7 +122,7 @@
#ifdef _IN_LIBGTOP
__BEGIN_DECLS
BEGIN_LIBGTOP_DECLS
#ifndef _
#define _(String) dgettext (PACKAGE, String)
@@ -145,10 +130,10 @@ __BEGIN_DECLS
#endif
#ifndef HAVE_STRERROR
extern char *strerror __P((int));
char *strerror (int errno);
#endif
__END_DECLS
END_LIBGTOP_DECLS
#endif /* _IN_LIBGTOP */