From 092ee46f03b0af02dd8129e0e3e4619ed33c2032 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 3 May 2007 15:35:07 +0000 Subject: [PATCH] fixed DLL linking of wxConvLibc etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/strconv.h | 2 +- src/common/strconv.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 4360b7f6a3..0fbe71bfd5 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -442,7 +442,7 @@ private: // instead. #define WX_DECLARE_GLOBAL_CONV(klass, name) \ extern WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr; \ - extern klass* WXDLLIMPEXP_BASE wxGet_##name##Ptr(); \ + extern WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr(); \ inline klass& wxGet_##name() \ { \ if ( !name##Ptr ) \ diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index f2947edfd3..2a0cb613c6 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -3666,7 +3666,7 @@ wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws) #define WX_DEFINE_GLOBAL_CONV2(klass, impl_klass, name, ctor_args) \ WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr = NULL; \ - klass* WXDLLIMPEXP_BASE wxGet_##name##Ptr() \ + WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr() \ { \ static impl_klass name##Obj ctor_args; \ return &name##Obj; \ -- 2.50.0