Ensure intptr_t is defined in various places.

4 files changed, 21 insertions, 17 deletions

diff --git a/games/xevil/distinfo b/games/xevil/distinfo
index b529a5be754..57bafe0faee 100644
--- a/games/xevil/distinfo
+++ b/games/xevil/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 20:57:08 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/05/07 09:57:53 joerg Exp $
 
 SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc
 RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e
@@ -10,14 +10,14 @@ SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0
 SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749
 SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79
 SHA1 (patch-ag) = c826c7ee631b3661ca78fe243b6aeb1ff37d73e2
-SHA1 (patch-ah) = b78acf6e01bd555024eb1a6a5d80ab8c393de4c5
-SHA1 (patch-ai) = 8579f4f6594ff2d01c35c2becc7cf395a5195550
+SHA1 (patch-ah) = 15c730952ed18425dce6a398eb71bdc17bd822be
+SHA1 (patch-ai) = 22dd40db2b111860090a83314dace236110645e2
 SHA1 (patch-aj) = 78214c3bf9d643f9f8ade8c24944eea6b976ea6c
 SHA1 (patch-ak) = a83854de16104e124213e3990597555c21533411
 SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f
 SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59
 SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237
-SHA1 (patch-ao) = 85f4b0f2238ea1cbfe3ed16a9cd58ed2c64a0da1
+SHA1 (patch-ao) = b6871101e4a5e7c8b83f6754474d74183309375f
 SHA1 (patch-ap) = 7fb4d991f629ee5f36718a047ce4667c563fd95b
 SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983
 SHA1 (patch-ar) = 8be1ce3f1ed2bd55dfc77042fa5f62fc6b036903
diff --git a/games/xevil/patches/patch-ah b/games/xevil/patches/patch-ah
index bb3e3ff8e92..8abfdaa3cf9 100644
--- a/games/xevil/patches/patch-ah
+++ b/games/xevil/patches/patch-ah
@@ -1,10 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2008/08/17 23:50:06 dholland Exp $
+$NetBSD: patch-ah,v 1.3 2016/05/07 09:57:54 joerg Exp $
 
---- cmn/actual.cpp.orig	2000-01-19 12:54:36.000000000 -0500
-+++ cmn/actual.cpp	2008-08-17 19:09:43.000000000 -0400
-@@ -32,7 +32,8 @@
+--- cmn/actual.cpp.orig	2000-01-19 12:54:36.000000000 +0000
++++ cmn/actual.cpp
+@@ -31,8 +31,10 @@
+ #endif
  
  // Include Files
++#include <inttypes.h>
  #if X11
 -#include <strstream.h>
 +#include <strstream>
@@ -12,7 +14,7 @@ $NetBSD: patch-ah,v 1.2 2008/08/17 23:50:06 dholland Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
-@@ -1534,7 +1535,7 @@ Boolean Transmogifier::transmogify_targe
+@@ -1534,7 +1536,7 @@ Boolean Transmogifier::transmogify_targe
                                                   void *closure) {
    // notThis is used to prevent transmogifying into the same class an object
    // already is.
diff --git a/games/xevil/patches/patch-ai b/games/xevil/patches/patch-ai
index 66dc7a1089c..2cc1940240f 100644
--- a/games/xevil/patches/patch-ai
+++ b/games/xevil/patches/patch-ai
@@ -1,12 +1,13 @@
-$NetBSD: patch-ai,v 1.2 2008/08/17 23:50:06 dholland Exp $
+$NetBSD: patch-ai,v 1.3 2016/05/07 09:57:54 joerg Exp $
 
---- cmn/xetp.cpp.orig	2000-01-19 12:54:30.000000000 -0500
-+++ cmn/xetp.cpp	2008-08-17 19:12:24.000000000 -0400
-@@ -29,9 +29,10 @@
+--- cmn/xetp.cpp.orig	2000-01-19 12:54:30.000000000 +0000
++++ cmn/xetp.cpp
+@@ -29,9 +29,11 @@
  
  #include "stdafx.h"
  
 -#include <iostream.h>
++#include <inttypes.h>
 +#include <iostream>
  #if X11
 -#include <strstream.h>
@@ -15,7 +16,7 @@ $NetBSD: patch-ai,v 1.2 2008/08/17 23:50:06 dholland Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
-@@ -159,7 +160,7 @@ void XETP::send_objects(OutStreamP out,c
+@@ -159,7 +161,7 @@ void XETP::send_objects(OutStreamP out,c
    for (n = 0; n < physicals.length(); n++) {
      PhysicalP p = (PhysicalP)physicals.get(n);
      // computing object_length twice, but who cares.
diff --git a/games/xevil/patches/patch-ao b/games/xevil/patches/patch-ao
index 3776bf2ef99..32c180f5980 100644
--- a/games/xevil/patches/patch-ao
+++ b/games/xevil/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.3 2011/11/27 19:43:33 joerg Exp $
+$NetBSD: patch-ao,v 1.4 2016/05/07 09:57:54 joerg Exp $
 
 --- cmn/game_style.cpp.orig	2003-03-22 20:47:42.000000000 +0000
 +++ cmn/game_style.cpp
-@@ -29,19 +29,18 @@
+@@ -29,19 +29,19 @@
  
  // Include Files
  #include "stdafx.h"
@@ -10,6 +10,7 @@ $NetBSD: patch-ao,v 1.3 2011/11/27 19:43:33 joerg Exp $
 -#include <string.h>
 -}
 +#include <cstring>
++#include <inttypes.h>
  
  #if X11
 -#include <strstream.h>
@@ -26,7 +27,7 @@ $NetBSD: patch-ao,v 1.3 2011/11/27 19:43:33 joerg Exp $
  #include "utils.h"
  #include "coord.h"
  #include "world.h"
-@@ -2680,7 +2679,7 @@ int ZigZag::new_level_check(int,WorldP w
+@@ -2680,7 +2680,7 @@ int ZigZag::new_level_check(int,WorldP w
      HumanP human = locator->get_human(n);
      if (human) {
        // previous depth