# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1493929340 25200
# Node ID 24555fba9964571b305884e1782fbc53ef76edc1
# Parent  7864849e84c2c562a70ed57a2e4cff312aa21c54
Include <Python.h> first to suppress possible redefinition warnings

* oct-py-eval.cc, oct-py-types.cc, oct-py-util.cc, pycall.cc, pyeval.cc,
pyexec.cc: Include <Python.h> before other system and project header files
to suppress possible macro redefinition warnings.  Normalize and reduce use of
Octave header files.

diff -r 7864849e84c2 -r 24555fba9964 oct-py-eval.cc
--- a/oct-py-eval.cc	Thu May 04 12:31:07 2017 -0700
+++ b/oct-py-eval.cc	Thu May 04 13:22:20 2017 -0700
@@ -24,6 +24,7 @@
 #  include <config.h>
 #endif
 
+#include <Python.h>
 #include <string>
 #include <octave/ov.h>
 #include <octave/ovl.h>
diff -r 7864849e84c2 -r 24555fba9964 oct-py-types.cc
--- a/oct-py-types.cc	Thu May 04 12:31:07 2017 -0700
+++ b/oct-py-types.cc	Thu May 04 13:22:20 2017 -0700
@@ -24,6 +24,7 @@
 #  include <config.h>
 #endif
 
+#include <Python.h>
 #include <limits>
 #include <octave/Cell.h>
 #include <octave/oct-map.h>
diff -r 7864849e84c2 -r 24555fba9964 oct-py-util.cc
--- a/oct-py-util.cc	Thu May 04 12:31:07 2017 -0700
+++ b/oct-py-util.cc	Thu May 04 13:22:20 2017 -0700
@@ -24,7 +24,8 @@
 #  include <config.h>
 #endif
 
-#include <oct.h>
+#include <Python.h>
+#include <octave/oct.h>
 #include <octave/parse.h>
 
 #include "exceptions.h"
diff -r 7864849e84c2 -r 24555fba9964 pycall.cc
--- a/pycall.cc	Thu May 04 12:31:07 2017 -0700
+++ b/pycall.cc	Thu May 04 13:22:20 2017 -0700
@@ -24,8 +24,8 @@
 #  include <config.h>
 #endif
 
+#include <Python.h>
 #include <octave/oct.h>
-#include <octave/parse.h>
 
 #include "exceptions.h"
 #include "oct-py-eval.h"
diff -r 7864849e84c2 -r 24555fba9964 pyeval.cc
--- a/pyeval.cc	Thu May 04 12:31:07 2017 -0700
+++ b/pyeval.cc	Thu May 04 13:22:20 2017 -0700
@@ -24,8 +24,8 @@
 #  include <config.h>
 #endif
 
-#include <oct.h>
-#include <octave/parse.h>
+#include <Python.h>
+#include <octave/oct.h>
 
 #include "exceptions.h"
 #include "oct-py-eval.h"
diff -r 7864849e84c2 -r 24555fba9964 pyexec.cc
--- a/pyexec.cc	Thu May 04 12:31:07 2017 -0700
+++ b/pyexec.cc	Thu May 04 13:22:20 2017 -0700
@@ -24,7 +24,8 @@
 #  include <config.h>
 #endif
 
-#include <oct.h>
+#include <Python.h>
+#include <octave/oct.h>
 
 #include "exceptions.h"
 #include "oct-py-eval.h"