summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2007-05-03 22:15:59 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2007-05-03 22:15:59 (GMT)
commite61b61a3f03fc95c9f9c7271fb705df4e84f31e0 (patch)
treef9f6ecc37d850900d1d406840508d7f3f77e910d
parent1d327cff35030c574230508e600a5f587b64b321 (diff)
downloadtk-e61b61a3f03fc95c9f9c7271fb705df4e84f31e0.zip
tk-e61b61a3f03fc95c9f9c7271fb705df4e84f31e0.tar.gz
tk-e61b61a3f03fc95c9f9c7271fb705df4e84f31e0.tar.bz2
Fix more type pun warnings (those not found by my local version of GCC)
-rw-r--r--ChangeLog6
-rw-r--r--generic/ttk/ttkLabel.c6
-rw-r--r--unix/tkUnixEvent.c6
-rw-r--r--unix/tkUnixSelect.c6
-rw-r--r--unix/tkUnixSend.c6
5 files changed, 18 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index fe8a588..fea7fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
2007-05-03 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+ * unix/tkUnixSelect.c (ConvertSelection):
+ * unix/tkUnixEvent.c (TkUnixDoOneXEvent):
* generic/tkConfig.c (Tk_RestoreSavedOptions):
* generic/tkCanvPs.c (TkCanvPostscriptCmd):
* generic/tkOption.c (GetDefaultOptions):
* unix/tkUnixRFont.c (TkpGetFontAttrsForChar, InitFont)
(TkpGetFontFamilies, TkpGetSubFonts):
- * unix/tkUnixSend.c (TkpTestsendCmd): Squelch warnings from GCC type
- aliasing. [Bug 1711985]
+ * unix/tkUnixSend.c (TkpTestsendCmd, RegOpen): Squelch warnings from
+ GCC type aliasing. [Bug 1711985 and others]
2007-04-29 Daniel Steffen <das@users.sourceforge.net>
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index 8dd1c63..58bdceb 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -1,4 +1,4 @@
-/* $Id: ttkLabel.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $
+/* $Id: ttkLabel.c,v 1.8 2007/05/03 22:15:59 dkf Exp $
*
* text, image, and label elements.
*
@@ -506,8 +506,10 @@ static Ttk_ElementOptionSpec LabelElementOptions[] =
static void LabelSetup(
LabelElement *c, Tk_Window tkwin, Ttk_State state)
{
+ Ttk_Compound *compoundPtr = &c->compound;
+
Tk_GetPixelsFromObj(NULL,tkwin,c->spaceObj,&c->space);
- Ttk_GetCompoundFromObj(NULL,c->compoundObj,(int*)&c->compound);
+ Ttk_GetCompoundFromObj(NULL,c->compoundObj,(int*)compoundPtr);
/*
* Deal with TTK_COMPOUND_NONE.
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index 46caeb3..dde8432 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.23 2007/01/12 09:08:36 dkf Exp $
+ * RCS: @(#) $Id: tkUnixEvent.c,v 1.24 2007/05/03 22:16:00 dkf Exp $
*/
#include "tkInt.h"
@@ -480,7 +480,7 @@ TkUnixDoOneXEvent(
struct timeval blockTime, *timeoutPtr;
Tcl_Time now;
int fd, index, numFound, numFdBits = 0;
- fd_mask bit;
+ fd_mask bit, *readMaskPtr = readMask;
/*
* Look for queued events first.
@@ -537,7 +537,7 @@ TkUnixDoOneXEvent(
}
}
- numFound = select(numFdBits, (SELECT_MASK *) readMask, NULL, NULL,
+ numFound = select(numFdBits, (SELECT_MASK *) readMaskPtr, NULL, NULL,
timeoutPtr);
if (numFound <= 0) {
/*
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index 301a201..b85b274 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.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: tkUnixSelect.c,v 1.20 2007/04/17 14:29:46 dkf Exp $
+ * RCS: @(#) $Id: tkUnixSelect.c,v 1.21 2007/05/03 22:16:00 dkf Exp $
*/
#include "tkInt.h"
@@ -847,7 +847,7 @@ ConvertSelection(
incr.multAtoms = singleInfo;
incr.numConversions = 1;
} else {
- Atom type;
+ Atom type, **multAtomsPtr = &incr.multAtoms;
int format, result;
unsigned long bytesAfter;
@@ -859,7 +859,7 @@ ConvertSelection(
result = XGetWindowProperty(eventPtr->display, eventPtr->requestor,
eventPtr->property, 0, MAX_PROP_WORDS, False, XA_ATOM,
&type, &format, &incr.numConversions, &bytesAfter,
- (unsigned char **) &incr.multAtoms);
+ (unsigned char **) multAtomsPtr);
if ((result != Success) || (bytesAfter != 0) || (format != 32)
|| (type == None)) {
if (incr.multAtoms != NULL) {
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index b348ab8..7f038b7 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixSend.c,v 1.17 2007/05/03 15:21:32 dkf Exp $
+ * RCS: @(#) $Id: tkUnixSend.c,v 1.18 2007/05/03 22:16:00 dkf Exp $
*/
#include "tkPort.h"
@@ -265,6 +265,7 @@ RegOpen(
int result, actualFormat;
unsigned long bytesAfter;
Atom actualType;
+ char **propertyPtr;
if (dispPtr->commTkwin == NULL) {
SendInit(interp, dispPtr);
@@ -275,6 +276,7 @@ RegOpen(
regPtr->locked = 0;
regPtr->modified = 0;
regPtr->allocedByX = 1;
+ propertyPtr = &regPtr->property;
if (lock && !localData.sendDebug) {
XGrabServer(dispPtr->display);
@@ -290,7 +292,7 @@ RegOpen(
dispPtr->registryProperty, 0, MAX_PROP_WORDS,
False, XA_STRING, &actualType, &actualFormat,
&regPtr->propLength, &bytesAfter,
- (unsigned char **) &regPtr->property);
+ (unsigned char **) propertyPtr);
if (actualType == None) {
regPtr->propLength = 0;