luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use G_BEGIN_DECLS and G_END_DECLS.

Browse Source 
2001-02-21  Tor Lillqvist  <tml@iki.fi>

	* *.h: Use G_BEGIN_DECLS and G_END_DECLS.

	* Makefile.am: Use libglib-1.3.la from top_builddir. Invoke
	libtool with -no-undefined for Win32 and Cygwin.
This commit is contained in:
Tor Lillqvist 2001-03-09 21:39:51 +00:00 committed by Tor Lillqvist
parent 8dd8609870
commit 137d3248c7
16 changed files with 49 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gbsearcharray.h
View File

@ -23,11 +23,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* helper macro to avoid signed overflow for value comparisions */ /* helper macro to avoid signed overflow for value comparisions */
#define G_BSEARCH_ARRAY_CMP(v1,v2) ((v1) < (v2) ? -1 : (v1) > (v2) ? 1 : 0) #define G_BSEARCH_ARRAY_CMP(v1,v2) ((v1) < (v2) ? -1 : (v1) > (v2) ? 1 : 0)
@ -138,11 +134,6 @@ g_bsearch_array_get_index (GBSearchArray *barray,
} }
#endif /* G_CAN_INLINE || __G_BSEARCHARRAY_C__ */ #endif /* G_CAN_INLINE || __G_BSEARCHARRAY_C__ */
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_BSEARCH_ARRAY_H__ */ #endif /* __G_BSEARCH_ARRAY_H__ */

7
gobject/ChangeLog
View File

@ -156,6 +156,13 @@ Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org>
* gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer() * gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer()
as private (the latter got renamed from g_value_get_as_pointer()). as private (the latter got renamed from g_value_get_as_pointer()).
2001-02-21 Tor Lillqvist <tml@iki.fi>
* *.h: Use G_BEGIN_DECLS and G_END_DECLS.
* Makefile.am: Use libglib-1.3.la from top_builddir. Invoke
libtool with -no-undefined for Win32 and Cygwin.
Wed Feb 21 18:31:46 2001 Jonathan Blandford <jrb@redhat.com> Wed Feb 21 18:31:46 2001 Jonathan Blandford <jrb@redhat.com>
* gsignal.h (g_signal_connect): Add g_signal_connect define to * gsignal.h (g_signal_connect): Add g_signal_connect define to

19
gobject/Makefile.am
View File

@ -11,16 +11,25 @@ INCLUDES = @STRIP_BEGIN@ \
-DG_DISABLE_CONST_RETURNS \ -DG_DISABLE_CONST_RETURNS \
@STRIP_END@ @STRIP_END@
libglib = $(top_builddir)/libglib-1.3.la
# libraries to compile and install # libraries to compile and install
lib_LTLIBRARIES = libgobject-1.3.la lib_LTLIBRARIES = libgobject-1.3.la
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
if OS_WIN32
export_symbols = -export-symbols gobject.def
endif
# libtool stuff: set version and export symbols for resolving # libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/glib-2.0/gobject libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \ -export-dynamic $(no_undefined) $(export_symbols) \
@STRIP_END@ @STRIP_END@
libgobject_1_3_la_LIBADD = # $(libglib) libgobject_1_3_la_LIBADD = $(libglib)
# #
# setup source file variables # setup source file variables
@ -116,7 +125,7 @@ gmarshal.h: # never add deps here
# versions in the build dir. thus a development setup requires # versions in the build dir. thus a development setup requires
# srcdir to be writable, passing --disable-rebuilds to # srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules. # ../configure will supress all autogeneration rules.
$(srcdir)/stamp-gmarshal.h: @REBUILD@ gmarshal.list gmarshal.h glib-genmarshal $(srcdir)/stamp-gmarshal.h: @REBUILD@ gmarshal.list gmarshal.h glib-genmarshal$(EXEEXT)
echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \ echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \
&& echo "#define __G_MARSHAL_H__" >> xgen-gmh \ && echo "#define __G_MARSHAL_H__" >> xgen-gmh \
&& ./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \ && ./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \
@ -149,8 +158,8 @@ gobject_query_SOURCES = gobject-query.c
glib_genmarshal_SOURCES = glib-genmarshal.c glib_genmarshal_SOURCES = glib-genmarshal.c
testgruntime_SOURCES = testgruntime.c testgruntime_SOURCES = testgruntime.c
# link programs against libgobject # link programs against libgobject
progs_LDADD = libgobject-1.3.la ../libglib-1.3.la progs_LDADD = libgobject-1.3.la $(libglib)
glib_genmarshal_LDADD = ../libglib-1.3.la # can't have libgobject here glib_genmarshal_LDADD = $(libglib)
gobject_query_LDADD = $(progs_LDADD) gobject_query_LDADD = $(progs_LDADD)
testgruntime_LDADD = $(progs_LDADD) testgruntime_LDADD = $(progs_LDADD)

