diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp --- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp 2008-04-28 12:08:50.000000000 -0500 +++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp 2008-05-01 12:48:01.000000000 -0500 @@ -42,7 +42,8 @@ #include <cstdio> // C standard I/O #include <fstream> // file I/O -#include <string> // string manipulation +#include <cstring> // string manipulation +#include <cstdlib> #include <ANN/ANNx.h> // all ANN includes using namespace std; // make std:: accessible diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/bindings/ann_wrap.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/bindings/ann_wrap.cpp --- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/bindings/ann_wrap.cpp 2008-04-28 12:08:55.000000000 -0500 +++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/bindings/ann_wrap.cpp 2008-05-01 12:48:01.000000000 -0500 @@ -8,6 +8,8 @@ * interface file instead. * ----------------------------------------------------------------------------- */ +#include <cstring> + #define SWIG_name_d "ann" #define SWIG_name ann diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/Make-config octave-forge-bundle-20080429/main/ann-1.0/src/ann/Make-config --- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/Make-config 2008-04-28 12:08:55.000000000 -0500 +++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/Make-config 2008-05-01 12:48:38.000000000 -0500 @@ -72,7 +72,7 @@ $(MAKE) targets \ "ANNLIB = libANN.a" \ "C++ = g++" \ - "CFLAGS = -O3" \ + "CFLAGS = -fPIC -O3" \ "MAKELIB = ar ruv" \ "RANLIB = true" diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/src/kd_dump.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/src/kd_dump.cpp --- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/src/kd_dump.cpp 2008-04-28 12:08:54.000000000 -0500 +++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/src/kd_dump.cpp 2008-05-01 12:48:01.000000000 -0500 @@ -33,6 +33,8 @@ #include "kd_tree.h" // kd-tree declarations #include "bd_tree.h" // bd-tree declarations +#include <cstdlib> +#include <cstring> using namespace std; // make std:: available diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/test/ann_test.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/test/ann_test.cpp --- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/test/ann_test.cpp 2008-04-28 12:08:50.000000000 -0500 +++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/test/ann_test.cpp 2008-05-01 12:48:01.000000000 -0500 @@ -36,8 +36,9 @@ #include <ctime> // clock #include <cmath> // math routines -#include <string> // C string ops +#include <cstring> // C string ops #include <fstream> // file I/O +#include <cstdlib> #include <ANN/ANN.h> // ANN declarations #include <ANN/ANNx.h> // more ANN declarations
