[[ iOS 64-bit ]] Code changes required to get 64-bit iOS to compile

Fraser J. Gordon · Fraser J. Gordon · commit c99a8098f416 · 2014-12-04T15:59:03.000Z
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -733,7 +733,7 @@ Exec_stat MCGo::exec(MCExecPoint &ep)
 				MCeerror->add(EE_GO_BADWINDOWEXP, line, pos);
 				return ES_ERROR;
 			}
-			if (ep.ton() == ES_NORMAL && MCscreen->uint4towindow(ep.getuint4(), w))
+			if (ep.ton() == ES_NORMAL && MCscreen->uinttowindow(ep.getuint4(), w))
 				oldstack = MCdispatcher->findstackd(w);
 			else
 				oldstack = ep.getobj()->getstack()->findstackname(ep.getsvalue());
diff --git a/engine/src/desktop-dc.cpp b/engine/src/desktop-dc.cpp
@@ -458,7 +458,7 @@ void MCScreenDC::setinputfocus(Window window)
 	MCPlatformFocusWindow(window);
 }
 
-uint4 MCScreenDC::dtouint4(Drawable d)
+uintptr_t MCScreenDC::dtouint(Drawable d)
 {
 	if (d == nil)
 		return 0;
@@ -472,7 +472,7 @@ uint4 MCScreenDC::dtouint4(Drawable d)
 	return t_id;
 }
 