10
gobject/gboxed.h
View File

@ -21,11 +21,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_IS_BOXED(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED) #define G_TYPE_IS_BOXED(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_BOXED)
@ -66,8 +62,6 @@ void g_value_set_boxed_take_ownership (GValue *value,
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __G_BOXED_H__ */ #endif /* __G_BOXED_H__ */

13
gobject/gbsearcharray.h
View File

@ -23,11 +23,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* helper macro to avoid signed overflow for value comparisions */ /* helper macro to avoid signed overflow for value comparisions */
#define G_BSEARCH_ARRAY_CMP(v1,v2) ((v1) < (v2) ? -1 : (v1) > (v2) ? 1 : 0) #define G_BSEARCH_ARRAY_CMP(v1,v2) ((v1) < (v2) ? -1 : (v1) > (v2) ? 1 : 0)
@ -138,11 +134,6 @@ g_bsearch_array_get_index (GBSearchArray *barray,
} }
#endif /* G_CAN_INLINE || __G_BSEARCHARRAY_C__ */ #endif /* G_CAN_INLINE || __G_BSEARCHARRAY_C__ */
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_BSEARCH_ARRAY_H__ */ #endif /* __G_BSEARCH_ARRAY_H__ */

12
gobject/gclosure.h
View File

@ -22,12 +22,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- defines --- */ /* --- defines --- */
#define G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL) #define G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
@ -158,9 +153,6 @@ void g_closure_invoke (GClosure *closure,
- provide marshaller collection, virtually covering anything out there - provide marshaller collection, virtually covering anything out there
*/ */
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_CLOSURE_H__ */ #endif /* __G_CLOSURE_H__ */

12
gobject/genums.h
View File

@ -21,11 +21,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_IS_ENUM(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM) #define G_TYPE_IS_ENUM(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_ENUM)
@ -118,10 +114,6 @@ void g_flags_complete_type_info (GType g_flags_type,
GTypeInfo *info, GTypeInfo *info,
const GFlagsValue *const_values); const GFlagsValue *const_values);
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_ENUMS_H__ */ #endif /* __G_ENUMS_H__ */

12
gobject/gobject.h
View File

@ -24,11 +24,7 @@
#include <gobject/gparam.h> #include <gobject/gparam.h>
#include <gobject/gclosure.h> #include <gobject/gclosure.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_IS_OBJECT(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT) #define G_TYPE_IS_OBJECT(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_OBJECT)
@ -206,10 +202,6 @@ G_STMT_START { \
G_OBJECT_TYPE_NAME (_object)); \ G_OBJECT_TYPE_NAME (_object)); \
} G_STMT_END } G_STMT_END
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_OBJECT_H__ */ #endif /* __G_OBJECT_H__ */

10
gobject/gparam.h
View File

@ -24,11 +24,7 @@
#include <gobject/gvalue.h> #include <gobject/gvalue.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_IS_PARAM(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM) #define G_TYPE_IS_PARAM(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
@ -187,8 +183,6 @@ GParamSpec* g_param_spec_pool_lookup (GParamSpecPool *pool,
* >0 if value1 > value2, and 0 otherwise (they are equal) * >0 if value1 > value2, and 0 otherwise (they are equal)
*/ */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __G_PARAM_H__ */ #endif /* __G_PARAM_H__ */

10
gobject/gparamspecs.h
View File

@ -27,11 +27,7 @@
#include <gobject/gboxed.h> #include <gobject/gboxed.h>
#include <gobject/gobject.h> #include <gobject/gobject.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_IS_PARAM_SPEC_CHAR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR)) #define G_IS_PARAM_SPEC_CHAR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_CHAR))
@ -330,8 +326,6 @@ GParamSpec* g_param_spec_object (const gchar *name,
GParamFlags flags); GParamFlags flags);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __G_PARAMSPECS_H__ */ #endif /* __G_PARAMSPECS_H__ */

