summaryrefslogtreecommitdiff
path: root/glib.h
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2000-07-08 12:40:09 +0000
committerTor Lillqvist <tml@src.gnome.org>2000-07-08 12:40:09 +0000
commit39732afc59b5e3db38467b047090b0d72040255f (patch)
tree5bf18e52ae17c0acce118cb23530e8fc36fec5d4 /glib.h
parentcf2f511198660a3c9c4e1ba95a0a49c8a010e2dd (diff)
downloadglib-39732afc59b5e3db38467b047090b0d72040255f.tar.gz
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.
Diffstat (limited to 'glib.h')
-rw-r--r--glib.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/glib.h b/glib.h
index dd9fa5a69..d7ac6d503 100644
--- 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