chiark
/
gitweb
/
~ianmdlvl
/
nlopt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
258602a
)
add missing Windows exporting junk for nlopt_algorithm_name; thanks to Ofek Shilon...
author
stevenj
<stevenj@alum.mit.edu>
Mon, 6 Sep 2010 17:56:43 +0000
(13:56 -0400)
committer
stevenj
<stevenj@alum.mit.edu>
Mon, 6 Sep 2010 17:56:43 +0000
(13:56 -0400)
darcs-hash:
20100906175643
-c8de0-
dc82178a1444e3cf632cb44d405483d720e82163
.gz
api/general.c
patch
|
blob
|
history
api/nlopt.h
patch
|
blob
|
history
diff --git
a/api/general.c
b/api/general.c
index cff5068295a78d5e020a672c8bb11aaeee591919..7ea130684e4ce6b053e274ec226fb12816623dbc 100644
(file)
--- a/
api/general.c
+++ b/
api/general.c
@@
-98,7
+98,7
@@
static const char nlopt_algorithm_names[NLOPT_NUM_ALGORITHMS][256] = {
"Sequential Quadratic Programming (SQP) (local, derivative)",
};
"Sequential Quadratic Programming (SQP) (local, derivative)",
};
-const char *nlopt_algorithm_name(nlopt_algorithm a)
+const char *
NLOPT_STDCALL
nlopt_algorithm_name(nlopt_algorithm a)
{
if (((int) a) < 0 || a >= NLOPT_NUM_ALGORITHMS) return "UNKNOWN";
return nlopt_algorithm_names[a];
{
if (((int) a) < 0 || a >= NLOPT_NUM_ALGORITHMS) return "UNKNOWN";
return nlopt_algorithm_names[a];
diff --git
a/api/nlopt.h
b/api/nlopt.h
index d928a470566a750508b7a9f7c016b07805371d77..2e5fc4ba63b9a444bf2d98aaee044584c033b037 100644
(file)
--- a/
api/nlopt.h
+++ b/
api/nlopt.h
@@
-146,7
+146,7
@@
typedef enum {
NLOPT_NUM_ALGORITHMS /* not an algorithm, just the number of them */
} nlopt_algorithm;
NLOPT_NUM_ALGORITHMS /* not an algorithm, just the number of them */
} nlopt_algorithm;
-
extern const char *
nlopt_algorithm_name(nlopt_algorithm a);
+
NLOPT_EXTERN(const char *)
nlopt_algorithm_name(nlopt_algorithm a);
typedef enum {
NLOPT_FAILURE = -1, /* generic failure code */
typedef enum {
NLOPT_FAILURE = -1, /* generic failure code */