39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs octave-4.0.0/libinterp/corefcn/pr-output.cc
|
||
|
|
--- octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 2015-05-23 08:21:53.000000000 -0600
|
||
|
|
+++ octave-4.0.0/libinterp/corefcn/pr-output.cc 2016-02-21 08:59:30.966291273 -0700
|
||
|
|
@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
|
||
|
|
*/
|
||
|
|
|
||
|
|
#ifdef HAVE_CONFIG_H
|
||
|
|
-#include <config.h>
|
||
|
|
+#include "config.h"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#include <cfloat>
|
||
|
|
@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
|
||
|
|
PRINT_INT_SCALAR_INTERNAL (int64_t)
|
||
|
|
PRINT_INT_SCALAR_INTERNAL (uint64_t)
|
||
|
|
|
||
|
|
+inline unsigned int abs (unsigned int x) { return x; }
|
||
|
|
+inline long unsigned int abs (long unsigned int x) { return x; }
|
||
|
|
+inline long long unsigned int abs (long long unsigned int x) { return x; }
|
||
|
|
+inline short unsigned int abs (short unsigned int x) { return x; }
|
||
|
|
+inline unsigned char abs (unsigned char x) { return x; }
|
||
|
|
+inline signed char abs (signed char x) { return abs((int)x); }
|
||
|
|
+inline short int abs (short int x) { return abs((int)x); }
|
||
|
|
+
|
||
|
|
template <class T>
|
||
|
|
/* static */ inline void
|
||
|
|
octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
|
||
|
|
diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh
|
||
|
|
--- octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib 2015-05-23 08:21:53.000000000 -0600
|
||
|
|
+++ octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh 2016-02-19 19:50:04.693811663 -0700
|
||
|
|
@@ -27,6 +27,7 @@
|
||
|
|
#ifndef FADDEEVA_HH
|
||
|
|
#define FADDEEVA_HH 1
|
||
|
|
|
||
|
|
+#include <math.h>
|
||
|
|
#include <complex>
|
||
|
|
|
||
|
|
namespace Faddeeva {
|