From 6812a5896abf0f78fa45ed14d4b4a7e6f2f4d310 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath
Date: Mon, 4 May 2015 07:55:15 +0200
Subject: warnings: fix some cast to/from pointer from/to int warnings

This fixes the following two warnings
 cast from pointer to integer of different size
 cast to pointer from integer of different size
by either changing some ints that are supposed to hold pointers
to intptr_t type or by intermediate casting to (intptr_t).
---
 src/doom/p_maputl.c     | 2 +-
 src/doom/p_saveg.c      | 4 ++--
 src/setup/multiplayer.c | 8 ++++----
 src/strife/p_saveg.c    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/doom/p_maputl.c b/src/doom/p_maputl.c
index 098c2c73..6cc35a5a 100644
--- a/src/doom/p_maputl.c
+++ b/src/doom/p_maputl.c
@@ -846,7 +846,7 @@ static void InterceptsOverrun(int num_intercepts, intercept_t *intercept)
 
     InterceptsMemoryOverrun(location, intercept->frac);
     InterceptsMemoryOverrun(location + 4, intercept->isaline);
-    InterceptsMemoryOverrun(location + 8, (int) intercept->d.thing);
+    InterceptsMemoryOverrun(location + 8, (intptr_t) intercept->d.thing);
 }
 
 
diff --git a/src/doom/p_saveg.c b/src/doom/p_saveg.c
index 6a48271d..5cb81967 100644
--- a/src/doom/p_saveg.c
+++ b/src/doom/p_saveg.c
@@ -184,12 +184,12 @@ static void saveg_write_pad(void)
 
 static void *saveg_readp(void)
 {
-    return (void *) saveg_read32();
+    return (void *) (intptr_t) saveg_read32();
 }
 
 static void saveg_writep(void *p)
 {
-    saveg_write32((int) p);
+    saveg_write32((intptr_t) p);
 }
 
 // Enum values are 32-bit integers.
diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index 53b8ba26..4aaff921 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -355,7 +355,7 @@ static void SetExMyWarp(TXT_UNCAST_ARG(widget), void *val)
 {
     int l;
 
-    l = (int) val;
+    l = (intptr_t) val;
 
     warpepisode = l / 10;
     warpmap = l % 10;
@@ -367,7 +367,7 @@ static void SetMAPxyWarp(TXT_UNCAST_ARG(widget), void *val)
 {
     int l;
 
-    l = (int) val;
+    l = (intptr_t) val;
 
     warpmap = l;
 
@@ -389,8 +389,8 @@ static void LevelSelectDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
     const iwad_t *iwad;
     char buf[10];
     int episodes;
-    int x, y;
-    int l;
+    intptr_t x, y;
+    intptr_t l;
     int i;
 
     window = TXT_NewWindow("Select level");
diff --git a/src/strife/p_saveg.c b/src/strife/p_saveg.c
index 9fec0c02..ffe9dbcb 100644
--- a/src/strife/p_saveg.c
+++ b/src/strife/p_saveg.c
@@ -186,12 +186,12 @@ static void saveg_write_pad(void)
 
 static void *saveg_readp(void)
 {
-    return (void *) saveg_read32();
+    return (void *) (intptr_t) saveg_read32();
 }
 
 static void saveg_writep(void *p)
 {
-    saveg_write32((int) p);
+    saveg_write32((intptr_t) p);
 }
 
 // Enum values are 32-bit integers.
-- 
cgit v1.2.3