summaryrefslogtreecommitdiffstats
path: root/generic/tkSelect.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-11-29 09:07:12 (GMT)
committernijtmans <nijtmans>2010-11-29 09:07:12 (GMT)
commit8ccebbf9fc50bab1c1a3fa148f9632f059296bd2 (patch)
treef4a05b05f4420db2757c9b6934a169d18c4d0bf0 /generic/tkSelect.c
parent13fd371fb175d2dc12a9ec83a2cd45f540086857 (diff)
downloadtk-8ccebbf9fc50bab1c1a3fa148f9632f059296bd2.zip
tk-8ccebbf9fc50bab1c1a3fa148f9632f059296bd2.tar.gz
tk-8ccebbf9fc50bab1c1a3fa148f9632f059296bd2.tar.bz2
Fix various 64-bit gcc(-4.5.2) warnings: cast from pointer to integer of different size
Diffstat (limited to 'generic/tkSelect.c')
-rw-r--r--generic/tkSelect.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index c2277c6..beebe12 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkSelect.c,v 1.31 2010/01/02 22:52:38 dkf Exp $
+ * RCS: @(#) $Id: tkSelect.c,v 1.32 2010/11/29 09:07:13 nijtmans Exp $
*/
#include "tkInt.h"
@@ -170,7 +170,7 @@ Tk_CreateSelHandler(
selPtr->size = 32;
}
- if ((target == XA_STRING) && (winPtr->dispPtr->utf8Atom != (Atom) NULL)) {
+ if ((target == XA_STRING) && (winPtr->dispPtr->utf8Atom != (Atom) 0)) {
/*
* If the user asked for a STRING handler and we understand
* UTF8_STRING, we implicitly create a UTF8_STRING handler for them.
@@ -283,7 +283,7 @@ Tk_DeleteSelHandler(
prevPtr->nextPtr = selPtr->nextPtr;
}
- if ((target == XA_STRING) && (winPtr->dispPtr->utf8Atom != (Atom) NULL)) {
+ if ((target == XA_STRING) && (winPtr->dispPtr->utf8Atom != (Atom) 0)) {
/*
* If the user asked for a STRING handler and we understand
* UTF8_STRING, we may have implicitly created a UTF8_STRING handler
@@ -1192,7 +1192,7 @@ TkSelInit(
#if !defined(__WIN32__)
dispPtr->utf8Atom = Tk_InternAtom(tkwin, "UTF8_STRING");
#else
- dispPtr->utf8Atom = (Atom) NULL;
+ dispPtr->utf8Atom = (Atom) 0;
#endif
}