# HG changeset patch
# User Frits van Bommel <fvbommel wxs.nl>
# Date 1237132664 -3600
# Node ID 3d46f7ee466ebd060fc869352a30b9fe5920948e
# Parent  0d38fa5a0b464fe1efdf5d75d125b1d863a96a4f
Apply [1120] to D2 as well (untested).

diff -r 0d38fa5a0b46 -r 3d46f7ee466e dmd2/expression.c
--- a/dmd2/expression.c	Sun Mar 15 15:58:38 2009 +0100
+++ b/dmd2/expression.c	Sun Mar 15 16:57:44 2009 +0100
@@ -1319,11 +1319,17 @@
 	    case Twchar:
 	    case Tuns16:	value = (d_uns16) value;	break;
 	    case Tint32:	value = (d_int32) value;	break;
-	    case Tpointer:
 	    case Tdchar:
 	    case Tuns32:	value = (d_uns32) value;	break;
 	    case Tint64:	value = (d_int64) value;	break;
 	    case Tuns64:	value = (d_uns64) value;	break;
+	    case Tpointer:
+                // FIXME: Other pointer widths than 32 and 64?
+                if (PTRSIZE == 4)
+                    value = (d_uns32) value;
+                else
+                    value = (d_uns64) value;
+                break;
 
 	    case Tenum:
 	    {
@@ -1483,6 +1489,7 @@
 		break;
 
 	    case Tuns64:
+            L4:
 		buf->printf("%lluLU", v);
 		break;
 
@@ -1495,7 +1502,11 @@
 		buf->writestring("cast(");
 		buf->writestring(t->toChars());
 		buf->writeByte(')');
-		goto L3;
+                // FIXME: Other pointer widths than 32 and 64?
+                if (PTRSIZE == 4)
+                    goto L3;
+                else
+                    goto L4;
 
 	    default:
 		/* This can happen if errors, such as