summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstwo <stwo>2012-08-09 16:40:41 (GMT)
committerstwo <stwo>2012-08-09 16:40:41 (GMT)
commit60370012590a96ccb9b812f8688a0f8822c9883b (patch)
tree5347ed6db43d87e11078a4b2a93649e2a15fa016
parent6a53e1bcab0c83c50e6a686c0ac485687ff29b8f (diff)
downloadtk-60370012590a96ccb9b812f8688a0f8822c9883b.zip
tk-60370012590a96ccb9b812f8688a0f8822c9883b.tar.gz
tk-60370012590a96ccb9b812f8688a0f8822c9883b.tar.bz2
Remove useless (void *) casts introduced in checkin [b7a58eae61]. The warnings were false flags from a faulty OpenBSD C compiler.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tkEvent.c6
-rw-r--r--unix/tkUnixEvent.c2
-rw-r--r--unix/tkUnixKey.c4
-rw-r--r--unix/tkUnixRFont.c2
5 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d356eee..54e9c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-09 Stuart Cassoff <stwo@users.sourceforge.net>
+
+ * generic/tkEvent.c: Remove useless (void *) casts
+ * unix/tkUnixEvent.c: introduced in checkin [b7a58eae61].
+ * unix/tkUnixKey.c: The warnings were false flags from a
+ * unix/tkUnixRFont.c: faulty OpenBSD C compiler.
+
2012-08-03 Francois Vogel <fvogelnew1@free.fr>
* tests/bind.test: [Bug 3554081]: Test bind-22.10 failed
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 7c41c22..03e7283 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -343,7 +343,7 @@ CreateXIC(
preedit_attlist = XVaCreateNestedList(0,
XNSpotLocation, &spot,
XNFontSet, dispPtr->inputXfs,
- (void *) NULL);
+ NULL);
}
winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
@@ -351,7 +351,7 @@ CreateXIC(
XNClientWindow, winPtr->window,
XNFocusWindow, winPtr->window,
preedit_attname, preedit_attlist,
- (void *) NULL);
+ NULL);
if (preedit_attlist) {
XFree(preedit_attlist);
@@ -366,7 +366,7 @@ CreateXIC(
/*
* Adjust the window's event mask if the IM requires it.
*/
- XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, (void *) NULL);
+ XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, 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 09dde72..59fba29 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -639,7 +639,7 @@ OpenIM(
}
if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr,
- (void *) NULL) != NULL) || (stylePtr == NULL)) {
+ NULL) != NULL) || (stylePtr == NULL)) {
goto error;
}
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index ed77877..f422111 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -65,10 +65,10 @@ Tk_SetCaretPos(
spot.x = dispPtr->caret.x;
spot.y = dispPtr->caret.y + dispPtr->caret.height;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, (void *) NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
XSetICValues(winPtr->inputContext,
XNPreeditAttributes, preedit_attr,
- (void *) NULL);
+ NULL);
XFree(preedit_attr);
}
#endif
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index c3ece5e..fd0b556 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -101,7 +101,7 @@ GetFont(
ftFont = XftFontOpen(fontPtr->display, fontPtr->screen,
FC_FAMILY, FcTypeString, "sans",
FC_SIZE, FcTypeDouble, 12.0,
- (void *) NULL);
+ NULL);
}
if (!ftFont) {
/*