diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-22 22:52:08 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-22 22:52:08 +0000 |
| commit | c9f014f6478e48efd4427efa0f1d1f37a2c3563b (patch) | |
| tree | 0eb952ac056c945715ecd08e446db3db566cb510 /pango/pangox-fontmap.c | |
| parent | b9b68dba2e563f320b7c4b3ea73c68bfa1d9a804 (diff) | |
| download | pango-c9f014f6478e48efd4427efa0f1d1f37a2c3563b.tar.gz | |
Add some macro definitions for gcc-3.3 that suppress the bogus
Fri Aug 22 18:09:52 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/fterrcompat.h: Add some macro definitions
for gcc-3.3 that suppress the bogus strict-aliasing
warnings.
* pango/pango-utils.c (read_config_file): Use
g_hash_table_new_full() to simplify code and fix
gcc-3.3 warnings.
* pango/pangox-fontmap.c (pango_x_real_get_coverage_win)
* pango/querymodules.c (query_module): Suppress gcc-3.3
warnings.
* pango/modules.c (pango_find_map): Fix warning from
missing declaration of pango_module_get_type().
* pango/pango-context.c/pango-engine.c: Fix name confusion
for pango_get_fallback_shaper().
Diffstat (limited to 'pango/pangox-fontmap.c')
| -rw-r--r-- | pango/pangox-fontmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index af669c67..ca6615ec 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -545,7 +545,7 @@ pango_x_real_get_coverage_win (Display *display) int format; gulong n_items; gulong bytes_after; - Atom *data; + guchar *data; Window retval = None; int (*old_handler) (Display *, XErrorEvent *); @@ -559,12 +559,12 @@ pango_x_real_get_coverage_win (Display *display) 0, 4, False, XA_WINDOW, &type, &format, &n_items, &bytes_after, - (guchar **)&data); + &data); if (type == XA_WINDOW) { if (format == 32 && n_items == 1 && bytes_after == 0) - retval = *data; + retval = *(Atom *)data; XFree (data); } @@ -577,11 +577,11 @@ pango_x_real_get_coverage_win (Display *display) 0, 4, False, XA_WINDOW, &type, &format, &n_items, &bytes_after, - (guchar **)&data) == Success && + &data) == Success && type == XA_WINDOW) { if (format != 32 || n_items != 1 || bytes_after != 0 || - *data != retval) + *(Atom *)data != retval) retval = None; XFree (data); |