From: Tor Lillqvist Date: Sat, 10 Feb 2001 01:43:25 +0000 (+0000) Subject: gtypes.h Move GLIB_VAR definition from gutils.h to gtypes.h X-Git-Tag: GLIB_1_2_9PRE1~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aed994f71413ed23f2c553e0723d2358c05ffef5;p=platform%2Fupstream%2Fglib.git gtypes.h Move GLIB_VAR definition from gutils.h to gtypes.h 2001-02-10 Tor Lillqvist * gtypes.h * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h * glib.def * gmem.h: Mark glib_mem_profiler_table for export. --- diff --git a/ChangeLog b/ChangeLog index 035040a..ac1d7fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 035040a..ac1d7fd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2001-02-10 Tor Lillqvist + * gtypes.h + * gutils.h: Move GLIB_VAR definition from gutils.h to gtypes.h + + * glib.def + * gmem.h: Mark glib_mem_profiler_table for export. + * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable. diff --git a/glib.def b/glib.def index 5eaba41..a814ac9 100644 --- a/glib.def +++ b/glib.def @@ -613,5 +613,6 @@ EXPORTS glib_binary_age glib_interface_age glib_major_version + glib_mem_profiler_table glib_micro_version glib_minor_version diff --git a/glib/glib.def b/glib/glib.def index 5eaba41..a814ac9 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -613,5 +613,6 @@ EXPORTS glib_binary_age glib_interface_age glib_major_version + glib_mem_profiler_table glib_micro_version glib_minor_version diff --git a/glib/gmem.h b/glib/gmem.h index 2ba1344..a96e372 100644 --- a/glib/gmem.h +++ b/glib/gmem.h @@ -87,7 +87,7 @@ void g_mem_set_vtable (GMemVTable *vtable); /* Memory profiler and checker, has to be enabled via g_mem_set_vtable() */ -extern GMemVTable *glib_mem_profiler_table; +GLIB_VAR GMemVTable *glib_mem_profiler_table; void g_mem_profile (void); diff --git a/glib/gtypes.h b/glib/gtypes.h index 9614c73..21a29e9 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -324,5 +324,18 @@ struct _GTimeVal G_END_DECLS +/* We prefix variable declarations so they can + * properly get exported in windows dlls. + */ +#ifdef G_OS_WIN32 +# ifdef GLIB_COMPILATION +# define GLIB_VAR __declspec(dllexport) +# else /* !GLIB_COMPILATION */ +# define GLIB_VAR extern __declspec(dllimport) +# endif /* !GLIB_COMPILATION */ +#else /* !G_OS_WIN32 */ +# define GLIB_VAR extern +#endif /* !G_OS_WIN32 */ + #endif /* __G_TYPES_H__ */ diff --git a/glib/gutils.h b/glib/gutils.h index c4dcb1b..523af02 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -305,16 +305,6 @@ g_trash_stack_height (GTrashStack **stack_p) * we prefix variable declarations so they can * properly get exported in windows dlls. */ -#ifdef G_OS_WIN32 -# ifdef GLIB_COMPILATION -# define GLIB_VAR __declspec(dllexport) -# else /* !GLIB_COMPILATION */ -# define GLIB_VAR extern __declspec(dllimport) -# endif /* !GLIB_COMPILATION */ -#else /* !G_OS_WIN32 */ -# define GLIB_VAR extern -#endif /* !G_OS_WIN32 */ - GLIB_VAR const guint glib_major_version; GLIB_VAR const guint glib_minor_version; GLIB_VAR const guint glib_micro_version; diff --git a/gmem.h b/gmem.h index 2ba1344..a96e372 100644 --- a/gmem.h +++ b/gmem.h @@ -87,7 +87,7 @@ void g_mem_set_vtable (GMemVTable *vtable); /* Memory profiler and checker, has to be enabled via g_mem_set_vtable() */ -extern GMemVTable *glib_mem_profiler_table; +GLIB_VAR GMemVTable *glib_mem_profiler_table; void g_mem_profile (void); diff --git a/gtypes.h b/gtypes.h index 9614c73..21a29e9 100644 --- a/gtypes.h +++ b/gtypes.h @@ -324,5 +324,18 @@ struct _GTimeVal G_END_DECLS +/* We prefix variable declarations so they can + * properly get exported in windows dlls. + */ +#ifdef G_OS_WIN32 +# ifdef GLIB_COMPILATION +# define GLIB_VAR __declspec(dllexport) +# else /* !GLIB_COMPILATION */ +# define GLIB_VAR extern __declspec(dllimport) +# endif /* !GLIB_COMPILATION */ +#else /* !G_OS_WIN32 */ +# define GLIB_VAR extern +#endif /* !G_OS_WIN32 */ + #endif /* __G_TYPES_H__ */ diff --git a/gutils.h b/gutils.h index c4dcb1b..523af02 100644 --- a/gutils.h +++ b/gutils.h @@ -305,16 +305,6 @@ g_trash_stack_height (GTrashStack **stack_p) * we prefix variable declarations so they can * properly get exported in windows dlls. */ -#ifdef G_OS_WIN32 -# ifdef GLIB_COMPILATION -# define GLIB_VAR __declspec(dllexport) -# else /* !GLIB_COMPILATION */ -# define GLIB_VAR extern __declspec(dllimport) -# endif /* !GLIB_COMPILATION */ -#else /* !G_OS_WIN32 */ -# define GLIB_VAR extern -#endif /* !G_OS_WIN32 */ - GLIB_VAR const guint glib_major_version; GLIB_VAR const guint glib_minor_version; GLIB_VAR const guint glib_micro_version;