diff options
| author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:03:16 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-21 13:19:17 +0100 |
| commit | 01baeab99890e5650b3dabc15f8d900490a5a133 (patch) | |
| tree | 64a1b30b20a53262605312fff4d035876fc7c811 /include/sal | |
| parent | 0108cd51faf942b3fc3a292522d4b2f421f1cf45 (diff) | |
tdf#123936 Formatting files in module include with clang-format
Change-Id: I0507dd797cd5a35e0ae14f4b69ee4e172d08a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105681
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'include/sal')
| -rw-r--r-- | include/sal/alloca.h | 9 | ||||
| -rw-r--r-- | include/sal/backtrace.hxx | 13 | ||||
| -rw-r--r-- | include/sal/config.h | 13 | ||||
| -rw-r--r-- | include/sal/saldllapi.h | 4 |
4 files changed, 19 insertions, 20 deletions
diff --git a/include/sal/alloca.h b/include/sal/alloca.h index 801a7b35e034..bb4c3e0e0c05 100644 --- a/include/sal/alloca.h +++ b/include/sal/alloca.h @@ -20,21 +20,22 @@ #ifndef INCLUDED_SAL_ALLOCA_H #define INCLUDED_SAL_ALLOCA_H -#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(HAIKU) || defined(MACOSX) || defined(IOS) +#if defined(__sun) || defined(LINUX) || defined(AIX) || defined(ANDROID) || defined(HAIKU) \ + || defined(MACOSX) || defined(IOS) #ifndef INCLUDED_ALLOCA_H #include <alloca.h> #define INCLUDED_ALLOCA_H #endif -#elif defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) +#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #ifndef INCLUDED_STDLIB_H #include <stdlib.h> #define INCLUDED_STDLIB_H #endif -#elif defined (_WIN32) +#elif defined(_WIN32) #ifndef INCLUDED_MALLOC_H #include <malloc.h> @@ -47,6 +48,6 @@ #endif -#endif /* INCLUDED_SAL_ALLOCA_H */ +#endif /* INCLUDED_SAL_ALLOCA_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sal/backtrace.hxx b/include/sal/backtrace.hxx index 62dfb590fae7..5f44e5e01d2d 100644 --- a/include/sal/backtrace.hxx +++ b/include/sal/backtrace.hxx @@ -28,19 +28,18 @@ */ #if defined LIBO_INTERNAL_ONLY -namespace sal { - -struct BacktraceState { +namespace sal +{ +struct BacktraceState +{ void** buffer; int nDepth; - ~BacktraceState() {delete[] buffer;} + ~BacktraceState() { delete[] buffer; } }; -SAL_DLLPUBLIC std::unique_ptr<BacktraceState> backtrace_get( - sal_uInt32 backtraceDepth); +SAL_DLLPUBLIC std::unique_ptr<BacktraceState> backtrace_get(sal_uInt32 backtraceDepth); SAL_DLLPUBLIC OUString backtrace_to_string(BacktraceState* backtraceState); - } #endif diff --git a/include/sal/config.h b/include/sal/config.h index 335c4174e3ae..f8504b3c1129 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -31,7 +31,7 @@ #define SAL_PATHSEPARATOR ';' #define SAL_PATHDELIMITER '\\' #define SAL_NEWLINE_STRING "\r\n" -#define SAL_CONFIGFILE( name ) name ".ini" +#define SAL_CONFIGFILE(name) name ".ini" #ifdef _MSC_VER @@ -43,9 +43,8 @@ #endif /* defined _WIN32 */ -#if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ - defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID) || \ - defined(HAIKU) +#if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(AIX) \ + || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID) || defined(HAIKU) #define SAL_UNX #define SAL_DLLEXTENSION ".so" #define SAL_EXEEXTENSION "" @@ -53,7 +52,7 @@ #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' #define SAL_NEWLINE_STRING "\n" -#define SAL_CONFIGFILE( name ) name "rc" +#define SAL_CONFIGFILE(name) name "rc" #endif #ifdef MACOSX @@ -64,7 +63,7 @@ #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' #define SAL_NEWLINE_STRING "\n" -#define SAL_CONFIGFILE( name ) name "rc" +#define SAL_CONFIGFILE(name) name "rc" #endif #ifdef IOS @@ -77,7 +76,7 @@ #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' #define SAL_NEWLINE_STRING "\n" -#define SAL_CONFIGFILE( name ) name "rc" +#define SAL_CONFIGFILE(name) name "rc" #endif /* The following spell is for Solaris and its descendants. diff --git a/include/sal/saldllapi.h b/include/sal/saldllapi.h index 2eca05de7e18..b9c3250f52c3 100644 --- a/include/sal/saldllapi.h +++ b/include/sal/saldllapi.h @@ -25,9 +25,9 @@ #include "sal/types.h" #if defined(SAL_DLLIMPLEMENTATION) -#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define SAL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define SAL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #endif // INCLUDED_SAL_SALDLLAPI_H |