diff options
| author | joerg <joerg> | 2013-02-26 10:25:38 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-02-26 10:25:38 +0000 |
| commit | 6531ae855ec3ce63ba7d52b61a6bd2f41bfafb74 (patch) | |
| tree | 2d1c107eddb0b276339b505695a6840a401e2986 /devel/fhist | |
| parent | e8555b5ff7cbbe855ecfe998c644d2379f15b937 (diff) | |
| download | pkgsrc-6531ae855ec3ce63ba7d52b61a6bd2f41bfafb74.tar.gz | |
Don't use extern inline with Clang as the redefinitions conflict with C99.
Diffstat (limited to 'devel/fhist')
| -rw-r--r-- | devel/fhist/distinfo | 4 | ||||
| -rw-r--r-- | devel/fhist/patches/patch-common_input.h | 13 | ||||
| -rw-r--r-- | devel/fhist/patches/patch-common_output.h | 13 |
3 files changed, 29 insertions, 1 deletions
diff --git a/devel/fhist/distinfo b/devel/fhist/distinfo index fed01efad35..b5e9a7e8505 100644 --- a/devel/fhist/distinfo +++ b/devel/fhist/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.4 2007/02/05 00:33:58 obache Exp $ +$NetBSD: distinfo,v 1.5 2013/02/26 10:25:38 joerg Exp $ SHA1 (fhist-1.16.tar.gz) = e8d4f353240bde8afd48862d9b225c410e47c11e RMD160 (fhist-1.16.tar.gz) = 234ae94aeb9638453ac6ba4aebbe66b3af36f24a Size (fhist-1.16.tar.gz) = 383180 bytes +SHA1 (patch-common_input.h) = c72555eaf8dad73406531b2933314c22c67784b2 +SHA1 (patch-common_output.h) = ea2b35c288892e6a509318501bc2b537b3837ee9 diff --git a/devel/fhist/patches/patch-common_input.h b/devel/fhist/patches/patch-common_input.h new file mode 100644 index 00000000000..9de597bc557 --- /dev/null +++ b/devel/fhist/patches/patch-common_input.h @@ -0,0 +1,13 @@ +$NetBSD: patch-common_input.h,v 1.1 2013/02/26 10:25:38 joerg Exp $ + +--- common/input.h.orig 2013-02-25 17:15:19.000000000 +0000 ++++ common/input.h +@@ -67,7 +67,7 @@ struct output_ty; /* existence */ + void input_to_output(input_ty *, struct output_ty *); + struct string_ty *input_one_line(input_ty *); + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__clang__) + extern __inline long input_read(input_ty *fp, void *data, long len) + { if (len <= 0) return 0; if (fp->pushback_len > 0) { + fp->pushback_len--; *(char *)data = fp->pushback_buf[ diff --git a/devel/fhist/patches/patch-common_output.h b/devel/fhist/patches/patch-common_output.h new file mode 100644 index 00000000000..7d279c495a8 --- /dev/null +++ b/devel/fhist/patches/patch-common_output.h @@ -0,0 +1,13 @@ +$NetBSD: patch-common_output.h,v 1.1 2013/02/26 10:25:38 joerg Exp $ + +--- common/output.h.orig 2013-02-25 17:15:42.000000000 +0000 ++++ common/output.h +@@ -74,7 +74,7 @@ void output_fprintf(output_ty *, const c + void output_vfprintf(output_ty *, const char *, va_list); + + #ifndef DEBUG +-#ifdef __GNUC__ ++#if defined(__GNUC__) && !defined(__clang__) + + extern __inline const char *output_filename(output_ty *fp) { return + fp->vptr->filename(fp); } |