From 3bddb8ec410ae7fbe35cd27a4acb79c9c2e255bf Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Tue, 19 Nov 2013 15:22:31 -0500 Subject: [PATCH] 2.4.1 release: use cdecl, not stdcall, on Win32 --- NEWS | 5 +++++ api/nlopt.h | 5 ++--- configure.ac | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 57e0f6e..29928ae 100644 --- 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 beb7fa9..16696c8 100644 --- a/api/nlopt.h +++ b/api/nlopt.h @@ -25,9 +25,8 @@ #include /* 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 217ca07..6c7e1ac 100644 --- 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) -- 2.30.2