Merge branch 'master' into develop

Juniper · Nov 5, 2019 · b99480a · b99480a
2 parents 56ee830 + d5330b1
commit b99480a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [1.2.0], [phil@juniper.net])
+AC_INIT([libxo], [1.3.0], [phil@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

diff --git a/libxo/libxo.c b/libxo/libxo.c
@@ -8107,7 +8107,7 @@ xo_parse_args (int argc, char **argv)
 
     /* GNU tools add an annoying ".test" as the program extension; remove it */
     size_t len = strlen(xo_program);
-    const static char gnu_ext[] = ".test";
+    static const char gnu_ext[] = ".test";
     if (len >= sizeof(gnu_ext)) {
 	cp = &cp[len + 1 - sizeof(gnu_ext)];
 	if (xo_streq(cp, gnu_ext))