2.4.1 release: use cdecl, not stdcall, on Win32

diff --git a/NEWS b/NEWS
index 57e0f6e4d9ae00cf05a5c622c3f87f50874a8efc..29928ae5768affed18c1313045b2958ba5b5dbab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+NLopt 2.4.1 (19 November 2013)
+
+* Use cdecl calling convention instead of stdcall on Win32, to
+  simplify shared-library usage and for consistency with Win64.
+
 NLopt 2.4 (2 November 2013)
 
 * New genetic algorithm ESCH, thanks to Carlos Henrique da Silva Santos.

diff --git a/api/nlopt.h b/api/nlopt.h
index beb7fa9280ec8a610ce886ccb5b2370362bc940c..16696c8a6718c7eefb8897f65bfef90e70294f94 100644 (file)
--- a/api/nlopt.h
+++ b/api/nlopt.h
@@ -25,9 +25,8 @@
 
 #include <stddef.h> /* for ptrdiff_t and size_t */
 
-/* use stdcall convention under Windows, since this seems to
-   be more standard there and is important for calling from .NET */
-#if defined(_WIN32) || defined(__WIN32__)
+/* Change 0 to 1 to use stdcall convention under Win32 */
+#if 0 && (defined(_WIN32) || defined(__WIN32__))
 #  if defined(__GNUC__)
 #    define NLOPT_STDCALL __attribute__((stdcall))
 #  elif defined(_MSC_VER) || defined(_ICC) || defined(_STDCALL_SUPPORTED)

diff --git a/configure.ac b/configure.ac
index 217ca0714ab1a6f364de8f7b7fba906678ddc09b..6c7e1ac026b4d12fe3aacb758ac9a99ad224e0db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nlopt, 2.4, stevenj@alum.mit.edu)
+AC_INIT(nlopt, 2.4.1, stevenj@alum.mit.edu)
 AC_CONFIG_SRCDIR(api/nlopt.h)
-SHARED_VERSION_INFO="8:0:8" # CURRENT:REVISION:AGE
+SHARED_VERSION_INFO="8:1:8" # CURRENT:REVISION:AGE
 
 AM_INIT_AUTOMAKE(1.7)
 AM_CONFIG_HEADER(config.h)