pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/cad/fastcap Do not use stime as a variable name, becau...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bca5d8dd26c4
branches:  trunk
changeset: 476630:bca5d8dd26c4
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Jun 16 15:33:00 2004 +0000

description:
Do not use stime as a variable name, because it conflicts with
stime(2) on Linux.

diffstat:

 cad/fastcap/distinfo         |   3 ++-
 cad/fastcap/patches/patch-ae |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r aaf4ac6575f9 -r bca5d8dd26c4 cad/fastcap/distinfo
--- a/cad/fastcap/distinfo      Wed Jun 16 12:46:14 2004 +0000
+++ b/cad/fastcap/distinfo      Wed Jun 16 15:33:00 2004 +0000
@@ -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-ab) = 4336ebcb0ba385e6937129735653db20d48d186f
 SHA1 (patch-ac) = d1f207e0921e0a0b4f86234277153a9d6d736ccf
 SHA1 (patch-ad) = a9d971f0990d5cf04651afd73689170ce1eb0f13
+SHA1 (patch-ae) = fd04e26454f89661a02e37fc51770746af108fd1
diff -r aaf4ac6575f9 -r bca5d8dd26c4 cad/fastcap/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/fastcap/patches/patch-ae      Wed Jun 16 15:33:00 2004 +0000
@@ -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 */



Home | Main Index | Thread Index | Old Index