summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorminskim <minskim>2004-06-16 15:33:00 +0000
committerminskim <minskim>2004-06-16 15:33:00 +0000
commit6c4d1fb8e802c506c8bd26072e727c66ee322220 (patch)
treee28785223c4616c0c6ed5b1c00186bd4b671cfdd /cad
parent49222a8fadd3c3ffeb54adcf4cfe923056b03574 (diff)
downloadpkgsrc-6c4d1fb8e802c506c8bd26072e727c66ee322220.tar.gz
Do not use stime as a variable name, because it conflicts with
stime(2) on Linux.
Diffstat (limited to 'cad')
-rw-r--r--cad/fastcap/distinfo3
-rw-r--r--cad/fastcap/patches/patch-ae24
2 files changed, 26 insertions, 1 deletions
diff --git a/cad/fastcap/distinfo b/cad/fastcap/distinfo
index 5649d676ffb..3a564c922f3 100644
--- a/cad/fastcap/distinfo
+++ b/cad/fastcap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/05/07 01:44:03 danw Exp $
+$NetBSD: distinfo,v 1.6 2004/06/16 15:33:00 minskim Exp $
SHA1 (fastcap/fastcap-2.0-15Jul92.tar.Z) = 256fa1a09ee41ab2bc59cb72730353605b108793
Size (fastcap/fastcap-2.0-15Jul92.tar.Z) = 2528677 bytes
@@ -12,3 +12,4 @@ SHA1 (patch-aa) = 489b5f8716627f9c9297e8d11f1cfb0e1777b3fe
SHA1 (patch-ab) = 4336ebcb0ba385e6937129735653db20d48d186f
SHA1 (patch-ac) = d1f207e0921e0a0b4f86234277153a9d6d736ccf
SHA1 (patch-ad) = a9d971f0990d5cf04651afd73689170ce1eb0f13
+SHA1 (patch-ae) = fd04e26454f89661a02e37fc51770746af108fd1
diff --git a/cad/fastcap/patches/patch-ae b/cad/fastcap/patches/patch-ae
new file mode 100644
index 00000000000..995066da9c1
--- /dev/null
+++ b/cad/fastcap/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.1 2004/06/16 15:33:00 minskim Exp $
+
+--- src/resusage.h.orig 1992-07-15 17:17:48.000000000 -0500
++++ src/resusage.h
+@@ -52,16 +52,16 @@ struct tms timestuff;
+ /* define macros for time and resident memory usage checks */
+
+ static double dtime = 0.0;
+-static long stime, utime;
++static long _stime, utime;
+
+ #ifdef NOTOTHER
+
+ #ifdef FOUR /* 4.2,3BSD (tested: Sun4, IBM6000, DEC5000) */
+ #define starttimer getrusage(RUSAGE_SELF, &timestuff); \
+-stime = timestuff.ru_utime.tv_sec; \
++_stime = timestuff.ru_utime.tv_sec; \
+ utime = timestuff.ru_utime.tv_usec
+ #define stoptimer getrusage(RUSAGE_SELF, &timestuff); \
+-dtime = (double)(timestuff.ru_utime.tv_sec - stime) \
++dtime = (double)(timestuff.ru_utime.tv_sec - _stime) \
+ + 1.0e-6*(double)(timestuff.ru_utime.tv_usec - utime)
+ #define DUMPRSS /* */
+ #endif /* FOUR */