annotate src/of-communications-4-fixes.patch @ 4733:1ecb1e67eaa1

* src/src-msys-dos2unix.mk: update checksum
author John Donoghue <john.donoghue@ieee.org>
date Sat, 09 Jun 2018 10:13:46 -0400
parents 43de7d9113e7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4594
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/src/base-lu.cc b/src/base-lu.cc
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/src/base-lu.cc 2018-01-09 18:06:56.797829797 -0500
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/src/base-lu.cc 2018-01-09 18:11:42.805590710 -0500
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -21,10 +21,6 @@
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 */
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -#ifdef HAVE_CONFIG_H
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 -#include <config.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 -#endif
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 -
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 #include "base-lu.h"
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 template <class lu_type>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 diff -uNr a/src/configure.ac b/src/configure.ac
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 --- a/src/configure.ac 2018-01-09 18:06:59.461715775 -0500
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 +++ b/src/configure.ac 2018-01-09 18:25:15.510841692 -0500
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 @@ -96,21 +96,5 @@
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_BASE_VALUE_PRINT_CONST=1"
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 fi
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 -comm_save_CXXFLAGS=$CXXFLAGS
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 -CXXFLAGS="$CXXFLAGS $comm_CXXFLAGS"
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 -AC_LANG_PUSH(C++)
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 -AC_CHECK_HEADER([octave/ls-oct-ascii.h], [PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_ASCII_H=1"], [],
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 -[
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 -#include <octave/config.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 -#incude <octave/ov.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 -])
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 -AC_CHECK_HEADER([octave/ls-oct-text.h], [PKG_CPPFLAGS="$PKG_CPPFLAGS -DHAVE_OCTAVE_TEXT_H=1"], [],
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 -[
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 -#include <octave/config.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 -#include <octave/ov.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 -])
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 -AC_LANG_POP(C++)
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 -CXXFLAGS=$comm_save_CXXFLAGS
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 -
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 AC_CONFIG_FILES([Makefile])
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 AC_OUTPUT
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 diff -uNr a/src/ov-galois.cc b/src/ov-galois.cc
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 --- a/src/ov-galois.cc 2018-01-09 18:06:59.461715775 -0500
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 +++ b/src/ov-galois.cc 2018-01-09 18:24:45.776112372 -0500
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 @@ -29,11 +29,7 @@
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 #include <octave/pr-output.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 -#if defined(HAVE_OCTAVE_TEXT_H)
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 -# include <octave/ls-oct-text.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 -#else
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 -# include <octave/ls-oct-ascii.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 -#endif
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 +#include <octave/ls-oct-text.h>
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 #include "galois.h"
43de7d9113e7 of-communications: don't use config.h
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 #include "ov-galois.h"