Cast via ssize_t to make GCC happy. This is still somewhat abusive, but easier than to switch to dynamically allocated int.diff -r1.1.1.1 -r1.2 pkgsrc/ham/fldigi/Makefile
(joerg)
@@ -1,24 +1,26 @@ | @@ -1,24 +1,26 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $ | 1 | # $NetBSD: Makefile,v 1.2 2009/02/15 19:41:10 joerg Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= fldigi-3.03 | 4 | DISTNAME= fldigi-3.03 | |
5 | CATEGORIES= ham | 5 | CATEGORIES= ham | |
6 | MASTER_SITES= http://www.w1hkj.com/fldigi-distro/ | 6 | MASTER_SITES= http://www.w1hkj.com/fldigi-distro/ | |
7 | 7 | |||
8 | MAINTAINER= wulf@NetBSD.org | 8 | MAINTAINER= wulf@NetBSD.org | |
9 | HOMEPAGE= http://www.w1hkj.com/Fldigi.html | 9 | HOMEPAGE= http://www.w1hkj.com/Fldigi.html | |
10 | COMMENT= Digital radio modem | 10 | COMMENT= Digital radio modem | |
11 | 11 | |||
12 | PKG_DESTDIR_SUPPORT= user-destdir | |||
13 | ||||
12 | USE_DIRS+= xdg-1.1 | 14 | USE_DIRS+= xdg-1.1 | |
13 | USE_TOOLS+= gmake pkg-config | 15 | USE_TOOLS+= gmake pkg-config | |
14 | USE_LANGUAGES= c c++ | 16 | USE_LANGUAGES= c c++ | |
15 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
16 | 18 | |||
17 | .include "../../audio/libsndfile/buildlink3.mk" | 19 | .include "../../audio/libsndfile/buildlink3.mk" | |
18 | .include "../../audio/libsamplerate/buildlink3.mk" | 20 | .include "../../audio/libsamplerate/buildlink3.mk" | |
19 | .include "../../audio/portaudio-devel/buildlink3.mk" | 21 | .include "../../audio/portaudio-devel/buildlink3.mk" | |
20 | .include "../../graphics/jpeg/buildlink3.mk" | 22 | .include "../../graphics/jpeg/buildlink3.mk" | |
21 | .include "../../graphics/png/buildlink3.mk" | 23 | .include "../../graphics/png/buildlink3.mk" | |
22 | .include "../../ham/hamlib/buildlink3.mk" | 24 | .include "../../ham/hamlib/buildlink3.mk" | |
23 | .include "../../x11/fltk/buildlink3.mk" | 25 | .include "../../x11/fltk/buildlink3.mk" | |
24 | .include "../../mk/oss.buildlink3.mk" | 26 | .include "../../mk/oss.buildlink3.mk" |
@@ -1,7 +1,8 @@ | @@ -1,7 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $ | 1 | $NetBSD: distinfo,v 1.2 2009/02/15 19:41:10 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (fldigi-3.03.tar.gz) = fcdc0f34fe62b6857c5e02bb8e7a8ecbe6e7050c | 3 | SHA1 (fldigi-3.03.tar.gz) = fcdc0f34fe62b6857c5e02bb8e7a8ecbe6e7050c | |
4 | RMD160 (fldigi-3.03.tar.gz) = 30fa50eee0b00c2a332f8c48999e0183df88f60a | 4 | RMD160 (fldigi-3.03.tar.gz) = 30fa50eee0b00c2a332f8c48999e0183df88f60a | |
5 | Size (fldigi-3.03.tar.gz) = 711226 bytes | 5 | Size (fldigi-3.03.tar.gz) = 711226 bytes | |
6 | SHA1 (patch-aa) = 122d936e7f8bda5466dc252ffe17f501c0f341e8 | 6 | SHA1 (patch-aa) = 122d936e7f8bda5466dc252ffe17f501c0f341e8 | |
7 | SHA1 (patch-ab) = cfca39f1e32e8cd4e15d994a2af4dd5a72e87ab9 | 7 | SHA1 (patch-ab) = cfca39f1e32e8cd4e15d994a2af4dd5a72e87ab9 | |
8 | SHA1 (patch-ac) = def1ee6e6c3f60a2febb029560f3ad7f9c5a3364 |
$NetBSD: patch-ac,v 1.1 2009/02/15 19:41:10 joerg Exp $
--- src/include/threads.h.orig 2009-02-15 19:59:36.000000000 +0100
+++ src/include/threads.h
@@ -87,8 +87,8 @@ enum { UNKNOWN_TID = -1, TRX_TID, QRZ_TI
#else
extern pthread_key_t thread_id_;
# define CREATE_THREAD_ID() pthread_key_create(&thread_id_, 0);
-# define SET_THREAD_ID(x) pthread_setspecific(thread_id_, (void *)(x))
-# define GET_THREAD_ID() (int)pthread_getspecific(thread_id_)
+# define SET_THREAD_ID(x) pthread_setspecific(thread_id_, (const void *)(ssize_t)(x))
+# define GET_THREAD_ID() (int)(ssize_t)pthread_getspecific(thread_id_)
#endif // USE_TLS
#include "fl_lock.h"