Mercurial > pytave
changeset 421:24555fba9964
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.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 04 May 2017 13:22:20 -0700 |
parents | 7864849e84c2 |
children | 8247f298fd16 |
files | oct-py-eval.cc oct-py-types.cc oct-py-util.cc pycall.cc pyeval.cc pyexec.cc |
diffstat | 6 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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>
--- 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"
--- 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"