diff options
Diffstat (limited to 'math/octave/patches/patch-libgnu_string.in.h')
| -rw-r--r-- | math/octave/patches/patch-libgnu_string.in.h | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/math/octave/patches/patch-libgnu_string.in.h b/math/octave/patches/patch-libgnu_string.in.h index a089878d881..4a5bdf90ebe 100644 --- a/math/octave/patches/patch-libgnu_string.in.h +++ b/math/octave/patches/patch-libgnu_string.in.h @@ -1,8 +1,26 @@ -$NetBSD: patch-libgnu_string.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgnu_string.in.h,v 1.3 2016/03/01 20:13:19 joerg Exp $ + +The "split" include guards fails miserable on NetBSD since by default +string.h will include strings.h, which goes back to string.h. Now due to +the lovely magic here, the rest of the file will be processed before the +real header. --- libgnu/string.in.h.orig 2015-05-23 14:36:17.000000000 +0000 +++ libgnu/string.in.h -@@ -184,6 +184,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un +@@ -22,11 +22,8 @@ + #endif + @PRAGMA_COLUMNS@ + +-/* The include_next requires a split double-inclusion guard. */ +-#@INCLUDE_NEXT@ @NEXT_STRING_H@ +- +-#ifndef _@GUARD_PREFIX@_STRING_H + #define _@GUARD_PREFIX@_STRING_H ++#@INCLUDE_NEXT@ @NEXT_STRING_H@ + + /* NetBSD 5.0 mis-defines NULL. */ + #include <stddef.h> +@@ -184,6 +181,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un #endif /* Search backwards through a block for a byte (specified as an int). */ @@ -15,7 +33,7 @@ $NetBSD: patch-libgnu_string.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) -@@ -210,6 +216,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un +@@ -210,6 +213,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un "use gnulib module memrchr for portability"); # endif #endif @@ -23,3 +41,8 @@ $NetBSD: patch-libgnu_string.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ /* Find the first occurrence of C in S. More efficient than memchr(S,C,N), at the expense of undefined behavior if C does not +@@ -1026,4 +1030,3 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp + + + #endif /* _@GUARD_PREFIX@_STRING_H */ +-#endif /* _@GUARD_PREFIX@_STRING_H */ |