diff options
author | joerg <joerg@pkgsrc.org> | 2013-02-26 10:25:38 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-02-26 10:25:38 +0000 |
commit | c4c11afd13e7181bbe58bb76f1959e6d43396d9c (patch) | |
tree | 2d1c107eddb0b276339b505695a6840a401e2986 /devel/fhist/patches | |
parent | 40aaa6c72576545f629cc945049539723ed62b40 (diff) | |
download | pkgsrc-c4c11afd13e7181bbe58bb76f1959e6d43396d9c.tar.gz |
Don't use extern inline with Clang as the redefinitions conflict with C99.
Diffstat (limited to 'devel/fhist/patches')
-rw-r--r-- | devel/fhist/patches/patch-common_input.h | 13 | ||||
-rw-r--r-- | devel/fhist/patches/patch-common_output.h | 13 |
2 files changed, 26 insertions, 0 deletions
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); } |