summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixEvent.c6
-rw-r--r--unix/tkUnixSelect.c6
-rw-r--r--unix/tkUnixSend.c6
3 files changed, 10 insertions, 8 deletions
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;