diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-13 16:11:20 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-13 14:54:14 +0000 |
commit | 2cdc693c56c266e149473241e6b3cb54fb2a2a03 (patch) | |
tree | 0c4dc65cfd85858ef1a12db9217830d708e67336 /vcl | |
parent | 80f9ad9011843dbc9d166147402366438bcfe29a (diff) |
Remove __cplusplus-checks from apparently-C++-only files
Change-Id: I87e9ce45cf945e75e8140a9d4608da8abcddada6
Reviewed-on: https://gerrit.libreoffice.org/27187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/unx/i18n_cb.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/window/FWS.hxx | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx index 35b44a02793a..2ab73da7924d 100644 --- a/vcl/inc/unx/i18n_cb.hxx +++ b/vcl/inc/unx/i18n_cb.hxx @@ -22,9 +22,7 @@ #include <salwtype.hxx> #include <vector> -#ifdef __cplusplus extern "C" { -#endif // xim callbacks void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data); @@ -46,9 +44,7 @@ void IM_IMDestroyCallback (XIM im, XPointer client_data, XPointer call_data); Bool IsControlCode(sal_Unicode nChar); -#ifdef __cplusplus } /* extern "C" */ -#endif typedef struct { sal_Unicode *pUnicodeBuffer; diff --git a/vcl/unx/generic/window/FWS.hxx b/vcl/unx/generic/window/FWS.hxx index 93c863f74cef..d9a354456828 100644 --- a/vcl/unx/generic/window/FWS.hxx +++ b/vcl/unx/generic/window/FWS.hxx @@ -22,9 +22,7 @@ #include <X11/Xlib.h> -#if defined(__cplusplus) extern "C" { -#endif /* Initialize our atoms and determine if the current window manager is * providing FWS extension support. @@ -48,9 +46,7 @@ RegisterFwsWindow (Display *display, Window window); void AddFwsProtocols (Display *display, Window window); -#if defined(__cplusplus) } /* extern "C" */ -#endif #endif // INCLUDED_VCL_UNX_GENERIC_WINDOW_FWS_HXX |