sal/osl/unx/backtrace.h | 5 +---- sal/osl/unx/file_error_transl.hxx | 5 +---- sal/osl/unx/file_impl.hxx | 5 +---- sal/osl/unx/file_path_helper.hxx | 5 +---- sal/osl/unx/file_url.hxx | 5 +---- sal/osl/unx/nlsupport.hxx | 5 +---- sal/osl/unx/readwrite_helper.hxx | 5 +---- sal/osl/unx/secimpl.hxx | 5 +---- sal/osl/unx/sockimpl.hxx | 5 +---- sal/osl/unx/soffice.hxx | 5 +---- sal/osl/unx/unixerrnostring.hxx | 5 +---- sal/osl/unx/uunxapi.hxx | 5 +---- sal/osl/w32/file-impl.hxx | 5 +---- sal/osl/w32/file_error.hxx | 5 +---- sal/osl/w32/file_url.hxx | 5 +---- sal/osl/w32/filetime.hxx | 5 +---- sal/osl/w32/nlsupport.hxx | 5 +---- sal/osl/w32/path_helper.hxx | 5 +---- sal/osl/w32/procimpl.hxx | 5 +---- sal/osl/w32/secimpl.hxx | 5 +---- sal/osl/w32/time.hxx | 5 +---- 21 files changed, 21 insertions(+), 84 deletions(-)
New commits: commit 87f3123c5ef71902301012b4d7988365f3496780 Author: Yui Nguyen <[email protected]> AuthorDate: Sat Nov 15 14:19:34 2025 -0800 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Sun Nov 16 11:05:29 2025 +0100 tdf#143148: Use pragma once instead of include guards Changes header files of sal/osl/unx and w32 Change-Id: Ic0d611e73bb0f9677831a306afe9efd1d7abafe2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194060 Tested-by: Jenkins Reviewed-by: Devansh Varshney <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h index 11a9da52efc0..7e9e0c898581 100644 --- a/sal/osl/unx/backtrace.h +++ b/sal/osl/unx/backtrace.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H -#define INCLUDED_SAL_OSL_UNX_BACKTRACE_H +#pragma once #include <config_features.h> @@ -46,6 +45,4 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ); #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/file_error_transl.hxx b/sal/osl/unx/file_error_transl.hxx index 67e6b5459046..77250d458fbe 100644 --- a/sal/osl/unx/file_error_transl.hxx +++ b/sal/osl/unx/file_error_transl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_HXX -#define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_HXX +#pragma once #include <osl/file.h> @@ -31,6 +30,4 @@ */ oslFileError oslTranslateFileError(int Errno); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx index 22e78f00393f..8fd1434619d1 100644 --- a/sal/osl/unx/file_impl.hxx +++ b/sal/osl/unx/file_impl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX -#define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX +#pragma once #include <osl/file.h> #include <sys/types.h> @@ -68,6 +67,4 @@ oslFileError openFilePath( oslFileHandle* pHandle, sal_uInt32 uFlags, mode_t mode ); -#endif // INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx index cbafb7482cba..55f7b98895ad 100644 --- a/sal/osl/unx/file_path_helper.hxx +++ b/sal/osl/unx/file_path_helper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX -#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX +#pragma once #include <rtl/ustring.h> #include <rtl/ustring.hxx> @@ -245,6 +244,4 @@ namespace osl } // namespace osl - #endif /* #ifndef _OSL_PATH_HELPER_HXX_ */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/file_url.hxx b/sal/osl/unx/file_url.hxx index 3ffd9e06bace..ece231618e57 100644 --- a/sal/osl/unx/file_url.hxx +++ b/sal/osl/unx/file_url.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_HXX -#define INCLUDED_SAL_OSL_UNX_FILE_URL_HXX +#pragma once #include <osl/file.h> @@ -45,6 +44,4 @@ bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/nlsupport.hxx b/sal/osl/unx/nlsupport.hxx index d3747e5fda24..92050a8b3817 100644 --- a/sal/osl/unx/nlsupport.hxx +++ b/sal/osl/unx/nlsupport.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_NLSUPPORT_HXX -#define INCLUDED_SAL_OSL_UNX_NLSUPPORT_HXX +#pragma once #include <sal/config.h> @@ -31,6 +30,4 @@ void imp_getProcessLocale(rtl_Locale**); OUString macosx_getLocale(); #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/readwrite_helper.hxx b/sal/osl/unx/readwrite_helper.hxx index 133ccd016fc9..4d77ba02805b 100644 --- a/sal/osl/unx/readwrite_helper.hxx +++ b/sal/osl/unx/readwrite_helper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_UNX_READWRITE_HELPER_HXX -#define INCLUDED_SAL_OSL_UNX_READWRITE_HELPER_HXX +#pragma once #include <sal/config.h> @@ -21,6 +20,4 @@ bool safeWrite(int fd, void* data, std::size_t dataSize); // data. It will return sal_False for any partial transfer or error. bool safeRead(int fd, void* buffer, std::size_t count); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/secimpl.hxx b/sal/osl/unx/secimpl.hxx index 165efafaa1bb..e6628ae3f236 100644 --- a/sal/osl/unx/secimpl.hxx +++ b/sal/osl/unx/secimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_SECIMPL_HXX -#define INCLUDED_SAL_OSL_UNX_SECIMPL_HXX +#pragma once #include <osl/security.h> @@ -32,6 +31,4 @@ struct oslSecurityImpl bool osl_psz_getUserIdent(oslSecurity Security, char* pszIdent, sal_uInt32 nMax); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/sockimpl.hxx b/sal/osl/unx/sockimpl.hxx index 529aec7ff1eb..e455d0ec0dcd 100644 --- a/sal/osl/unx/sockimpl.hxx +++ b/sal/osl/unx/sockimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_SOCKIMPL_HXX -#define INCLUDED_SAL_OSL_UNX_SOCKIMPL_HXX +#pragma once #include <osl/interlck.h> @@ -57,6 +56,4 @@ struct oslPipeImpl { #endif }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/soffice.hxx b/sal/osl/unx/soffice.hxx index da1b684af4ab..5d3ddc0740cf 100644 --- a/sal/osl/unx/soffice.hxx +++ b/sal/osl/unx/soffice.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_UNX_SOFFICE_HXX -#define INCLUDED_SAL_OSL_UNX_SOFFICE_HXX +#pragma once #include <sal/config.h> @@ -21,6 +20,4 @@ void setSoffice(); bool isSoffice(); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sal/osl/unx/unixerrnostring.hxx b/sal/osl/unx/unixerrnostring.hxx index 9e13b04e6c4e..7784328c3170 100644 --- a/sal/osl/unx/unixerrnostring.hxx +++ b/sal/osl/unx/unixerrnostring.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_UNX_UNIXERRNOSTRING_HXX -#define INCLUDED_SAL_OSL_UNX_UNIXERRNOSTRING_HXX +#pragma once #include <string> @@ -22,6 +21,4 @@ std::string UnixErrnoString(int nErrno); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx index d4b73a7fbdbd..480a1471cc6f 100644 --- a/sal/osl/unx/uunxapi.hxx +++ b/sal/osl/unx/uunxapi.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX -#define INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX +#pragma once #include <sal/config.h> @@ -74,6 +73,4 @@ namespace osl int mkdir(const OString& aPath, mode_t aMode); } // end namespace osl -#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/file-impl.hxx b/sal/osl/w32/file-impl.hxx index 3f1d2136def9..faa84d25582a 100644 --- a/sal/osl/w32/file-impl.hxx +++ b/sal/osl/w32/file-impl.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_W32_FILE_IMPL_HXX -#define INCLUDED_SAL_OSL_W32_FILE_IMPL_HXX +#pragma once #include <sal/config.h> @@ -20,6 +19,4 @@ extern "C" oslFileHandle osl_createFileHandleFromOSHandle(HANDLE hFile, sal_uInt32 uFlags); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sal/osl/w32/file_error.hxx b/sal/osl/w32/file_error.hxx index 4da87c132cfd..164eaf2f02f9 100644 --- a/sal/osl/w32/file_error.hxx +++ b/sal/osl/w32/file_error.hxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_W32_FILE_ERROR_HXX -#define INCLUDED_SAL_OSL_W32_FILE_ERROR_HXX +#pragma once #include <osl/file.h> oslFileError oslTranslateFileError(/*DWORD*/ unsigned long dwError); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx index cb89b953c00c..9d776a36bb16 100644 --- a/sal/osl/w32/file_url.hxx +++ b/sal/osl/w32/file_url.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_W32_FILE_URL_HXX -#define INCLUDED_SAL_OSL_W32_FILE_URL_HXX +#pragma once #include <sal/types.h> #include <rtl/ustring.hxx> @@ -56,6 +55,4 @@ oslFileError osl_getSystemPathFromFileURL_ ( bool bAllowRelative ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/filetime.hxx b/sal/osl/w32/filetime.hxx index 7b51baf1b6bf..3b679fe08c82 100644 --- a/sal/osl/w32/filetime.hxx +++ b/sal/osl/w32/filetime.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_W32_FILETIME_HXX -#define INCLUDED_SAL_OSL_W32_FILETIME_HXX +#pragma once #include <sal/config.h> @@ -21,6 +20,4 @@ BOOL TimeValueToFileTime(TimeValue const* cpTimeVal, FILETIME* pFTime); // bDuration means cpFTime contains a time interval, not a point in time BOOL FileTimeToTimeValue(FILETIME const* cpFTime, TimeValue* pTimeVal, bool bDuration = false); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sal/osl/w32/nlsupport.hxx b/sal/osl/w32/nlsupport.hxx index 2d818c378b3e..cc6f1634641a 100644 --- a/sal/osl/w32/nlsupport.hxx +++ b/sal/osl/w32/nlsupport.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_W32_NLSUPPORT_HXX -#define INCLUDED_SAL_OSL_W32_NLSUPPORT_HXX +#pragma once #include <sal/config.h> @@ -16,6 +15,4 @@ void imp_getProcessLocale(rtl_Locale** ppLocale); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx index cd7b822d9d32..77bac1bc439c 100644 --- a/sal/osl/w32/path_helper.hxx +++ b/sal/osl/w32/path_helper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX -#define INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX +#pragma once #include <sal/config.h> @@ -66,6 +65,4 @@ public: } // end namespace osl -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/procimpl.hxx b/sal/osl/w32/procimpl.hxx index fb1263fa78a3..f3067c91f50d 100644 --- a/sal/osl/w32/procimpl.hxx +++ b/sal/osl/w32/procimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_W32_PROCIMPL_HXX -#define INCLUDED_SAL_OSL_W32_PROCIMPL_HXX +#pragma once #include <osl/process.h> @@ -28,6 +27,4 @@ struct oslProcessImpl DWORD m_IdProcess; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/secimpl.hxx b/sal/osl/w32/secimpl.hxx index 7c952bb64250..77a95dc865f8 100644 --- a/sal/osl/w32/secimpl.hxx +++ b/sal/osl/w32/secimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_OSL_W32_SECIMPL_HXX -#define INCLUDED_SAL_OSL_W32_SECIMPL_HXX +#pragma once #include <winnetwk.h> @@ -35,6 +34,4 @@ typedef struct NETRESOURCEW* m_pNetResource; } oslSecurityImpl; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/osl/w32/time.hxx b/sal/osl/w32/time.hxx index c0ca9d7772cf..bba0a0ba1e1b 100644 --- a/sal/osl/w32/time.hxx +++ b/sal/osl/w32/time.hxx @@ -7,13 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SAL_OSL_W32_TIME_HXX -#define INCLUDED_SAL_OSL_W32_TIME_HXX +#pragma once #include <sal/config.h> void sal_initGlobalTimer(void); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
