Mercurial > mxe-octave

comparison src/of-communications-4-fixes.patch @ 4594:43de7d9113e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-communications: don't use config.h
author John W. Eaton <jwe@octave.org>
date Tue, 09 Jan 2018 18:28:11 -0500
parents
children
comparison
equal deleted inserted replaced
4593:705d0432dbf1 4594:43de7d9113e7
1 diff -uNr a/src/base-lu.cc b/src/base-lu.cc
2 --- a/src/base-lu.cc 2018-01-09 18:06:56.797829797 -0500
3 +++ b/src/base-lu.cc 2018-01-09 18:11:42.805590710 -0500
4 @@ -21,10 +21,6 @@
5
6 */
7
8 -#ifdef HAVE_CONFIG_H
9 -#include <config.h>
10 -#endif
11 -
12 #include "base-lu.h"
13
14 template <class lu_type>
15 diff -uNr a/src/configure.ac b/src/configure.ac
16 --- a/src/configure.ac 2018-01-09 18:06:59.461715775 -0500
17 +++ b/src/configure.ac 2018-01-09 18:25:15.510841692 -0500
18 @@ -96,21 +96,5 @@
19 PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_BASE_VALUE_PRINT_CONST=1"
20 fi
21
22 -comm_save_CXXFLAGS=$CXXFLAGS
23 -CXXFLAGS="$CXXFLAGS $comm_CXXFLAGS"
24 -AC_LANG_PUSH(C++)
25 -AC_CHECK_HEADER([octave/ls-oct-ascii.h], [PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_ASCII_H=1"], [],
26 -[
27 -#include <octave/config.h>
28 -#incude <octave/ov.h>
29 -])
30 -AC_CHECK_HEADER([octave/ls-oct-text.h], [PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_TEXT_H=1"], [],
31 -[
32 -#include <octave/config.h>
33 -#include <octave/ov.h>
34 -])
35 -AC_LANG_POP(C++)
36 -CXXFLAGS=$comm_save_CXXFLAGS
37 -
38 AC_CONFIG_FILES([Makefile])
39 AC_OUTPUT
40 diff -uNr a/src/ov-galois.cc b/src/ov-galois.cc
41 --- a/src/ov-galois.cc 2018-01-09 18:06:59.461715775 -0500
42 +++ b/src/ov-galois.cc 2018-01-09 18:24:45.776112372 -0500
43 @@ -29,11 +29,7 @@
44 #include <octave/pr-output.h>
45
46
47 -#if defined(HAVE_OCTAVE_TEXT_H)
48 -# include <octave/ls-oct-text.h>
49 -#else
50 -# include <octave/ls-oct-ascii.h>
51 -#endif
52 +#include <octave/ls-oct-text.h>
53
54 #include "galois.h"
55 #include "ov-galois.h"