pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/team Make this package build when using gcc 3.3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3ab33abc6145
branches: trunk
changeset: 476545:3ab33abc6145
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Sun Jun 13 17:25:48 2004 +0000
description:
Make this package build when using gcc 3.3.
diffstat:
misc/team/distinfo | 4 +-
misc/team/patches/patch-ab | 54 +++++++++++++++++++++++-----------------------
2 files changed, 29 insertions(+), 29 deletions(-)
diffs (215 lines):
diff -r 6ea66bc71192 -r 3ab33abc6145 misc/team/distinfo
--- a/misc/team/distinfo Sun Jun 13 15:31:19 2004 +0000
+++ b/misc/team/distinfo Sun Jun 13 17:25:48 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/06/13 17:25:48 kristerw Exp $
SHA1 (team-3.1.tar.gz) = e294d0f8e229c0526126e3f99717e9b0096cee1f
Size (team-3.1.tar.gz) = 10932 bytes
SHA1 (patch-aa) = 0fe574aad7892eba608d6d0422e514577f109338
-SHA1 (patch-ab) = d3e24809ce7f969d1d8ce74e0205c7ae5dbf45b7
+SHA1 (patch-ab) = 9c65b88ea96ce3fedc3f70b7fb1bb2cd9c5fcbfa
diff -r 6ea66bc71192 -r 3ab33abc6145 misc/team/patches/patch-ab
--- a/misc/team/patches/patch-ab Sun Jun 13 15:31:19 2004 +0000
+++ b/misc/team/patches/patch-ab Sun Jun 13 17:25:48 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:34 agc Exp $
+$NetBSD: patch-ab,v 1.3 2004/06/13 17:25:48 kristerw Exp $
--- team.c-orig Fri May 22 15:35:25 1998
+++ team.c Fri May 22 15:35:59 1998
@@ -8,8 +8,8 @@
-#define TeamLVOLSZ (1L<<10)
-#define TeamHVOLSZ ((long unsigned) 3 * ((long unsigned) 1 << 30))
-+#define TeamLVOLSZ (off_t unsigned)(1L<<10)
-+#define TeamHVOLSZ ((off_t unsigned) 3 * ((off_t unsigned) 1 << 62))
++#define TeamLVOLSZ (unsigned long long)(1L<<10)
++#define TeamHVOLSZ ((unsigned long long) 3 * ((unsigned long long)1 << 62))
#define TeamLBUFSZ (64) /* Low buffer size */
#define TeamDBUFSZ (60*512) /* Default buffer size */
@@ -58,7 +58,7 @@
int fd;
short status;
- long unsigned size;
-+ off_t unsigned size;
++ unsigned long long size;
};
local Fd FdIn,FdOut;
@@ -67,7 +67,7 @@
fast Fd *fd
_ int ffd
-_ long unsigned size
-+_ off_t unsigned size
++_ unsigned long long size
)
{
fd->status = (ffd >= 0) ? FdOPEN : FdCLOSED;
@@ -76,14 +76,14 @@
}
-local long unsigned FdRetry on((fd,which,done,space)) is
-+local off_t unsigned FdRetry on((fd,which,done,space)) is
++local unsigned long long FdRetry on((fd,which,done,space)) is
(
fast Fd *fd
_ char *which
-_ long unsigned done
-_ long unsigned space
-+_ off_t unsigned done
-+_ off_t unsigned space
++_ unsigned long long done
++_ unsigned long long space
)
{
int tty;
@@ -116,7 +116,7 @@
(
fast address remaining
-_ fast long unsigned available
-+_ fast off_t unsigned available
++_ fast unsigned long long available
)
{
return (remaining < available)
@@ -125,11 +125,11 @@
_ pointer buffer
_ fast address todo
-_ long unsigned done
-+_ off_t unsigned done
++_ unsigned long long done
)
{
- fast long unsigned space;
-+ fast off_t unsigned space;
++ fast unsigned long long space;
fast int bytesRead;
fast address justDone;
@@ -145,11 +145,11 @@
_ pointer buffer
_ fast address todo
-_ long unsigned done
-+_ off_t unsigned done
++_ unsigned long long done
)
{
- fast long unsigned space;
-+ fast off_t unsigned space;
++ fast unsigned long long space;
fast int bytesWritten;
fast address justDone;
@@ -165,7 +165,7 @@
Token token;
short status;
- long unsigned done;
-+ off_t unsigned done;
++ unsigned long long done;
};
local bool StreamSend on((fd,token,status,done)) is
@@ -174,7 +174,7 @@
_ Token token
_ short status
-_ long unsigned done
-+_ off_t unsigned done
++_ unsigned long long done
)
{
fast int n;
@@ -183,7 +183,7 @@
_ Token *tokenp
_ short *statusp
-_ long unsigned *donep
-+_ off_t unsigned *donep
++_ unsigned long long *donep
)
{
fast int n;
@@ -192,7 +192,7 @@
StreamReceive(&guy->upStream,tokenp,statusp,donep)
-local bool GuyStop of((Guy *,char *,long unsigned));
-+local bool GuyStop of((Guy *,char *,off_t unsigned));
++local bool GuyStop of((Guy *,char *,unsigned long long));
local bool GuyStart on((guy,bufsize)) is
(
@@ -201,7 +201,7 @@
Token token;
short status;
- long unsigned done;
-+ off_t unsigned done;
++ unsigned long long done;
bool received;
static int bytesRead,bytesWritten;
@@ -237,7 +237,7 @@
fast Guy *guy
_ char *errormsg
-_ long unsigned done
-+_ off_t unsigned done
++_ unsigned long long done
)
{
Mesg(("GuyStop guy %#o\n",guy));
@@ -248,7 +248,7 @@
- mesg("%lu kilobytes, %lu seconds\r\n",
- done>>10,(long unsigned) (time((time_t *) 0)-origin));
+ mesg("%qu kilobytes, %lu seconds\r\n",
-+ done>>10,(off_t unsigned) (time((time_t *) 0)-origin));
++ done>>10,(unsigned long long) (time((time_t *) 0)-origin));
else if (verbose)
mesg("\n");
}
@@ -267,8 +267,8 @@
_ address bufsize
-_ long unsigned isize
-_ long unsigned osize
-+_ off_t unsigned isize
-+_ off_t unsigned osize
++_ unsigned long long isize
++_ unsigned long long osize
)
{
/*
@@ -329,13 +329,13 @@
}
-local long unsigned atos on((s)) is
-+local off_t unsigned atos on((s)) is
++local unsigned long long atos on((s)) is
(
fast char *s
)
{
- fast unsigned long l;
-+ fast off_t unsigned l;
++ fast unsigned long long l;
for (
s, l = 0L;
@@ -343,7 +343,7 @@
s++
)
- l = l*10L + (long unsigned) (*s-'0');
-+ l = l*10L + (off_t unsigned) (*s-'0');
++ l = l*10L + (unsigned long long) (*s-'0');
if (*s == 'b') l *= (1L<<9);
if (*s == 'k') l *= (1L<<10);
@@ -353,8 +353,8 @@
address bufsize;
- long unsigned isize;
- long unsigned osize;
-+ off_t unsigned isize;
-+ off_t unsigned osize;
++ unsigned long long isize;
++ unsigned long long osize;
int opt;
teamsize = TeamDTEAMSZ;
Home |
Main Index |
Thread Index |
Old Index