From 60370012590a96ccb9b812f8688a0f8822c9883b Mon Sep 17 00:00:00 2001
From: stwo <stwo>
Date: Thu, 9 Aug 2012 16:40:41 +0000
Subject: Remove useless (void *) casts introduced in checkin [b7a58eae61]. The
 warnings were false flags from a faulty OpenBSD C compiler.

---
 ChangeLog          | 7 +++++++
 generic/tkEvent.c  | 6 +++---
 unix/tkUnixEvent.c | 2 +-
 unix/tkUnixKey.c   | 4 ++--
 unix/tkUnixRFont.c | 2 +-
 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) {
 	    /*
-- 
cgit v0.12