Print out autoconf.h for debugging

diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index 1240c0755f0ed2a0bde81e541b375c0dc7e26743..a6ebaea82ae327b278fc5cd064fff8e075ea6e23 100755 (executable)
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -25,6 +25,9 @@ CFLAGS="${BUILD_CFLAGS}" ./configure -C \
     --with-pcre=$LIBS_OPTIONAL \
     --with-rlm-python-bin=/usr/bin/python2.7   # Otherwise travis picks up /opt/python, which doesn't have .so available
 
+echo "Contents of src/include/autoconf.h"
+cat "./src/include/autoconf.h"
+
 #
 #  Build the server
 #

diff --git a/src/include/conffile.h b/src/include/conffile.h
index 09c1bab155119bf67c52a76b6a43f7953d912623..e0a6030ab357f89fb2081920e3bff37d96e0ec9f 100644 (file)
--- a/src/include/conffile.h
+++ b/src/include/conffile.h
@@ -44,7 +44,13 @@ typedef struct conf_part CONF_SECTION;       //!< #CONF_ITEM used to group multiple #C
 typedef struct conf_data CONF_DATA;    //!< #CONF_ITEM used to associate arbitrary data
                                        ///< with a #CONF_PAIR or #CONF_SECTION.
 
+/*
+ * Dumb hack for GCC which explodes with lots of errors masking the real
+ * error cause, if we don't use typdefs for these structures.
+ */
+typedef struct timeval _timeval_t;
 
+#if defined(HAVE_BUILTIN_CHOOSE_EXPR) && defined(HAVE_C11_GENERIC)
 typedef void _mismatch_vp_tmpl;                //!< Dummy type used to indicate PW_TYPE_*/C type mismatch.
 typedef void _mismatch_vp_tmpl_m;      //!< Dummy type used to indicate PW_TYPE_*/C type mismatch.
 typedef void _mismatch_char;           //!< Dummy type used to indicate PW_TYPE_*/C type mismatch.
@@ -79,13 +85,6 @@ typedef void _mismatch_default;              //!< Dummy type used to indicate PW_TYPE_*/C ty
 typedef void conf_type_mismatch;       //!< Dummy type used to indicate PW_TYPE_*/C type mismatch.
 typedef void conf_type_invalid;                //!< Dummy type used to indicate invalid PW_TYPE_*.
 
-#if defined(HAVE_BUILTIN_CHOOSE_EXPR) && defined(HAVE_C11_GENERIC)
-/*
- * Dumb hack for GCC which explodes with lots of errors masking the real
- * error cause, if we don't use typdefs for these structures.
- */
-typedef struct timeval _timeval_t;
-
 /** Check the type #_t matches the destination data type
  *
  * Validation macro to check the type of the pointer or offset #_p passed in