diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | generic/tkEvent.c | 8 | ||||
| -rw-r--r-- | unix/tkUnixEvent.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixKey.c | 6 | ||||
| -rw-r--r-- | unix/tkUnixRFont.c | 4 |
5 files changed, 18 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2011-01-06 Stuart Cassoff <stwo@users.sourceforge.net> + + * generic/tkEvent.c: Cast some NULLs to (void *) in order to quash + * unix/tkUnixEvent.c: "missing sentinel in function call" + * unix/tkUnixKey.c: compiler warnings. + * unix/tkUnixRFont.c: + 2010-12-17 Stuart Cassoff <stwo@users.sourceforge.net> * unix/Makefile.in: [Bug 2446711]: Remove 'allpatch' target. diff --git a/generic/tkEvent.c b/generic/tkEvent.c index cd129a0..3fae141 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkEvent.c,v 1.35.2.4 2010/01/02 10:43:26 dkf Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.35.2.5 2011/01/06 06:00:12 stwo Exp $ */ #include "tkInt.h" @@ -345,7 +345,7 @@ CreateXIC( preedit_attlist = XVaCreateNestedList(0, XNSpotLocation, &spot, XNFontSet, dispPtr->inputXfs, - NULL); + (void *) NULL); } winPtr->inputContext = XCreateIC(dispPtr->inputMethod, @@ -353,7 +353,7 @@ CreateXIC( XNClientWindow, winPtr->window, XNFocusWindow, winPtr->window, preedit_attname, preedit_attlist, - NULL); + (void *) NULL); if (preedit_attlist) { XFree(preedit_attlist); @@ -368,7 +368,7 @@ CreateXIC( /* * Adjust the window's event mask if the IM requires it. */ - XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL); + XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, (void *) NULL); if ((winPtr->atts.event_mask & im_event_mask) != im_event_mask) { winPtr->atts.event_mask |= im_event_mask; XSelectInput(winPtr->display, winPtr->window, winPtr->atts.event_mask); diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 16ab4f7..63e628a 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixEvent.c,v 1.27.2.3 2010/01/02 10:43:26 dkf Exp $ + * RCS: @(#) $Id: tkUnixEvent.c,v 1.27.2.4 2011/01/06 06:00:12 stwo Exp $ */ #include "tkUnixInt.h" @@ -640,7 +640,7 @@ OpenIM( } if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr, - NULL) != NULL) || (stylePtr == NULL)) { + (void *) NULL) != NULL) || (stylePtr == NULL)) { goto error; } diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index d482b16..6c9f467 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixKey.c,v 1.13.2.2 2010/01/02 10:43:26 dkf Exp $ + * RCS: @(#) $Id: tkUnixKey.c,v 1.13.2.3 2011/01/06 06:00:12 stwo Exp $ */ #include "tkInt.h" @@ -66,10 +66,10 @@ Tk_SetCaretPos( spot.x = dispPtr->caret.x; spot.y = dispPtr->caret.y + dispPtr->caret.height; - preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); + preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL); XSetICValues(winPtr->inputContext, XNPreeditAttributes, preedit_attr, - NULL); + (void *) NULL); XFree(preedit_attr); } #endif diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 29ef7fb..8a9133d 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.24.2.4 2010/01/02 18:41:14 dkf Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.24.2.5 2011/01/06 06:00:12 stwo Exp $ */ #include "tkUnixInt.h" @@ -93,7 +93,7 @@ GetFont( ftFont = XftFontOpen(fontPtr->display, fontPtr->screen, FC_FAMILY, FcTypeString, "sans", FC_SIZE, FcTypeDouble, 12.0, - NULL); + (void *) NULL); } if (!ftFont) { /* |