summaryrefslogtreecommitdiff
path: root/pango/pangox.h
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2002-11-08 19:00:52 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2002-11-08 19:00:52 +0000
commit23c23546a22a785be7eca60f4bc59f7723456ffe (patch)
tree17eb05c1468d6ade4fc77feb36547d026a6de5af /pango/pangox.h
parent1b16a7e3e014d4b4f4e6f30521a572689fa75df5 (diff)
downloadpango-23c23546a22a785be7eca60f4bc59f7723456ffe.tar.gz
Trivial s/foo/foo_/ fixes to make pango.h includable with -Wshadow
Fri Nov 8 20:02:09 2002 Soeren Sandmann <sandmann@daimi.au.dk> * docs/tmpl/coverage-maps.sgml: * docs/tmpl/glyphs.sgml: * docs/tmpl/layout.sgml: * docs/tmpl/x-fonts.sgml: * pango/mapping.c: * pango/pango-coverage.c: * pango/pango-coverage.h: * pango/pango-glyph.h: * pango/pango-layout.c: * pango/pango-layout.h: * pango/pangox.h: Trivial s/foo/foo_/ fixes to make pango.h includable with -Wshadow (#91680).
Diffstat (limited to 'pango/pangox.h')
-rw-r--r--pango/pangox.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/pangox.h b/pango/pangox.h
index 20759d80..9f2a6833 100644
--- a/pango/pangox.h
+++ b/pango/pangox.h
@@ -68,7 +68,7 @@ void pango_x_render_layout (Display *display,
*/
typedef guint16 PangoXSubfont;
-#define PANGO_X_MAKE_GLYPH(subfont,index) ((subfont)<<16 | (index))
+#define PANGO_X_MAKE_GLYPH(subfont,index_) ((subfont)<<16 | (index_))
#define PANGO_X_GLYPH_SUBFONT(glyph) ((glyph)>>16)
#define PANGO_X_GLYPH_INDEX(glyph) ((glyph) & 0xffff)