Mercurial > octave

diff oct-conf-post.in.h @ 21213:f7d1050b9b53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Clean up various usages of #ifdef. * randmtzig.c: Use #ifdef rather than just #if. * EditControl.h : Use '#if ! defined' rather than '#ifndef' in guard block to match Octave style. * dialog.cc, settings-dialog.cc: Add FIXME notes about questionable use of #if mechanism. * file-editor-tab.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-i.cc, Array-s.cc, MatrixType.h, quit.h, lo-sysdep.cc, lo-cutils.c, oct-alloc.h, oct-shlib.cc, sparse-sort.h: #define HAVE_XXX macros to 1, not just empty but defined. * octave-txt-lexer.h, octave-cmd.h, octave-preserve-stream-state.h, txt-eng.h, zfstream.h, oct-conf-features.h, oct-conf.h: Use octave_ namespace prefix on name of #define used to prevent multiple inclusion of headers. * parser.h, webinfo.h, ov-oncleanup.h, op-int.h, display-available.h, shared-fcns.h: Add #define guard to prevent multiple inclusion. * quadcc.cc: use all capitals for #define MIN_CQUAD_HEAPSIZE. * ov-intx.h: Add note that this file must not use guard #define. * eigs-base.h, randmtzig.h: Write '! defined' rather than '!defined'. * file-ops.cc, oct-sparse.h: Use parentheses around complex #if tests. * oct-syscalls.cc, oct-base64.cc, statdefs.h: Indent #ifdef blocks correctly. * oct-conf-post.in.h: Use "! defined". Define macros to 1, not just empty but defined.
author Rik <rik@octave.org>
date Sat, 06 Feb 2016 18:22:32 -0800
parents 47765afaf131
children 19a619ac9508
line wrap: on
line diff
--- a/oct-conf-post.in.h	Sat Feb 06 19:18:59 2016 -0500
+++ b/oct-conf-post.in.h	Sat Feb 06 18:22:32 2016 -0800
@@ -20,7 +20,7 @@
 
 */
 
-#if !defined (GNULIB_NAMESPACE)
+#if ! defined (GNULIB_NAMESPACE)
 #  define GNULIB_NAMESPACE gnulib
 #endif
 
@@ -37,13 +37,13 @@
 #if defined (__GNUC__)
    /* The following attributes are used with gcc and clang compilers.  */
 #  define OCTAVE_DEPRECATED(msg) __attribute__ ((__deprecated__ (msg)))
-#  define HAVE_ATTR_DEPRECATED
+#  define HAVE_ATTR_DEPRECATED 1
 
 #  define OCTAVE_NORETURN __attribute__ ((__noreturn__))
-#  define HAVE_ATTR_NORETURN
+#  define HAVE_ATTR_NORETURN 1
 
 #  define OCTAVE_UNUSED __attribute__ ((__unused__))
-#  define HAVE_ATTR_UNUSED
+#  define HAVE_ATTR_UNUSED 1
 #else
 #  define OCTAVE_DEPRECATED(msg)
 #  define OCTAVE_NORETURN
@@ -59,8 +59,8 @@
 #endif
 
 #if defined (_MSC_VER)
-#  define __WIN32__
-#  define WIN32
+#  define __WIN32__ 1
+#  define WIN32 1
    /* missing parameters in macros */
 #  pragma warning (disable: 4003)
    /* missing implementations in template instantiation */
@@ -89,7 +89,7 @@
 
 /* sigsetjmp is a macro, not a function. */
 #if defined (sigsetjmp) && defined (HAVE_SIGLONGJMP)
-#  define OCTAVE_HAVE_SIG_JUMP
+#  define OCTAVE_HAVE_SIG_JUMP 1
 #endif
 
 #if defined (_UNICOS)
@@ -175,11 +175,11 @@
 #endif
 
 #if defined (ENABLE_64)
-#  define USE_64_BIT_IDX_T
+#  define USE_64_BIT_IDX_T 1
 #endif
 
 #if defined (ENABLE_OPENMP)
-#  define HAVE_OPENMP
+#  define HAVE_OPENMP 1
 #endif
 
 #if defined (ENABLE_FLOAT_TRUNCATE)