diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-10-15 18:38:32 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-10-15 18:38:32 (GMT) |
| commit | c1bdc631fe9cbf391d13b23956e038bef596cbbf (patch) | |
| tree | e3487a278609005db397864c3267df8c395d36ba /generic/tkObj.c | |
| parent | 1b633c1a2c27d0385c2c8ceaa76592f1257ab869 (diff) | |
| download | tk-c1bdc631fe9cbf391d13b23956e038bef596cbbf.zip tk-c1bdc631fe9cbf391d13b23956e038bef596cbbf.tar.gz tk-c1bdc631fe9cbf391d13b23956e038bef596cbbf.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'generic/tkObj.c')
| -rw-r--r-- | generic/tkObj.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c index 7910c9f..4c117c8 100644 --- a/generic/tkObj.c +++ b/generic/tkObj.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: tkObj.c,v 1.16 2007/01/03 04:10:55 nijtmans Exp $ + * RCS: @(#) $Id: tkObj.c,v 1.16.2.1 2007/10/15 18:38:33 dgp Exp $ */ #include "tkInt.h" @@ -28,11 +28,11 @@ typedef struct PixelRep { ((objPtr)->internalRep.twoPtrValue.ptr2 == 0) #define SET_SIMPLEPIXEL(objPtr, intval) \ - (objPtr)->internalRep.twoPtrValue.ptr1 = (VOID *) (intval); \ + (objPtr)->internalRep.twoPtrValue.ptr1 = INT2PTR(intval); \ (objPtr)->internalRep.twoPtrValue.ptr2 = 0 #define GET_SIMPLEPIXEL(objPtr) \ - ((int) (objPtr)->internalRep.twoPtrValue.ptr1) + (PTR2INT((objPtr)->internalRep.twoPtrValue.ptr1)) #define SET_COMPLEXPIXEL(objPtr, repPtr) \ (objPtr)->internalRep.twoPtrValue.ptr1 = 0; \ |