don't export "subplex" symbol to avoid conflict with libctl

darcs-hash:20080412045915-c8de0-b5c8ffed2176186dce57b2ba246ebd644c701f2e.gz

diff --git a/api/nlopt.c b/api/nlopt.c
index e0251f4a1d8d67b664af01c4c36ecb1a51f16a89..adb5a403b0cbdfa1ad2ddc7c2cc9abfff7587750 100644 (file)
--- a/api/nlopt.c
+++ b/api/nlopt.c
@@ -293,7 +293,7 @@ static nlopt_result nlopt_minimize_(
                   else
                        scale[i] = 0.01 * x[i] + 0.0001;
              }
-             iret = subplex(f_subplex, minf, x, n, &d, &stop, scale);
+             iret = nlopt_subplex(f_subplex, minf, x, n, &d, &stop, scale);
              free(scale);
              switch (iret) {
                  case -2: return NLOPT_INVALID_ARGS;

diff --git a/subplex/subplex.c b/subplex/subplex.c
index 8695508779ea86261564380f4f910503988aeebf..35a5a36f54fc0598ea21025efc17033ea8d40273 100644 (file)
--- a/subplex/subplex.c
+++ b/subplex/subplex.c
@@ -2185,7 +2185,7 @@ L120:
             = 20 : ftol reached
             = -200 : out of memory
 */
-int subplex(subplex_func f, double *minf, double *x, int n, void *fdata,
+int nlopt_subplex(subplex_func f, double *minf, double *x, int n, void *fdata,
            nlopt_stopping *stop,
            const double *scale)
 {

diff --git a/subplex/subplex.h b/subplex/subplex.h
index f6f79abd96412eb1b9be3a92426b850dc4b98947..0a7f1dc8efe154c408780afce63f59544db16b78 100644 (file)
--- a/subplex/subplex.h
+++ b/subplex/subplex.h
@@ -10,7 +10,7 @@ extern "C"
 
 typedef double (*subplex_func)(int n, const double *x, void *func_data);
 
-extern int subplex(subplex_func f, double *minf, double *x, int n, void *fdata,
+extern int nlopt_subplex(subplex_func f, double *minf, double *x, int n, void *fdata,
                   nlopt_stopping *stop,
                   const double *scale);