From: Rafael L. <rla...@us...> - 2004-03-18 14:46:38
|
Update of /cvsroot/octave/octave-forge/main/geometry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14536 Modified Files: __voronoi__.cc configure.add convhulln.cc delaunayn.cc Log Message: [RL for Dirk Eddelbuettel] Applied patch from Dirk for the Debian octave-forge package. From the debian/changelog: * main/geometry/{convhulln,delaunayn,voronoi}.cc: Change version identifier declaration to `char *qh_version' to match libqhull5 Index: __voronoi__.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/geometry/__voronoi__.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- __voronoi__.cc 14 Dec 2003 16:53:48 -0000 1.5 +++ __voronoi__.cc 18 Mar 2004 14:36:58 -0000 1.6 @@ -35,7 +35,7 @@ #endif #include <octave/oct.h> -char qh_version[] = "__voronoi__.oct 2003-12-14"; +char *qh_version = "__voronoi__.oct 2003-12-14"; FILE *outfile = stdout; FILE *errfile = stderr; char flags[250]; Index: delaunayn.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/geometry/delaunayn.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- delaunayn.cc 24 Jan 2004 17:42:18 -0000 1.7 +++ delaunayn.cc 18 Mar 2004 14:36:58 -0000 1.8 @@ -39,7 +39,7 @@ #endif #include <octave/oct.h> -char qh_version[] = "delaunayn.oct 2003-12-14"; +char *qh_version = "delaunayn.oct 2003-12-14"; FILE *outfile = stdout; FILE *errfile = stderr; char flags[250]; Index: configure.add =================================================================== RCS file: /cvsroot/octave/octave-forge/main/geometry/configure.add,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- configure.add 29 Apr 2002 14:19:51 -0000 1.6 +++ configure.add 18 Mar 2004 14:36:58 -0000 1.7 @@ -12,14 +12,15 @@ [changequote(, )dnl cat > conftest.c <<EOF #include <stdio.h> -#include <qhull/qhull.h> -char qh_version[] = "version"; +#include <qhull/qhull_a.h> +char *qh_version = "version"; int main(argc, argv) int argc; char *argv[]; { - qh_qhull(); + qh_init_A (NULL, NULL, NULL, 0, NULL); +/* qh_qhull();*/ return 0; } EOF Index: convhulln.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/geometry/convhulln.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- convhulln.cc 14 Dec 2003 16:53:48 -0000 1.7 +++ convhulln.cc 18 Mar 2004 14:36:58 -0000 1.8 @@ -29,7 +29,7 @@ #endif #include <octave/oct.h> -char qh_version[] = "convhulln.oct 2003-12-14"; +char *qh_version = "convhulln.oct 2003-12-14"; char flags[250]; const char *options; |