summaryrefslogtreecommitdiff
path: root/pango/pango-utils.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2013-08-30 14:14:22 -0400
committerBehdad Esfahbod <behdad@behdad.org>2013-08-30 14:14:47 -0400
commit14b0697a59f51dd017038ca2bb79ba2c2f4034df (patch)
treef660c2380fe4e3dd9cc1b8faca426f81264c6e36 /pango/pango-utils.c
parentce791d34b18215bd89a31d9eeac9e72b2b8ceb77 (diff)
downloadpango-14b0697a59f51dd017038ca2bb79ba2c2f4034df.tar.gz
Bug 703995 - Compiler warnings about strict aliasing
Patch from Akira TAGOH.
Diffstat (limited to 'pango/pango-utils.c')
-rw-r--r--pango/pango-utils.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 18ffa263..1ca2de6f 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -616,7 +616,7 @@ read_config (void)
{
static GHashTable *config_hash = NULL;
- if (g_once_init_enter ((gsize*)&config_hash))
+ if (g_once_init_enter (&config_hash))
{
GHashTable *tmp_hash;
char *filename;
@@ -635,7 +635,7 @@ read_config (void)
if (envvar)
read_config_file (envvar, TRUE, tmp_hash);
- g_once_init_leave ((gsize*)&config_hash, (gsize)tmp_hash);
+ g_once_init_leave (&config_hash, tmp_hash);
}
return config_hash;
@@ -728,7 +728,7 @@ pango_get_sysconf_subdirectory (void)
{
static const gchar *result = NULL; /* MT-safe */
- if (g_once_init_enter ((gsize*)&result))
+ if (g_once_init_enter (&result))
{
const char *tmp_result = NULL;
#ifdef G_OS_WIN32
@@ -742,7 +742,7 @@ pango_get_sysconf_subdirectory (void)
else
tmp_result = SYSCONFDIR "/pango";
#endif
- g_once_init_leave((gsize*)&result, (gsize)tmp_result);
+ g_once_init_leave(&result, tmp_result);
}
return result;
}
@@ -763,7 +763,7 @@ pango_get_lib_subdirectory (void)
{
static const gchar *result = NULL; /* MT-safe */
- if (g_once_init_enter ((gsize*)&result))
+ if (g_once_init_enter (&result))
{
const gchar *tmp_result = NULL;
#ifdef G_OS_WIN32
@@ -783,7 +783,7 @@ pango_get_lib_subdirectory (void)
else
tmp_result = LIBDIR "/pango";
#endif
- g_once_init_leave((gsize*)&result, (gsize)tmp_result);
+ g_once_init_leave(&result, tmp_result);
}
return result;
}