From 68f8a64307441bd3b3d45971ac4dc93f63dedfe8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 18 May 2001 16:04:40 +0000 Subject: [PATCH] Use ISO C99 varargs when available. Fri May 18 11:30:57 2001 Owen Taylor * pango/opentype/disasm.c: Use ISO C99 varargs when available. Thu May 17 11:16:23 2001 Owen Taylor * pango/mapping.c: Fixup docs, remove some FIXMEs that are no longer applicable. * pango/pango-layout.c: Move by graphemes, not characters. * pango/pango-layout.c (pango_layout_line_x_to_index): Position at the closest grapheme boundary, not at character boundaries. * pango/pango-layout.c (pango_layout_line_index_to_x): Return positions of grapheme boundaries, not character boundaries. --- src/Makefile.am | 2 ++ src/disasm.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 553a7757c..f42516df2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,9 @@ libpango_ot_la_SOURCES = \ pango-ot-private.h \ pango-ot-ruleset.c +if BUILD_OT_TESTS noinst_PROGRAMS = ottest +endif ottest_SOURCES = \ ottest.c \ diff --git a/src/disasm.c b/src/disasm.c index 2e064ec20..d55a3593b 100644 --- a/src/disasm.c +++ b/src/disasm.c @@ -19,11 +19,16 @@ * Boston, MA 02111-1307, USA. */ +#include /* For G_HAVE_ISO_VARARGS */ #include #include "disasm.h" +#ifdef G_HAVE_ISO_VARARGS +#define DUMP(...) dump (stream, indent, __VA_ARGS__) +#elif defined (G_HAVE_GNUC_VARARGS) #define DUMP(args...) dump (stream, indent, args) +#endif #define DUMP_FINT(strct,fld) dump (stream, indent, "<" #fld ">%d\n", (strct)->fld) #define DUMP_FUINT(strct,fld) dump (stream, indent, "<" #fld ">%u\n", (strct)->fld) #define DUMP_FGLYPH(strct,fld) dump (stream, indent, "<" #fld ">%#4x\n", (strct)->fld)