Patches for 64bit cleanliness
This commit is contained in:
parent
bd48a35ebe
commit
684dd7d6cc
6 changed files with 78 additions and 3 deletions
|
@ -1,9 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2005/10/17 19:45:18 is Exp $
|
||||
#
|
||||
|
||||
PKGNAME= mpd-1.0.1
|
||||
DISTNAME= mpd.1.0.1
|
||||
#PKGREVISION= 0
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= lang parallel
|
||||
MASTER_SITES= http://www.cs.arizona.edu/mpd/download/
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.1.1.1 2005/10/17 16:16:48 is Exp $
|
||||
$NetBSD: distinfo,v 1.2 2005/10/17 19:45:18 is Exp $
|
||||
|
||||
SHA1 (mpd.1.0.1.tgz) = 797b505935ccc741fdca6010bc0bd53601a6f262
|
||||
RMD160 (mpd.1.0.1.tgz) = 2862ae9220ec0a546ed4193aeee4dc8dc94610a2
|
||||
|
@ -13,5 +13,9 @@ SHA1 (patch-av) = b10aa333ecf77e29933256117a9c4d27792993bd
|
|||
SHA1 (patch-aw) = d0efc58da58fb601257d4c108f4acc50ae05cbf9
|
||||
SHA1 (patch-ax) = daa27e66622a693cf860e3fbf7569a9363a81354
|
||||
SHA1 (patch-ay) = 1621ca66dfbece6bc82fc709fd2c507abb64abae
|
||||
SHA1 (patch-az) = 1560c8ea0b760e2fb97385e565d87a49a879c6a2
|
||||
SHA1 (patch-ba) = 21de20ed7f9e064a988cf091253ae7a5ad962487
|
||||
SHA1 (patch-bb) = 6214584bde5a05386d0f31690b30a9c0a8c299af
|
||||
SHA1 (patch-bc) = be4f8c47486c5b6933494f4e92fd8c340425a167
|
||||
SHA1 (patch-bi) = 31fc9eb664dd3e73c7fe12ae6e95fd85b67286fc
|
||||
SHA1 (patch-bk) = ffbcc49346ea57a3fd0eed51d7bb00f80e25f3a5
|
||||
|
|
13
lang/mpd/patches/patch-az
Normal file
13
lang/mpd/patches/patch-az
Normal file
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-az,v 1.1 2005/10/17 19:45:18 is Exp $
|
||||
|
||||
--- csw/cstest.c.orig 1999-07-28 20:42:21.000000000 +0000
|
||||
+++ csw/cstest.c
|
||||
@@ -315,7 +315,7 @@ int m, n;
|
||||
label = "";
|
||||
printf ("%s ---------------------------------------\n", label);
|
||||
while (p <= q) {
|
||||
- printf ("\t%08X (%2d) %08X ", (int) p, p - addr, i = * (int *) p);
|
||||
+ printf ("\t%p (%2d) %08X ", p, p - addr, i = * (int *) p);
|
||||
c = toascii (*p++); putchar (isprint (c) ? c : '.');
|
||||
c = toascii (*p++); putchar (isprint (c) ? c : '.');
|
||||
c = toascii (*p++); putchar (isprint (c) ? c : '.');
|
32
lang/mpd/patches/patch-ba
Normal file
32
lang/mpd/patches/patch-ba
Normal file
|
@ -0,0 +1,32 @@
|
|||
$NetBSD: patch-ba,v 1.1 2005/10/17 19:45:18 is Exp $
|
||||
|
||||
--- rts/misc.c.orig 2005-03-02 13:56:52.000000000 +0000
|
||||
+++ rts/misc.c
|
||||
@@ -1,6 +1,7 @@
|
||||
/* misc.c -- miscellaneous routines supporting the generated code */
|
||||
|
||||
#include <stdarg.h>
|
||||
+#include <stdint.h>
|
||||
#include "rts.h"
|
||||
|
||||
|
||||
@@ -24,7 +25,7 @@ mpd_cat (String *slist, ...)
|
||||
n = 0; /* total the string lengths */
|
||||
va_start (ap, slist);
|
||||
for (s = slist; s != NULL; s = va_arg (ap, String *))
|
||||
- if ((int) s & 1)
|
||||
+ if ((intptr_t) s & 1)
|
||||
n++; /* char argument */
|
||||
else
|
||||
n += s->length; /* String argument */
|
||||
@@ -37,8 +38,8 @@ mpd_cat (String *slist, ...)
|
||||
p = DATA (t);
|
||||
va_start (ap, slist);
|
||||
for (s = slist; s != NULL; s = va_arg (ap, String *))
|
||||
- if ((int) s & 1) { /* for each input string: */
|
||||
- *p++ = (int) s >> 2; /* copy in char argument */
|
||||
+ if ((intptr_t) s & 1) { /* for each input string: */
|
||||
+ *p++ = (intptr_t) s >> 2; /* copy in char argument */
|
||||
} else {
|
||||
memcpy (p, DATA (s), s->length); /* copy into new string */
|
||||
p += s->length; /* advance pointer*/
|
13
lang/mpd/patches/patch-bb
Normal file
13
lang/mpd/patches/patch-bb
Normal file
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-bb,v 1.1 2005/10/17 19:45:18 is Exp $
|
||||
|
||||
--- rts/socket.c.orig 2005-03-02 14:17:00.000000000 +0000
|
||||
+++ rts/socket.c
|
||||
@@ -278,7 +278,7 @@ Pach ph;
|
||||
|
||||
int n, result, my_currfd;
|
||||
static struct sockaddr sockbuff;
|
||||
- static size_t buffsize;
|
||||
+ static socklen_t buffsize;
|
||||
static fd_set readyset; /* fd's with input available. Fortunately,
|
||||
* the only place this is assigned to is
|
||||
* already protected. */
|
13
lang/mpd/patches/patch-bc
Normal file
13
lang/mpd/patches/patch-bc
Normal file
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-bc,v 1.1 2005/10/17 19:45:18 is Exp $
|
||||
|
||||
--- rts/scan.c.orig 2003-11-21 21:00:01.000000000 +0100
|
||||
+++ rts/scan.c
|
||||
@@ -7,7 +7,7 @@
|
||||
static int scanToken (), scanInteger (), scanReal (), scanPointer ();
|
||||
static int scanTokenFromSet ();
|
||||
|
||||
-#define BACKCH(c,f,S,s) (S ? ((s>DATA (S)) ? (s)-- : 0) : (char*)ungetc (c, f))
|
||||
+#define BACKCH(c,f,S,s) (S ? ((s>DATA (S)) ? (s)--,0 : 0) : ungetc (c, f))
|
||||
#define NEXTCH(l,f,S,s) (S ? ((*s=='\0') ? EOF : * (Char*)(s)++) : INCH (l, f))
|
||||
|
||||
#define SCAN_LEN 50
|
Loading…
Reference in a new issue