Mercurial > octave

changeset 25365:e875f4719718

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 10 May 2018 19:08:10 -0400
parents 1f4ea87988a2 (current diff) bbc47fb89973 (diff)
children 2dad85fe6b8b
files
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/f77-fcn.h	Wed May 09 20:29:36 2018 +0200
+++ b/liboctave/util/f77-fcn.h	Thu May 10 19:08:10 2018 -0400
@@ -235,7 +235,11 @@
 #define F77_CONST_CHAR_ARG2(x, l) F77_CHAR_ARG2 (x, l)
 #define F77_CXX_STRING_ARG(x) F77_CONST_CHAR_ARG2 (x.c_str (), x.length ())
 #define F77_CHAR_ARG_LEN(l) , l
-#define F77_CHAR_ARG_LEN_TYPE int
+#if defined (__GNUC__) && __GNUC__ >= 8
+#  define F77_CHAR_ARG_LEN_TYPE size_t
+#else
+#  define F77_CHAR_ARG_LEN_TYPE int
+#endif
 #define F77_CHAR_ARG_LEN_DECL , F77_CHAR_ARG_LEN_TYPE
 #define F77_CHAR_ARG_DECL char *
 #define F77_CONST_CHAR_ARG_DECL const char *