Rename the GUTILS_C_VAR macro to GLIB_VAR.

2000-07-08  Tor Lillqvist  <tml@iki.fi>

* glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.

* gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.

* glib.def: Add two missing entry points.

diff --git a/ChangeLog b/ChangeLog
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dc41e2dc021deb57c29ec4f19cece2ac20edb2b0..5b506bed25a7275d0ec071657ceb7b9e1ed9b062 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-07-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (GLIB_VAR): Rename the GUTILS_C_VAR macro to GLIB_VAR.
+
+       * gunicode.h: Mark the g_utf8_skip array with GLIB_VAR.
+
+       * glib.def: Add two missing entry points.
+
 Thu Jul  6 15:35:28 2000  Owen Taylor  <otaylor@redhat.com>
 
        * Release 1.3.1

diff --git a/glib.def b/glib.def
index 239a96d35542099e02615424f8934f3f30d73b85..ab7e45a056a9adbb2fbd77223a27d1f310d6abe8 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -164,6 +164,7 @@ EXPORTS
        g_list_append
        g_list_concat
        g_list_copy
+       g_list_delete_link
        g_list_find
        g_list_find_custom
        g_list_first
@@ -480,6 +481,7 @@ EXPORTS
        g_utf8_offset_to_pointer
        g_utf8_pointer_to_offset
        g_utf8_prev_char
+       g_utf8_skip
        g_utf8_strchr
        g_utf8_strlen
        g_utf8_strncpy

diff --git a/glib.h b/glib.h
index dd9fa5a69599da681d26febad064a36557e6d8df..d7ac6d503f78e2dafd274e1d9df2f6ac664c4249 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -698,19 +698,19 @@ typedef gint32    GTime;
  */
 #ifdef G_OS_WIN32
 #  ifdef GLIB_COMPILATION
-#    define GUTILS_C_VAR __declspec(dllexport)
+#    define GLIB_VAR __declspec(dllexport)
 #  else /* !GLIB_COMPILATION */
-#    define GUTILS_C_VAR extern __declspec(dllimport)
+#    define GLIB_VAR extern __declspec(dllimport)
 #  endif /* !GLIB_COMPILATION */
 #else /* !G_OS_WIN32 */
-#  define GUTILS_C_VAR extern
+#  define GLIB_VAR extern
 #endif /* !G_OS_WIN32 */
 
-GUTILS_C_VAR const guint glib_major_version;
-GUTILS_C_VAR const guint glib_minor_version;
-GUTILS_C_VAR const guint glib_micro_version;
-GUTILS_C_VAR const guint glib_interface_age;
-GUTILS_C_VAR const guint glib_binary_age;
+GLIB_VAR const guint glib_major_version;
+GLIB_VAR const guint glib_minor_version;
+GLIB_VAR const guint glib_micro_version;
+GLIB_VAR const guint glib_interface_age;
+GLIB_VAR const guint glib_binary_age;
 
 #define GLIB_CHECK_VERSION(major,minor,micro)    \
     (GLIB_MAJOR_VERSION > (major) || \
@@ -2833,7 +2833,7 @@ gint        g_io_channel_unix_get_fd (GIOChannel *channel);
 
 #ifdef G_OS_WIN32
 
-GUTILS_C_VAR guint g_pipe_readable_msg;
+GLIB_VAR guint g_pipe_readable_msg;
 
 #define G_WIN32_MSG_HANDLE 19981206
 
@@ -3028,9 +3028,9 @@ struct _GThreadFunctions
   void      (*thread_self)        (gpointer              thread);
 };
 
-GUTILS_C_VAR GThreadFunctions  g_thread_functions_for_glib_use;
-GUTILS_C_VAR gboolean          g_thread_use_default_impl;
-GUTILS_C_VAR gboolean          g_threads_got_initialized;
+GLIB_VAR GThreadFunctions      g_thread_functions_for_glib_use;
+GLIB_VAR gboolean              g_thread_use_default_impl;
+GLIB_VAR gboolean              g_threads_got_initialized;
 
 /* initializes the mutex/cond/private implementation for glib, might
  * only be called once, and must not be called directly or indirectly

diff --git a/glib/glib.def b/glib/glib.def
index 239a96d35542099e02615424f8934f3f30d73b85..ab7e45a056a9adbb2fbd77223a27d1f310d6abe8 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -164,6 +164,7 @@ EXPORTS
        g_list_append
        g_list_concat
        g_list_copy
+       g_list_delete_link
        g_list_find
        g_list_find_custom
        g_list_first
@@ -480,6 +481,7 @@ EXPORTS
        g_utf8_offset_to_pointer
        g_utf8_pointer_to_offset
        g_utf8_prev_char
+       g_utf8_skip
        g_utf8_strchr
        g_utf8_strlen
        g_utf8_strncpy

diff --git a/glib/glib.h b/glib/glib.h
index dd9fa5a69599da681d26febad064a36557e6d8df..d7ac6d503f78e2dafd274e1d9df2f6ac664c4249 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -698,19 +698,19 @@ typedef gint32    GTime;
  */
 #ifdef G_OS_WIN32
 #  ifdef GLIB_COMPILATION
