From 3546ffaefd86c951923ba0d2944b4da474467512 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 4 Aug 2003 13:13:21 +0000 Subject: [PATCH] fixed version number expansion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dynlib.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 989138706e..06432ca987 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -449,23 +449,25 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name, if ( !suffix.empty() ) suffix = wxString(_T("_")) + suffix; +#define WXSTRINGIZE(x) #x #ifdef __UNIX__ #if (wxMINOR_VERSION % 2) == 0 - #define wxDLLVER(x,y,z) "-" #x "." #y + #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) #else - #define wxDLLVER(x,y,z) "-" #x "." #y "." #z + #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) "." WXSTRINGIZE(z) #endif #else #if (wxMINOR_VERSION % 2) == 0 - #define wxDLLVER(x,y,z) #x #y + #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) #else - #define wxDLLVER(x,y,z) #x #y #z + #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) WXSTRINGIZE(z) #endif #endif suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)); #undef wxDLLVER +#undef WXSTRINGIZE return CanonicalizeName(name + suffix, wxDL_MODULE); } -- 2.45.2