diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-29 14:46:39 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-29 14:49:19 +0000 |
| commit | 42486dde49d9a9494c1f4889bbccde1f5aecd91e (patch) | |
| tree | 8939d9e9f182ab9483775c4c6b84e85bb2208dde /sal | |
| parent | d5b05cafdec62209803e38010b3354660e3e67cd (diff) | |
move #includes to top of file
instead of being randomly embedded somewhere deep inside the CXX code.
Found with:
git grep -nP '^#include' -- *.cxx | sort -g -k 2 -t :
Change-Id: I9ee432d3b665ecb6ec600bd51cc4b735a1b1127a
Reviewed-on: https://gerrit.libreoffice.org/26764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/nlsupport.cxx | 5 | ||||
| -rw-r--r-- | sal/rtl/alloc_cache.cxx | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index b7e86c115981..3df4f9cdd3f3 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -38,6 +38,10 @@ #endif /* !MACOSX && !IOS */ #endif /* LINUX || SOLARIS || NETBSD || MACOSX || IOS */ +#if defined(MACOSX) || defined(IOS) +#include "system.hxx" +#endif + #include <string.h> namespace { @@ -838,7 +842,6 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) } #if defined(MACOSX) || defined(IOS) -#include "system.hxx" /***************************************************************************** return the current process locale diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx index b557504bb001..8540d913bba0 100644 --- a/sal/rtl/alloc_cache.cxx +++ b/sal/rtl/alloc_cache.cxx @@ -29,6 +29,10 @@ #include <string.h> #include <stdio.h> +#if defined(SAL_UNX) +#include <sys/time.h> +#endif + /* ================================================================= * * * cache internals. @@ -1297,8 +1301,6 @@ rtl_secureZeroMemory (void *Ptr, sal_Size Bytes) SAL_THROW_EXTERN_C() *p++ = 0; } -#include <sys/time.h> - static void * rtl_cache_wsupdate_all (void * arg); |