-#    define GUTILS_C_VAR __declspec(dllexport)
+#    define GLIB_VAR __declspec(dllexport)
 #  else /* !GLIB_COMPILATION */
-#    define GUTILS_C_VAR extern __declspec(dllimport)
+#    define GLIB_VAR extern __declspec(dllimport)
 #  endif /* !GLIB_COMPILATION */
 #else /* !G_OS_WIN32 */
-#  define GUTILS_C_VAR extern
+#  define GLIB_VAR extern
 #endif /* !G_OS_WIN32 */
 
-GUTILS_C_VAR const guint glib_major_version;
-GUTILS_C_VAR const guint glib_minor_version;
-GUTILS_C_VAR const guint glib_micro_version;
-GUTILS_C_VAR const guint glib_interface_age;
-GUTILS_C_VAR const guint glib_binary_age;
+GLIB_VAR const guint glib_major_version;
+GLIB_VAR const guint glib_minor_version;
+GLIB_VAR const guint glib_micro_version;
+GLIB_VAR const guint glib_interface_age;
+GLIB_VAR const guint glib_binary_age;
 
 #define GLIB_CHECK_VERSION(major,minor,micro)    \
     (GLIB_MAJOR_VERSION > (major) || \
@@ -2833,7 +2833,7 @@ gint        g_io_channel_unix_get_fd (GIOChannel *channel);
 
 #ifdef G_OS_WIN32
 
-GUTILS_C_VAR guint g_pipe_readable_msg;
+GLIB_VAR guint g_pipe_readable_msg;
 
 #define G_WIN32_MSG_HANDLE 19981206
 
@@ -3028,9 +3028,9 @@ struct _GThreadFunctions
   void      (*thread_self)        (gpointer              thread);
 };
 
-GUTILS_C_VAR GThreadFunctions  g_thread_functions_for_glib_use;
-GUTILS_C_VAR gboolean          g_thread_use_default_impl;
-GUTILS_C_VAR gboolean          g_threads_got_initialized;
+GLIB_VAR GThreadFunctions      g_thread_functions_for_glib_use;
+GLIB_VAR gboolean              g_thread_use_default_impl;
+GLIB_VAR gboolean              g_threads_got_initialized;
 
 /* initializes the mutex/cond/private implementation for glib, might
  * only be called once, and must not be called directly or indirectly

diff --git a/glib/gunicode.h b/glib/gunicode.h
index 2adad1187f907c6025814f2d1918c22bb5babd17..f40078d7fc838e7f4e1e2c5ae4fe4e56be8e1d94 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -118,9 +118,23 @@ void g_unicode_canonical_ordering (gunichar *string,
 gunichar *g_unicode_canonical_decomposition (gunichar  ch,
                                             size_t   *result_len);
 
-/* Array of skip-bytes-per-initial character
+/* Array of skip-bytes-per-initial character.
+ * We prefix variable declarations so they can
+ * properly get exported in windows dlls.
  */
-extern char g_utf8_skip[256];
+#ifndef GLIB_VAR
+#  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 /* !GLIB_VAR */
+
+GLIB_VAR char g_utf8_skip[256];
 
 #define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(guchar *)(p)])
 

diff --git a/gunicode.h b/gunicode.h
index 2adad1187f907c6025814f2d1918c22bb5babd17..f40078d7fc838e7f4e1e2c5ae4fe4e56be8e1d94 100644 (file)
--- a/gunicode.h
+++ b/gunicode.h
@@ -118,9 +118,23 @@ void g_unicode_canonical_ordering (gunichar *string,
 gunichar *g_unicode_canonical_decomposition (gunichar  ch,
                                             size_t   *result_len);
 
-/* Array of skip-bytes-per-initial character
+/* Array of skip-bytes-per-initial character.
+ * We prefix variable declarations so they can
+ * properly get exported in windows dlls.
  */
-extern char g_utf8_skip[256];
+#ifndef GLIB_VAR
+#  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 /* !GLIB_VAR */
+
+GLIB_VAR char g_utf8_skip[256];
 
 #define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(guchar *)(p)])