From: stevenj <stevenj@alum.mit.edu>
Date: Sat, 12 Apr 2008 04:59:15 +0000 (-0400)
Subject: don't export "subplex" symbol to avoid conflict with libctl
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bf584c5f5b5b0641089c154fd17055fa7e9857fb;p=nlopt.git

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 e0251f4..adb5a40 100644
--- 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 8695508..35a5a36 100644
--- 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 f6f79ab..0a7f1dc 100644
--- 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);