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.

diff --git a/ChangeLog b/ChangeLog
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 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.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 035040a267fe2840ef682f09b7d8acf26515d26a..ac1d7fde16fc4f32fdce3b9abecd2e955336d9ec 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 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.
 

diff --git a/glib.def b/glib.def
index 5eaba4149e699b2d20e2d244b4727e25174604fa..a814ac9f769e202138dbc13868c8963dc9906d77 100644 (file)
--- 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 5eaba4149e699b2d20e2d244b4727e25174604fa..a814ac9f769e202138dbc13868c8963dc9906d77 100644 (file)
--- 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 2ba1344fc5360d16b70f1fb838fe45a3a1838418..a96e372e192cf09dc7b376ed2542d9a401c5e1c1 100644 (file)
--- 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 9614c73db4072e12a89e622f227e91d85b01a736..21a29e91903cf6417d7ef89f4adaf2136b3bfbea 100644 (file)
--- 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 c4dcb1b8acad6591a32c3bcb1fec368a33d85f7b..523af02c78f465ff0416ea52c6791592736dfdac 100644 (file)
--- 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 2ba1344fc5360d16b70f1fb838fe45a3a1838418..a96e372e192cf09dc7b376ed2542d9a401c5e1c1 100644 (file)
--- 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 9614c73db4072e12a89e622f227e91d85b01a736..21a29e91903cf6417d7ef89f4adaf2136b3bfbea 100644 (file)
--- 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 c4dcb1b8acad6591a32c3bcb1fec368a33d85f7b..523af02c78f465ff0416ea52c6791592736dfdac 100644 (file)
--- 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;