summaryrefslogtreecommitdiff
path: root/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h
diff options
context:
space:
mode:
Diffstat (limited to 'math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h')
-rw-r--r--math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h
index cd4f983b5ad..37a54dd8301 100644
--- a/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h
+++ b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h
@@ -1,15 +1,19 @@
-$NetBSD: patch-liboctave_wrappers_strftime-wrapper.h,v 1.1 2016/11/19 21:53:12 maya Exp $
+$NetBSD: patch-liboctave_wrappers_strftime-wrapper.h,v 1.2 2017/03/15 11:33:03 maya Exp $
-Don't have struct tm_zone (in netbsd), instead use timezone_t as libgnu does
+Octave's wrapper breaks gnulib portability, netbsd doesn't have struct tm_zone,
+use ifdefs to work around it
--- liboctave/wrappers/strftime-wrapper.h.orig 2016-11-13 15:16:10.000000000 +0000
+++ liboctave/wrappers/strftime-wrapper.h
-@@ -35,7 +35,7 @@ extern "C" {
+@@ -35,7 +35,11 @@ extern "C" {
extern size_t
octave_strftime_wrapper (char *buf, size_t len, const char *fmt,
-- const struct tm *t, struct tm_zone *tz, int ns);
++#ifdef __NetBSD__
+ const struct tm *t, timezone_t *tz, int ns);
++#else
+ const struct tm *t, struct tm_zone *tz, int ns);
++#endif
#if defined __cplusplus
}