diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 12:41:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 13:01:36 +0100 |
| commit | d90784064f9b993c044615a8bb0fb7ae984d0ded (patch) | |
| tree | 183283d9c0568fc182293f874e4c64d158077d7a /sal | |
| parent | 69770c9791590d45d24cfa100ab89e70e7e6b312 (diff) | |
nlsupport.h -> nlsupport.hxx
Change-Id: Iaee3f8a43cba1d4fd02b6a51d42f73c8ef9e99b7
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/nlsupport.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/nlsupport.hxx (renamed from sal/osl/unx/nlsupport.h) | 12 | ||||
| -rw-r--r-- | sal/osl/unx/osxlocale.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index 7e0eee8856de..03107ef4b1fe 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -21,7 +21,7 @@ #include <osl/diagnose.h> #include <osl/process.h> -#include "nlsupport.h" +#include "nlsupport.hxx" #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \ defined(FREEBSD) || defined(MACOSX) || defined(IOS) || defined(OPENBSD) || \ diff --git a/sal/osl/unx/nlsupport.h b/sal/osl/unx/nlsupport.hxx index 6e243859fe7c..676c00c87b12 100644 --- a/sal/osl/unx/nlsupport.h +++ b/sal/osl/unx/nlsupport.hxx @@ -17,17 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_NLSUPPORT_H -#define INCLUDED_SAL_OSL_UNX_NLSUPPORT_H +#ifndef INCLUDED_SAL_OSL_UNX_NLSUPPORT_HXX +#define INCLUDED_SAL_OSL_UNX_NLSUPPORT_HXX #include <sal/config.h> #include <rtl/locale.h> -#if defined __cplusplus -extern "C" { -#endif - void _imp_getProcessLocale( rtl_Locale ** ); int _imp_setProcessLocale( rtl_Locale * ); @@ -35,10 +31,6 @@ int _imp_setProcessLocale( rtl_Locale * ); int macosx_getLocale(char *locale, sal_uInt32 bufferLen); #endif -#if defined __cplusplus -} -#endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx index a64238ec6767..d2fbdb5f22af 100644 --- a/sal/osl/unx/osxlocale.cxx +++ b/sal/osl/unx/osxlocale.cxx @@ -27,7 +27,7 @@ #include <CoreFoundation/CoreFoundation.h> #include <postmac.h> -#include <nlsupport.h> +#include <nlsupport.hxx> namespace { diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index c70e11141e74..b632d440dc15 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -35,7 +35,7 @@ #include "uunxapi.h" #include "getexecutablefile.hxx" -#include "nlsupport.h" +#include "nlsupport.hxx" #ifdef ANDROID #include <osl/detail/android-bootstrap.h> |