# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1455726124 18000
# Node ID c4b9567f9405e95168143708d11ceb734ad12b0b
# Parent  2c93596507feb9837cad44ed4efbcb0f11994439
fix building .oct files that include oct.h

* mk-octave-config-h.sh: Emit definitions for OCTAVE_IMPORT and
OCTAVE_EXPORT.
* oct.h: Don't include config.h.

diff -r 2c93596507fe -r c4b9567f9405 build-aux/mk-octave-config-h.sh
--- a/build-aux/mk-octave-config-h.sh	Wed Feb 17 10:21:08 2016 -0500
+++ b/build-aux/mk-octave-config-h.sh	Wed Feb 17 11:22:04 2016 -0500
@@ -113,13 +113,17 @@
 #endif
 
 #if defined (_MSC_VER)
-#  define OCTAVE_API __declspec(dllimport)
-#  define OCTINTERP_API __declspec(dllimport)
+#  define OCTAVE_EXPORT __declspec(dllexport)
+#  define OCTAVE_IMPORT __declspec(dllimport)
 #else
-#  define OCTAVE_API
-#  define OCTINTERP_API
+   /* All other compilers, at least for now. */
+#  define OCTAVE_EXPORT
+#  define OCTAVE_IMPORT
 #endif
 
+#define OCTAVE_API OCTAVE_IMPORT
+#define OCTINTERP_API OCTAVE_IMPORT
+
 #include <stdint.h>
 EOF
 
diff -r 2c93596507fe -r c4b9567f9405 libinterp/corefcn/oct.h
--- a/libinterp/corefcn/oct.h	Wed Feb 17 10:21:08 2016 -0500
+++ b/libinterp/corefcn/oct.h	Wed Feb 17 11:22:04 2016 -0500
@@ -27,13 +27,7 @@
 
 // Things that are often included to create .oct files.
 
-// config.h needs to be first because it includes #defines that can
-// affect other header files.
-
-#include <config.h>
-
 #include "Matrix.h"
-
 #include "oct-locbuf.h"
 #include "defun-dld.h"
 #include "error.h"