Mercurial > hg > octave-lojdl

changeset 6122:f3322fd3c9bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-28 13:56:55 by jwe]
author jwe
date Sat, 28 Oct 2006 13:56:55 +0000
parents 483176585b84
children 8d285942fc3c
files ChangeLog configure.in
diffstat 2 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-27  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* configure.in (AH_BOTTOM): If using MSVC, define __WIN32__ before
+	other #ifdefs that use it.
+
 2006-10-27  John W. Eaton  <jwe@octave.org>
 
 	* configure.in (AH_BOTTOM): Move DLL defs to
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.540 $)
+AC_REVISION($Revision: 1.541 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1825,6 +1825,16 @@
 typedef int sig_atomic_t;
 #endif
 
+#if defined (_MSC_VER)
+#define __WIN32__
+/* missing parameters in macros */
+#pragma warning (disable: 4003)
+/* missing implementations in template instantiation */
+#pragma warning (disable: 4996)
+/* deprecated function names (FIXME?) */
+#pragma warning (disable: 4661)
+#endif
+
 #if defined (__WIN32__) && ! defined (__CYGWIN__)
 #define OCTAVE_HAVE_WINDOWS_FILESYSTEM 1
 #elif defined (__CYGWIN__)
@@ -1888,16 +1898,6 @@
 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT
 #endif
 
-#if defined (_MSC_VER)
-#define __WIN32__
-/* missing parameters in macros */
-#pragma warning (disable: 4003)
-/* missing implementations in template instantiation */
-#pragma warning (disable: 4996)
-/* deprecated function names (FIXME?) */
-#pragma warning (disable: 4661)
-#endif
-
 #include "oct-dlldefs.h"
 #include "oct-types.h"
 ])