[pkgsrc/trunk]: pkgsrc/games/xdoom Rename static variable to avoid conflict w...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d9243caf518
branches:  trunk
changeset: 518929:3d9243caf518
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 24 13:50:08 2006 +0000

description:
Rename static variable to avoid conflict with time(2).

diffstat:

 games/xdoom/distinfo         |   3 ++-
 games/xdoom/patches/patch-bd |  40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r 7e5abc2dd1d3 -r 3d9243caf518 games/xdoom/distinfo
--- a/games/xdoom/distinfo      Sun Sep 24 13:43:21 2006 +0000
+++ b/games/xdoom/distinfo      Sun Sep 24 13:50:08 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/01/13 00:04:16 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/09/24 13:50:08 joerg Exp $
 
 SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99
 RMD160 (doomsrc.zip) = c88e57b3cc72ca8bbfacbe138f8a3c69a13bf2e1
@@ -35,3 +35,4 @@
 SHA1 (patch-ba) = d8e41ed9d277145cd776ca5dc18e1c82cbefc8b7
 SHA1 (patch-bb) = 28dbedb6209466f5b9ad226e2a5583c3881acae1
 SHA1 (patch-bc) = e55e08d525469b44f96fbd45aeed0bedee0a9d8c
+SHA1 (patch-bd) = 35f01a7d790bb8683a6a4b72581dbe10307c57ed
diff -r 7e5abc2dd1d3 -r 3d9243caf518 games/xdoom/patches/patch-bd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xdoom/patches/patch-bd      Sun Sep 24 13:50:08 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-bd,v 1.1 2006/09/24 13:50:08 joerg Exp $
+
+--- linuxdoom-1.10/wi_stuff.c.orig     2006-09-24 15:46:39.000000000 +0000
++++ linuxdoom-1.10/wi_stuff.c
+@@ -373,7 +373,7 @@ static patch_t*            items;
+ static patch_t*               frags;
+ 
+ // Time sucks.
+-static patch_t*               time;
++static patch_t*               my_time;
+ static patch_t*               par;
+ static patch_t*               sucks;
+ 
+@@ -1456,7 +1456,7 @@ void WI_drawStats(void)
+     V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, FB, sp_secret);
+     WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
+ 
+-    V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, time);
++    V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, my_time);
+     WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time);
+ 
+     if (wbs->epsd < 3)
+@@ -1669,7 +1669,7 @@ void WI_loadData(void)
+     colon = W_CacheLumpName("WICOLON", PU_STATIC); 
+ 
+     // "time"
+-    time = W_CacheLumpName("WITIME", PU_STATIC);   
++    my_time = W_CacheLumpName("WITIME", PU_STATIC);   
+ 
+     // "sucks"
+     sucks = W_CacheLumpName("WISUCKS", PU_STATIC);  
+@@ -1752,7 +1752,7 @@ void WI_unloadData(void)
+     Z_ChangeTag(sp_secret, PU_CACHE);
+     Z_ChangeTag(items, PU_CACHE);
+     Z_ChangeTag(frags, PU_CACHE);
+-    Z_ChangeTag(time, PU_CACHE);
++    Z_ChangeTag(my_time, PU_CACHE);
+     Z_ChangeTag(sucks, PU_CACHE);
+     Z_ChangeTag(par, PU_CACHE);
+