-Boolean MCScreenDC::uint4towindow(uint4 p_id, Window &w)
+Boolean MCScreenDC::uinttowindow(uintptr_t p_id, Window &w)
 {
     // MW-2014-07-15: [[ Bug 12800 ]] Map the windowId to a platform window if one exists.
     MCPlatformWindowRef t_window;
diff --git a/engine/src/desktop-dc.h b/engine/src/desktop-dc.h
@@ -96,8 +96,8 @@ class MCScreenDC: public MCUIDC
 	virtual void uniconifywindow(Window window);
 	virtual void setname(Window window, const char *newname);
 	virtual void setinputfocus(Window window);
-	virtual uint4 dtouint4(Drawable d);
-	virtual Boolean uint4towindow(uint4, Window &w);
+	virtual uintptr_t dtouint(Drawable d);
+	virtual Boolean uinttowindow(uintptr_t, Window &w);
 	
 	virtual void enablebackdrop(bool p_hard);
 	virtual void disablebackdrop(bool p_hard);
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -1637,7 +1637,7 @@ bool MCDispatch::foreachchildstack(MCStack *p_stack, MCStackForEachCallback p_ca
 	return t_continue;
 }
 
-MCStack *MCDispatch::findstackwindowid(uint32_t p_win_id)
+MCStack *MCDispatch::findstackwindowid(uintptr_t p_win_id)
 {
 	if (p_win_id == 0)
 		return NULL;
@@ -1686,7 +1686,7 @@ MCStack *MCDispatch::findstackwindowid(uint32_t p_win_id)
 MCStack *MCDispatch::findstackd(Window w)
 {
 	// IM-2014-07-09: [[ Bug 12225 ]] Use window ID to find stack
-	return findstackwindowid(MCscreen->dtouint4((Drawable)w));
+	return findstackwindowid(MCscreen->dtouint((Drawable)w));
 }
 
 MCObject *MCDispatch::getobjid(Chunk_term type, uint4 inid)
diff --git a/engine/src/dispatch.h b/engine/src/dispatch.h
@@ -196,7 +196,7 @@ class MCDispatch : public MCObject
 	MCStack *findstackname(const MCString &);
 	MCStack *findstackid(uint4 fid);
 	// IM-2014-07-09: [[ Bug 12225 ]] Find the stack by window ID
-	MCStack *findstackwindowid(uint32_t p_win_id);
+	MCStack *findstackwindowid(uintptr_t p_win_id);
 	MCStack *findstackd(Window w);
 	
 	// IM-2014-07-23: [[ Bug 12930 ]] Replace findchildstack method with iterating method
diff --git a/engine/src/externalv0.cpp b/engine/src/externalv0.cpp
@@ -757,8 +757,8 @@ static char *runloop_wait(const char *arg1, const char *arg2,
 static char *stack_to_window_rect(const char *arg1, const char *arg2,
 									   const char *arg3, int *retval)
 {
-	uint32_t t_win_id;
-	t_win_id = (uint32_t)arg1;
+	uintptr_t t_win_id;
+	t_win_id = (uintptr_t)arg1;
 
 	MCStack *t_stack;
 	t_stack = MCdispatcher->findstackwindowid(t_win_id);
@@ -785,8 +785,8 @@ static char *stack_to_window_rect(const char *arg1, const char *arg2,
 static char *window_to_stack_rect(const char *arg1, const char *arg2,
 									   const char *arg3, int *retval)
 {
-	uint32_t t_win_id;
-	t_win_id = (uint32_t)arg1;
+	uintptr_t t_win_id;
+	t_win_id = (uintptr_t)arg1;
 
 	MCStack *t_stack;
 	t_stack = MCdispatcher->findstackwindowid(t_win_id);
diff --git a/engine/src/lnxdc.h b/engine/src/lnxdc.h
@@ -225,8 +225,8 @@ class MCScreenDC : public MCUIDC
 	virtual void freecursor(MCCursorRef c);
 
 	virtual void setfunction(uint4 rop);
-	virtual uint4 dtouint4(Drawable d);
-	virtual Boolean uint4towindow(uint4, Window &w);
+	virtual uintptr_t dtouint(Drawable d);
+	virtual Boolean uinttowindow(uintptr_t, Window &w);
 	virtual void getbeep(uint4 property, MCExecPoint &ep);
 	virtual void setbeep(uint4 property, int4 beep);
 	virtual void getvendorstring(MCExecPoint &ep);
diff --git a/engine/src/lnxdcs.cpp b/engine/src/lnxdcs.cpp
@@ -882,12 +882,12 @@ void MCScreenDC::setfunction(uint4 rop)
 		XSetFunction(dpy, getgc(), rop);
 }
 
-uint4 MCScreenDC::dtouint4(Drawable d)
+uintptr_t MCScreenDC::dtouint(Drawable d)
 {
 	return d;
 }
 
-Boolean MCScreenDC::uint4towindow(uint4 id, Window &w)
+Boolean MCScreenDC::uinttowindow(uintptr_t id, Window &w)
 {
 	w = id;
 	return True;
diff --git a/engine/src/mbldc.cpp b/engine/src/mbldc.cpp
@@ -687,15 +687,15 @@ void MCScreenDC::freecursor(MCCursorRef c)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-uint4 MCScreenDC::dtouint4(Drawable d)
+uintptr_t MCScreenDC::dtouint(Drawable d)
 {
 	if (d == DNULL)
 		return 0;
 	
-	return (uint4)d -> handle . pixmap;
+	return (uintptr_t)d -> handle . pixmap;
 }
 
-Boolean MCScreenDC::uint4towindow(uint4, Window &w)
+Boolean MCScreenDC::uinttowindow(uintptr_t, Window &w)
 {
 	return False;
 }
diff --git a/engine/src/mbldc.h b/engine/src/mbldc.h
@@ -120,8 +120,8 @@ class MCScreenDC: public MCUIDC
 	MCCursorRef createcursor(MCImageBitmap *p_image, int2 p_hotspot_x, int2 p_hotspot_y);
 	void freecursor(MCCursorRef c);
 
-	uint4 dtouint4(Drawable d);
-	Boolean uint4towindow(uint4, Window &w);
+	uintptr_t dtouint(Drawable d);
+	Boolean uinttowindow(uintptr_t, Window &w);
 
 	void beep();
 	bool setbeepsound(const char *sound);
diff --git a/engine/src/mbliphone.mm b/engine/src/mbliphone.mm
@@ -376,8 +376,12 @@ virtual int64_t GetFileSize(void)
 
 char *MCIPhoneSystem::GetProcessor(void)
 {
-#ifdef __i386__
+#if defined __i386__
 	return strclone("i386");
+#elif defined __amd64__
+    return strclone("x86_64");
+#elif defined __arm64__
+    return strclone("arm64");
 #else
 	return strclone("ARM");
 #endif
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -1462,7 +1462,7 @@ Exec_stat MCStack::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boole
 		ep.setboolean(getflag(F_WM_PLACE));
 		break;
 	case P_WINDOW_ID:
-		ep.setint(MCscreen->dtouint4((Drawable)window));
+		ep.setint(MCscreen->dtouint((Drawable)window));
 		break;
 	case P_PIXMAP_ID:
 		ep.setint(0);
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -775,7 +775,7 @@ class MCStack : public MCObject
 	void effectrect(const MCRectangle &drect, Boolean &abort);
 	
 	// IM-2014-07-09: [[ Bug 12225 ]] Find the stack by window ID
-	MCStack *findstackwindowid(uint32_t p_win_id);
+	MCStack *findstackwindowid(uintptr_t p_win_id);
 	MCStack *findstackd(Window w);
 	
 	// IM-2014-07-23: [[ Bug 12930 ]] Replace findchildstack method with iterating method
diff --git a/engine/src/stack3.cpp b/engine/src/stack3.cpp
@@ -1307,18 +1307,18 @@ MCStack *MCStack::findsubstackid(uint4 fid)
 	return NULL;
 }
 
-MCStack *MCStack::findstackwindowid(uint32_t p_win_id)
+MCStack *MCStack::findstackwindowid(uintptr_t p_win_id)
 {
 	if (p_win_id == 0)
 		return NULL;
-	if (MCscreen->dtouint4((Drawable)window) == p_win_id)
+	if (MCscreen->dtouint((Drawable)window) == p_win_id)
 		return this;
 	if (substacks != NULL)
 	{
 		MCStack *tptr = substacks;
 		do
 		{
-			if (MCscreen->dtouint4((Drawable)tptr->window) == p_win_id)
+			if (MCscreen->dtouint((Drawable)tptr->window) == p_win_id)
 				return tptr;
 			tptr = (MCStack *)tptr->next();
 		}
diff --git a/engine/src/tilecachegl.cpp b/engine/src/tilecachegl.cpp
@@ -136,7 +136,7 @@ static inline void glvColor4ub(MCTileCacheOpenGLVersion p_version, uint8_t r, ui
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static inline void MCTileCacheOpenGLCompositorDecodeTile(MCTileCacheOpenGLCompositorContext *self, uint32_t p_tile, uint32_t& r_super_tile, uint32_t& r_sub_tile)
+static inline void MCTileCacheOpenGLCompositorDecodeTile(MCTileCacheOpenGLCompositorContext *self, uintptr_t p_tile, uint32_t& r_super_tile, uint32_t& r_sub_tile)
 {
 	r_super_tile = (p_tile & 0xffff) - 1;
 	r_sub_tile = (p_tile >> 16) - 1;
@@ -219,7 +219,7 @@ static bool MCTileCacheOpenGLCompositorCreateTile(MCTileCacheOpenGLCompositorCon
 	return true;
 }
 
-static void MCTileCacheOpenGLCompositorDestroyTile(MCTileCacheOpenGLCompositorContext *self, uint32_t p_tile)
+static void MCTileCacheOpenGLCompositorDestroyTile(MCTileCacheOpenGLCompositorContext *self, uintptr_t p_tile)
 {
 	// Fetch the super/sub indices of the tile.
 	uint32_t t_super_tile_index, t_sub_tile_index;
@@ -376,7 +376,7 @@ void MCTileCacheOpenGLCompositor_DeallocateTile(void *p_context, void *p_tile)
 	MCTileCacheOpenGLCompositorContext *self;
 	self = (MCTileCacheOpenGLCompositorContext *)p_context;
 	
-	MCTileCacheOpenGLCompositorDestroyTile(self, (uint32_t)p_tile);
+	MCTileCacheOpenGLCompositorDestroyTile(self, (uintptr_t)p_tile);
 }
 
 static void MCTileCacheOpenGLCompositor_PrepareFrame(MCTileCacheOpenGLCompositorContext *self)
@@ -570,7 +570,7 @@ bool MCTileCacheOpenGLCompositor_CompositeTile(void *p_context, int32_t p_x, int
 	self = (MCTileCacheOpenGLCompositorContext *)p_context;
 
 	uint32_t t_super_tile_index, t_sub_tile_index;
-	MCTileCacheOpenGLCompositorDecodeTile(self, (uint32_t)p_tile, t_super_tile_index, t_sub_tile_index);
+	MCTileCacheOpenGLCompositorDecodeTile(self, (uintptr_t)p_tile, t_super_tile_index, t_sub_tile_index);
 	
 	GLuint t_texture;
 	t_texture = self -> super_tiles[t_super_tile_index] -> texture;
diff --git a/engine/src/typedefs.h b/engine/src/typedefs.h
@@ -84,6 +84,11 @@ typedef double          real8;
 
 // New-style (C99) integer definitions and limits
 
+
+#ifndef _WIN32
+#include <stdint.h>
+#else
+
 typedef unsigned char uint8_t;
 typedef signed char int8_t;
 typedef unsigned short uint16_t;
@@ -107,6 +112,8 @@ typedef signed int int32_t;
 	#endif
 #endif
 
+#endif
+
 typedef float float32_t;
 typedef double float64_t;
 
@@ -144,6 +151,12 @@ typedef uint32_t codepoint_t;
 #define INT64_MAX 0x7FFFFFFFFFFFFFFFLL
 #endif
 
+// These are non-standard
+#define UINT8_MIN   0
+#define UINT16_MIN  0
+#define UINT32_MIN  0
+#define UINT64_MIN  0
+
 #define UINDEX_MIN UINT32_MIN
 #define UINDEX_MAX UINT32_MAX
 
diff --git a/engine/src/uidc.cpp b/engine/src/uidc.cpp
@@ -673,13 +673,13 @@ MCCursorRef MCUIDC::createcursor(MCImageBitmap *p_image, int2 p_xhot, int2 p_yho
 void MCUIDC::freecursor(MCCursorRef c)
 { }
 
-uint4 MCUIDC::dtouint4(Drawable d)
+uintptr_t MCUIDC::dtouint(Drawable d)
 {
 	return 1;
 }
 
 
-Boolean MCUIDC::uint4towindow(uint4, Window &w)
+Boolean MCUIDC::uinttowindow(uintptr_t, Window &w)
 {
 	w = (Window)1;
 	return True;
diff --git a/engine/src/uidc.h b/engine/src/uidc.h
@@ -422,8 +422,8 @@ class MCUIDC
 	virtual MCCursorRef createcursor(MCImageBitmap *image, int2 xhot, int2 yhot);
 	virtual void freecursor(MCCursorRef c);
 
-	virtual uint4 dtouint4(Drawable d);
-	virtual Boolean uint4towindow(uint4, Window &w);
+	virtual uintptr_t dtouint(Drawable d);
+	virtual Boolean uinttowindow(uintptr_t, Window &w);
 
 	virtual void getbeep(uint4 property, MCExecPoint &ep);
 	virtual void setbeep(uint4 property, int4 beep);
diff --git a/engine/src/w32dc.h b/engine/src/w32dc.h
@@ -254,8 +254,8 @@ class MCScreenDC : public MCUIDC
 	virtual MCCursorRef createcursor(MCImageBitmap *image, int2 xhot, int2 yhot);
 	virtual void freecursor(MCCursorRef c);
 
-	virtual uint4 dtouint4(Drawable d);
-	virtual Boolean uint4towindow(uint4, Window &w);
+	virtual uintptr_t dtouint(Drawable d);
+	virtual Boolean uinttowindow(uintptr_t, Window &w);
 	virtual void getbeep(uint4 property, MCExecPoint &ep);
 	virtual void setbeep(uint4 property, int4 beep);
 	virtual void getvendorstring(MCExecPoint &ep);
diff --git a/engine/src/w32dcs.cpp b/engine/src/w32dcs.cpp
@@ -706,18 +706,18 @@ static void fixdata(uint4 *bits, uint2 width, uint2 height)
 		*bits++ |= mask;
 }
 
-uint4 MCScreenDC::dtouint4(Drawable d)
+uintptr_t MCScreenDC::dtouint(Drawable d)
 {
 	if (d == DNULL)
 		return 0;
 	else
 		if (d->type == DC_WINDOW)
-			return (uint4)(d->handle.window);
+			return (uintptr_t)(d->handle.window);
 		else
-			return (uint4)(d->handle.pixmap);
+			return (uintptr_t)(d->handle.pixmap);
 }
 
-Boolean MCScreenDC::uint4towindow(uint4 id, Window &w)
+Boolean MCScreenDC::uinttowindow(uintptr_t id, Window &w)
 {
 	w = new _Drawable;
 	w->type = DC_WINDOW;
diff --git a/libcore/include/core.h b/libcore/include/core.h
@@ -26,6 +26,10 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WIN32
+#include <stdint.h>
+#else
+
 typedef unsigned char uint8_t;
 typedef signed char int8_t;
 typedef unsigned short uint16_t;
@@ -50,6 +54,8 @@ typedef signed int int32_t;
 	#endif
 #endif
 
+#endif
+
 typedef uint32_t uindex_t;
 typedef int32_t index_t;
 typedef uint32_t hash_t;
@@ -511,28 +517,30 @@ bool MCBinaryDecoderReadCFString(MCBinaryDecoder *decoder, CFStringRef& r_value)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-inline uint32_t MCMin(uint32_t a, uint32_t b) { return a < b ? a : b; }
-inline uint32_t MCMax(uint32_t a, uint32_t b) { return a > b ? a : b; }
-inline int32_t MCMin(int32_t a, int32_t b) { return a < b ? a : b; }
-inline int32_t MCMax(int32_t a, int32_t b) { return a > b ? a : b; }
-inline int64_t MCMin(int64_t a, int64_t b) { return a < b ? a : b; }
-inline int64_t MCMax(int64_t a, int64_t b) { return a > b ? a : b; }
-inline int64_t MCMin(uint64_t a, uint64_t b) { return a < b ? a : b; }
-inline int64_t MCMax(uint64_t a, uint64_t b) { return a > b ? a : b; }
-inline double MCMin(double a, double b) { return a < b ? a : b; }
-inline double MCMax(double a, double b) { return a > b ? a : b; }
-inline float MCMin(float a, float b) { return a < b ? a : b; }
-inline float MCMax(float a, float b) { return a > b ? a : b; }
+#if (__cplusplus >= 201103L)
+template <class T, class U>
+  inline auto MCMin(T a, U b) -> decltype(a+b) { return a < b ? a : b; }
+template <class T, class U>
+  inline auto MCMax(T a, U b) -> decltype(a+b) { return a < b ? b : a; }
+#else
+template <class T, class U, class R = T>
+  inline R MCMin(T a, U b) { return a < b ? a : b; }
+template <class T, class U, class R = T>
+  inline R MCMax(T a, U b) { return a < b ? b : a; }
+#endif
+
 inline uint32_t MCAbs(int32_t a) { return a < 0 ? -a : a; }
 inline uint64_t MCAbs(int64_t a) { return a < 0 ? -a : a; }
 inline float MCAbs(float a) { return fabsf(a); }
 inline double MCAbs(double a) { return fabs(a); }
 inline compare_t MCSgn(int32_t a) { return a < 0 ? -1 : (a > 0 ? 1 : 0); }
 inline compare_t MCSgn(int64_t a) { return a < 0 ? -1 : (a > 0 ? 1 : 0); }
-inline compare_t MCCompare(int32_t a, int32_t b) { return a < b ? -1 : (a > b ? 1 : 0); }
-inline compare_t MCCompare(uint32_t a, uint32_t b) { return a < b ? -1 : (a > b ? 1 : 0); }
-inline compare_t MCCompare(int64_t a, int64_t b) { return a < b ? -1 : (a > b ? 1 : 0); }
-inline compare_t MCCompare(uint64_t a, uint64_t b) { return a < b ? -1 : (a > b ? 1 : 0); }
+inline compare_t MCCompare(int a, int b) { return a < b ? -1 : (a > b ? 1 : 0); }
+inline compare_t MCCompare(unsigned int a, unsigned int b) { return a < b ? -1 : (a > b ? 1 : 0); }
+inline compare_t MCCompare(long a, long b) { return a < b ? -1 : (a > b ? 1 : 0); }
+inline compare_t MCCompare(unsigned long a, unsigned long b) { return a < b ? -1 : (a > b ? 1 : 0); }
+inline compare_t MCCompare(long long a, long long b) { return a < b ? -1 : (a > b ? 1 : 0); }
+inline compare_t MCCompare(unsigned long long a, unsigned long long b) { return a < b ? -1 : (a > b ? 1 : 0); }
 
 inline bool MCIsPowerOfTwo(uint32_t x) { return (x & (x - 1)) == 0; }
 
diff --git a/libgraphics/src/coretext.cpp b/libgraphics/src/coretext.cpp
diff --git a/rules/Global Mobile.xcconfig b/rules/Global Mobile.xcconfig

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ Exec_stat MCGo::exec(MCExecPoint &ep)`
`733`	`733`	`MCeerror->add(EE_GO_BADWINDOWEXP, line, pos);`
`734`	`734`	`return ES_ERROR;`
`735`	`735`	`}`
`736`		`- if (ep.ton() == ES_NORMAL && MCscreen->uint4towindow(ep.getuint4(), w))`
	`736`	`+ if (ep.ton() == ES_NORMAL && MCscreen->uinttowindow(ep.getuint4(), w))`
`737`	`737`	`oldstack = MCdispatcher->findstackd(w);`
`738`	`738`	`else`
`739`	`739`	`oldstack = ep.getobj()->getstack()->findstackname(ep.getsvalue());`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ void MCScreenDC::setinputfocus(Window window)`
`458`	`458`	`MCPlatformFocusWindow(window);`
`459`	`459`	`}`
`460`	`460`
`461`		`-uint4 MCScreenDC::dtouint4(Drawable d)`
	`461`	`+uintptr_t MCScreenDC::dtouint(Drawable d)`
`462`	`462`	`{`
`463`	`463`	`if (d == nil)`
`464`	`464`	`return 0;`
`@@ -472,7 +472,7 @@ uint4 MCScreenDC::dtouint4(Drawable d)`
`472`	`472`	`return t_id;`
`473`	`473`	`}`
`474`	`474`
`475`		`-Boolean MCScreenDC::uint4towindow(uint4 p_id, Window &w)`
	`475`	`+Boolean MCScreenDC::uinttowindow(uintptr_t p_id, Window &w)`
`476`	`476`	`{`
`477`	`477`	`// MW-2014-07-15: [[ Bug 12800 ]] Map the windowId to a platform window if one exists.`
`478`	`478`	`MCPlatformWindowRef t_window;`
Original file line number	Diff line number	Diff line change
`@@ -1637,7 +1637,7 @@ bool MCDispatch::foreachchildstack(MCStack *p_stack, MCStackForEachCallback p_ca`
`1637`	`1637`	`return t_continue;`
`1638`	`1638`	`}`
`1639`	`1639`
`1640`		`-MCStack *MCDispatch::findstackwindowid(uint32_t p_win_id)`
	`1640`	`+MCStack *MCDispatch::findstackwindowid(uintptr_t p_win_id)`
`1641`	`1641`	`{`
`1642`	`1642`	`if (p_win_id == 0)`
`1643`	`1643`	`return NULL;`
`@@ -1686,7 +1686,7 @@ MCStack *MCDispatch::findstackwindowid(uint32_t p_win_id)`
`1686`	`1686`	`MCStack *MCDispatch::findstackd(Window w)`
`1687`	`1687`	`{`
`1688`	`1688`	`// IM-2014-07-09: [[ Bug 12225 ]] Use window ID to find stack`
`1689`		`- return findstackwindowid(MCscreen->dtouint4((Drawable)w));`
	`1689`	`+ return findstackwindowid(MCscreen->dtouint((Drawable)w));`
`1690`	`1690`	`}`
`1691`	`1691`
`1692`	`1692`	`MCObject *MCDispatch::getobjid(Chunk_term type, uint4 inid)`
Original file line number	Diff line number	Diff line change
`@@ -882,12 +882,12 @@ void MCScreenDC::setfunction(uint4 rop)`
`882`	`882`	`XSetFunction(dpy, getgc(), rop);`
`883`	`883`	`}`
`884`	`884`
`885`		`-uint4 MCScreenDC::dtouint4(Drawable d)`
	`885`	`+uintptr_t MCScreenDC::dtouint(Drawable d)`
`886`	`886`	`{`
`887`	`887`	`return d;`
`888`	`888`	`}`
`889`	`889`
`890`		`-Boolean MCScreenDC::uint4towindow(uint4 id, Window &w)`
	`890`	`+Boolean MCScreenDC::uinttowindow(uintptr_t id, Window &w)`
`891`	`891`	`{`
`892`	`892`	`w = id;`
`893`	`893`	`return True;`
Original file line number	Diff line number	Diff line change
`@@ -687,15 +687,15 @@ void MCScreenDC::freecursor(MCCursorRef c)`
`687`	`687`
`688`	`688`	`////////////////////////////////////////////////////////////////////////////////`
`689`	`689`
`690`		`-uint4 MCScreenDC::dtouint4(Drawable d)`
	`690`	`+uintptr_t MCScreenDC::dtouint(Drawable d)`
`691`	`691`	`{`
`692`	`692`	`if (d == DNULL)`
`693`	`693`	`return 0;`
`694`	`694`
`695`		`- return (uint4)d -> handle . pixmap;`
	`695`	`+ return (uintptr_t)d -> handle . pixmap;`
`696`	`696`	`}`
`697`	`697`
`698`		`-Boolean MCScreenDC::uint4towindow(uint4, Window &w)`
	`698`	`+Boolean MCScreenDC::uinttowindow(uintptr_t, Window &w)`
`699`	`699`	`{`
`700`	`700`	`return False;`
`701`	`701`	`}`