$NetBSD: patch-at,v 1.2 2012/06/13 08:15:15 mef Exp $ Convert varargs-macros to old-style macros, to make the package compile when using gcc 2.95. --- libfstt/ttfont.cc.orig 2010-10-04 23:22:48.000000000 +0900 +++ libfstt/ttfont.cc 2011-10-17 13:02:01.000000000 +0900 @@ -35,7 +35,7 @@ ebdtTable(0), eblcTable(0), mortTable(0), vheaTable(0) { - debug("TTFont(\"%s\");\n", fileName); + debug1("TTFont(\"%s\");\n", fileName); if (openError()) return; @@ -286,7 +286,7 @@ maxWidth = headTable->xmax - headTable->xmin; maxWidth += headTable->emUnits >> 5; // +3% maxWidth = maxWidth * mppemx / headTable->emUnits; - debug("using maxWidth %d instead\n", maxWidth); + debug1("using maxWidth %d instead\n", maxWidth); } return maxWidth; @@ -307,7 +307,7 @@ // XXX: width = getMaxWidth(mppemx): width += headTable->emUnits >> 5; // +3% width = width * mppemx / headTable->emUnits; - debug("using width %d instead\n", width); + debug1("using width %d instead\n", width); } return width; @@ -343,7 +343,7 @@ uint8_t *headTable = 0; int nTables = (buf[4] << 8) + buf[5]; - debug("nTables = %d\n", nTables); + debug1("nTables = %d\n", nTables); for (int i = 0; i < nTables; ++i) { uint8_t *b = &buf[12 + i * 16]; @@ -352,24 +352,24 @@ int length = (b[12] << 24) + (b[13] << 16) + (b[14] << 8) + b[15]; int check = checksum(buf + offset, length); - debug("offset = %08X, length = %08X\n", offset, length); + debug2("offset = %08X, length = %08X\n", offset, length); b[4] = (uint8_t)(check >> 24); b[5] = (uint8_t)(check >> 16); b[6] = (uint8_t)(check >> 8); b[7] = (uint8_t)check; - debug("checksum[%d] = %08X\n", i, check); + debug2("checksum[%d] = %08X\n", i, check); if (name == 0x68656164) { headTable = buf + offset; - debug("headOffset = %08X\n", offset); + debug1("headOffset = %08X\n", offset); } } int check = checksum(buf, getLength()) - 0xB1B0AFBA; - debug("csAdjust = %08X\n", check); + debug1("csAdjust = %08X\n", check); headTable[8] = (uint8_t)(check >> 24); headTable[9] = (uint8_t)(check >> 16); @@ -437,7 +437,7 @@ std::transform(xlfd.begin(), xlfd.end(), xlfd.begin(), char_tolower); - debug("xlfd = \"%s\"\n", xlfd.c_str()); + debug1("xlfd = \"%s\"\n", xlfd.c_str()); return xlfd; }