Review Request 127265: Fix windows build of Ki18n

[Andre Heinecke]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/127265/
-----------------------------------------------------------

(Updated March 3, 2016, 5:49 p.m.)


Review request for KDE Frameworks, Andreas Cord-Landwehr and Kåre Särs.


Changes
-------

used Q_DECL_IMPORT for a portable declaration of \_nl_msg_cat_cntr


Repository: ki18n


Description
-------

In review Request 127048 (Restrict _nl_msg_cat_cntr use to GNU gettext implentations.) Unrelated Windows changes were requested and then introduced which in my opinion were wrong (and in the opinion of my compiler ;-) ).

You can't just do an extern "C" dllimport declaration inside a function body:

src/kcatalog.cpp:190:16: error: expected unqualified-id before string constant
         extern "C" int __declspec(dllimport) _nl_msg_cat_cntr;


Also that patch changed the Logic from an MSVC specific define to general Q_OS_WIN. This appears to be wrong, too. While I'm only testing with MinGW I'm pretty sure that the ifndef _MSC_VER was there for a reason.

This patch reverts the declaration move and logic change while keeping the __USE_GNU_GETTEXT guard.


Diffs (updated)
-----

  src/kcatalog.cpp 083443d 

Diff: https://git.reviewboard.kde.org/r/127265/diff/


Testing
-------

Compiled with mingw and __USE_GNU_GETTEXT for Windows. Also compiled for GNU/Linux.


Thanks,

Andre Heinecke

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20160303/c5e090ba/attachment.html>