diff options
| author | Jamey Sharp <jamey@minilop.net> | 2009-10-08 13:38:44 +1100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-10-08 13:38:44 +1100 |
| commit | b0dd6be2c8703f7062d45ac9fd646550c7d54e3b (patch) | |
| tree | 98c7ac7a8d90fea6fcdd44525fc42e84d0cb4914 /dix | |
| parent | b680a89262efcfef4644adb4a61ae42ea0db0c93 (diff) | |
Cast small-int values through intptr_t when passed as pointers
On 64-bit systems, int and pointers don't have the same size, so GCC gives
warnings about casts between int and pointer types. However, in the cases
covered by this patch, it's always a value that fits in int being stored
temporarily as a pointer and then converted back later, which is safe.
Casting through the pointer-sized integer type intptr_t convinces the
compiler that this is OK.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/events.c b/dix/events.c index d60b8a534..14e3900b9 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1460,7 +1460,7 @@ static DevPrivateKey GrabPrivateKey = &GrabPrivateKeyIndex; static void DetachFromMaster(DeviceIntPtr dev) { - int id; + intptr_t id; if (!dev->u.master) return; @@ -1482,7 +1482,7 @@ ReattachToOldMaster(DeviceIntPtr dev) p = dixLookupPrivate(&dev->devPrivates, GrabPrivateKey); - id = (int)p; /* silence gcc warnings */ + id = (intptr_t) p; /* silence gcc warnings */ dixLookupDevice(&master, id, serverClient, DixUseAccess); if (master) |