diff options
| author | jenglish <jenglish@flightlab.com> | 2007-05-07 19:28:22 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2007-05-07 19:28:22 (GMT) |
| commit | ff2622f3a5e6a322a42b0841a92572fa12d97864 (patch) | |
| tree | e0c510a4bde9b2b60d4f230c4390e14016ce0f03 | |
| parent | 2e593c0a4e991fbecea3a60871901357adb47fb6 (diff) | |
| download | tk-ff2622f3a5e6a322a42b0841a92572fa12d97864.zip tk-ff2622f3a5e6a322a42b0841a92572fa12d97864.tar.gz tk-ff2622f3a5e6a322a42b0841a92572fa12d97864.tar.bz2 | |
Properly cast sentinel arguments to variadic function
(fixes "warning: missing sentinel in function call", [Bug 1712001])
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | unix/tkUnixRFont.c | 7 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2007-05-07 Joe English <jenglish@users.sourceforge.net> + + * unix/tkUnixRFont.c: Properly cast sentinel arguments + to variadic function (fixes "warning: missing + sentinel in function call", [Bug 1712001]) + 2007-05-04 Pat Thoyts <patthoyts@users.sourceforge.net> * generic/tkFont.c: TIP #145 implementation - diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 04f54de..c4e6eb0 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixRFont.c,v 1.17 2007/05/03 15:21:32 dkf Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.18 2007/05/07 19:28:22 jenglish Exp $ */ #include "tkUnixInt.h" @@ -403,8 +403,9 @@ TkpGetFontFamilies( resultPtr = Tcl_NewListObj(0, NULL); - list = XftListFonts(Tk_Display(tkwin), Tk_ScreenNumber(tkwin), 0, - XFT_FAMILY, 0); + list = XftListFonts(Tk_Display(tkwin), Tk_ScreenNumber(tkwin), + (char*)0, /* pattern elements */ + XFT_FAMILY, (char*)0); /* fields */ for (i = 0; i < list->nfont; i++) { if (XftPatternGetString(list->fonts[i], XFT_FAMILY, 0, familyPtr) == XftResultMatch) { |