Mercurial > octave

diff oct-conf-post.in.h @ 21240:7af5ca01ecac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow octave-config.h to be included unconditionally * oct-conf-post.in.h (OCTAVE_AUTOCONFIG_H_INCLUDED): Rename from OCTAVE_CONFIG_H_INCLUDED. * mk-octave-config-h.sh: Protect contents of generated file with OCTAVE_AUTOCONFIG_H_INCLUDED. * oct-refcount.h: Simply include octave-config.h instead of checking OCTAVE_CONFIG_H_INCLUDED.
author John W. Eaton <jwe@octave.org>
date Wed, 10 Feb 2016 11:57:17 -0500
parents a83e7a384ee0
children 64be7d374f86
line wrap: on
line diff
--- a/oct-conf-post.in.h	Wed Feb 10 11:46:14 2016 -0500
+++ b/oct-conf-post.in.h	Wed Feb 10 11:57:17 2016 -0500
@@ -185,5 +185,9 @@
 
 typedef OCTAVE_IDX_TYPE octave_idx_type;
 
-/* Tag indicating Octave config.h has been included */
-#define OCTAVE_CONFIG_INCLUDED 1
+/* Tag indicating Octave's autoconf-generated config.h has been
+   included.  This symbol is provided because autoconf-generated
+   config.h files do not define a multiple-inclusion guard.  See also
+   the notes at the top of the generated octave-config.h file.  */
+
+#define OCTAVE_AUTOCONFIG_H_INCLUDED 1