11
gobject/gsignal.h
View File

@ -25,11 +25,7 @@
#include <gobject/gparam.h> #include <gobject/gparam.h>
#include <gobject/gmarshal.h> #include <gobject/gmarshal.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- typedefs --- */ /* --- typedefs --- */
typedef struct _GSignalQuery GSignalQuery; typedef struct _GSignalQuery GSignalQuery;
@ -227,9 +223,6 @@ guint g_signal_handlers_disconnect_matched (gpointer instance,
void g_signal_handlers_destroy (gpointer instance); void g_signal_handlers_destroy (gpointer instance);
void _g_signals_destroy (GType itype); void _g_signals_destroy (GType itype);
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_SIGNAL_H__ */ #endif /* __G_SIGNAL_H__ */

11
gobject/gtype.h
View File

@ -22,11 +22,7 @@
extern const char *g_log_domain_gruntime; extern const char *g_log_domain_gruntime;
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* Basic Type Macros /* Basic Type Macros
*/ */
@ -361,9 +357,6 @@ GTypeValueTable* g_type_value_table_peek (GType type);
#define G_TYPE_FLAG_RESERVED_ID_BIT (1 << 30) #define G_TYPE_FLAG_RESERVED_ID_BIT (1 << 30)
extern GTypeDebugFlags _g_type_debug_flags; extern GTypeDebugFlags _g_type_debug_flags;
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_TYPE_H__ */ #endif /* __G_TYPE_H__ */

15
gobject/gtypeplugin.h
View File

@ -22,12 +22,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_TYPE_PLUGIN (g_type_plugin_get_type ()) #define G_TYPE_TYPE_PLUGIN (g_type_plugin_get_type ())
@ -74,12 +69,6 @@ void g_type_plugin_complete_interface_info (GTypePlugin *plugin,
GType instance_type, GType instance_type,
GInterfaceInfo *info); GInterfaceInfo *info);
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_TYPE_PLUGIN_H__ */ #endif /* __G_TYPE_PLUGIN_H__ */

9
gobject/gvalue.h
View File

@ -24,10 +24,7 @@
#include <gobject/gtype.h> #include <gobject/gtype.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_IS_VALUE(type) (g_type_value_table_peek (type) != NULL) #define G_TYPE_IS_VALUE(type) (g_type_value_table_peek (type) != NULL)
@ -89,8 +86,6 @@ void g_value_register_transform_func (GType src_type,
#define G_VALUE_NOCOPY_CONTENTS (1 << 27) #define G_VALUE_NOCOPY_CONTENTS (1 << 27)
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __G_VALUE_H__ */ #endif /* __G_VALUE_H__ */

12
gobject/gvaluecollector.h
View File

@ -21,11 +21,7 @@
#ifndef __G_VALUE_COLLECTOR_H__ #ifndef __G_VALUE_COLLECTOR_H__
#define __G_VALUE_COLLECTOR_H__ #define __G_VALUE_COLLECTOR_H__
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* we may want to add aggregate types here some day, if requested /* we may want to add aggregate types here some day, if requested
* by users. the basic C types are covered already, everything * by users. the basic C types are covered already, everything
@ -149,10 +145,6 @@ G_STMT_START { \
#define G_VALUE_COLLECT_FORMAT_MAX_LENGTH (8) #define G_VALUE_COLLECT_FORMAT_MAX_LENGTH (8)
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __G_VALUE_COLLECTOR_H__ */ #endif /* __G_VALUE_COLLECTOR_H__ */

10
gobject/gvaluetypes.h
View File

@ -24,11 +24,7 @@
#include <gobject/gvalue.h> #include <gobject/gvalue.h>
G_BEGIN_DECLS
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* --- type macros --- */ /* --- type macros --- */
#define G_VALUE_HOLDS_CHAR(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR)) #define G_VALUE_HOLDS_CHAR(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_CHAR))
@ -89,8 +85,6 @@ void g_value_set_string_take_ownership (GValue *value,
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __G_VALUETYPES_H__ */ #endif /* __G_VALUETYPES_H__ */