Commit aed994f7 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

gtypes.h Move GLIB_VAR definition from gutils.h to gtypes.h

2001-02-10  Tor Lillqvist  <tml@iki.fi>

	* 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.
parent bf8cdc46
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
2001-02-10 Tor Lillqvist <tml@iki.fi>
* 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.
......
......@@ -613,5 +613,6 @@ EXPORTS
glib_binary_age
glib_interface_age
glib_major_version
glib_mem_profiler_table
glib_micro_version
glib_minor_version
......@@ -613,5 +613,6 @@ EXPORTS
glib_binary_age
glib_interface_age
glib_major_version
glib_mem_profiler_table
glib_micro_version
glib_minor_version
......@@ -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);
......
......@@ -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__ */
......@@ -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;
......
......@@ -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);
......
......@@ -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__ */
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment