Review Request 127265: Fix windows build of Ki18n

[Aleix Pol Gonzalez]

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




src/kcatalog.cpp (line 150)
<https://git.reviewboard.kde.org/r/127265/#comment63482>

    Wouldn't it be the same to define it like this?
    ```
    #if defined(__USE_GNU_GETTEXT)
    extern "C" int Q_DECL_IMPORT _nl_msg_cat_cntr;
    #endif
    ```
    
    This way we wouldn't have to make special cases for each platform.
    
    I just tried and works here (on Linux+Clang).


- Aleix Pol Gonzalez


On March 3, 2016, 3:29 p.m., Andre Heinecke wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/127265/
> -----------------------------------------------------------
> 
> (Updated March 3, 2016, 3:29 p.m.)
> 
> 
> Review request for KDE Frameworks, Andreas Cord-Landwehr and Kåre Särs.
> 
> 
> 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
> -----
> 
>   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/32ce38a1/attachment-0001.html>