tdf#146619 Remove unused includes from sal/ [headers]

Change-Id: I8fae71e5053950441a2e0920590264c2cb858924 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155546 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-08-14 09:10:29 +02:00
parent 59c2e114f7
commit 10a8772863
27 changed files with 30 additions and 24 deletions
@@ -4,6 +4,9 @@ excludelist:
    sal/osl/all/log.cxx:
    #sal_use_syslog required from this file
    - salusesyslog.hxx
+    sal/osl/unx/backtrace.h:
+    # needed for the "shadow" backtrace API
+    - execinfo.h
    sal/osl/unx/system.hxx:
    # needed for the define  pthread_testcancel() to work
    - pthread.h
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_SAL_INC_INTERNAL_OSLMEMORY_H
 #define INCLUDED_SAL_INC_INTERNAL_OSLMEMORY_H

-#include <sal/saldllapi.h>
 #include <sal/types.h>

 #if defined __cplusplus
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_SAL_INC_INTERNAL_OSLRANDOM_H
 #define INCLUDED_SAL_INC_INTERNAL_OSLRANDOM_H

+#include <stddef.h>
+
 #if defined __cplusplus
 extern "C" {
 #endif
@@ -21,6 +21,9 @@

 #include <sal/config.h>

+#include <sal/types.h>
+#include <rtl/textenc.h>
+
 namespace rtl::uri::detail
 {
 enum EscapeType
@@ -48,6 +48,8 @@
 #include <pthread.h>
 #include <sys/file.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>

 #if defined(MACOSX)

@@ -21,7 +21,6 @@
 #define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_HXX

 #include <osl/file.h>
-#include <sal/types.h>

 /** Translate errno's to osl file errors

@@ -21,7 +21,6 @@
 #define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX

 #include <osl/file.h>
-#include <stddef.h>
 #include <sys/types.h>
 #include <rtl/string.hxx>

@@ -21,6 +21,7 @@

 #include <cassert>
 #include <utility>
+#include <unistd.h>

 #include "file_path_helper.hxx"
 #include "uunxapi.hxx"
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
 #define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX

-#include <sal/types.h>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>

@@ -20,6 +20,7 @@
 #include <osl/file.h>

 #include "system.hxx"
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
@@ -25,6 +25,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>

 #include <osl/diagnose.h>
 #include <osl/file.hxx>
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SAL_OSL_UNX_SECIMPL_HXX
 #define INCLUDED_SAL_OSL_UNX_SECIMPL_HXX

+#include <osl/security.h>
+
 #include <pwd.h>

 struct oslSecurityImpl
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_SAL_OSL_UNX_SOCKIMPL_HXX
 #define INCLUDED_SAL_OSL_UNX_SOCKIMPL_HXX

-#include <osl/pipe.h>
-#include <osl/socket.h>
 #include <osl/interlck.h>

-#include "system.hxx"
-
+#include <sys/socket.h>
 #include <sys/un.h>

 #if defined(LINUX) || defined(FREEBSD) || defined(NETBSD)
@@ -32,6 +32,8 @@
 #include <sal/log.hxx>

 #include <sys/file.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <utime.h>

 #ifdef ANDROID
@@ -24,11 +24,7 @@

 #include <string_view>

-#include <unistd.h>
-#include <stdlib.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <rtl/ustring.h>

 #include <rtl/ustring.hxx>

@@ -23,8 +23,6 @@
 #include <sal/config.h>

 #include <osl/diagnose.h>
-#include <osl/file.h>
-#include <rtl/alloc.h>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -11,8 +11,6 @@

 #include <sal/config.h>

-#include <sal/types.h>
-
 void osl_callThreadKeyCallbackOnThreadDetach(void);

 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
@@ -23,6 +23,8 @@
 #include <sal/config.h>

 #include <cmath>
+#include <stdio.h>
+#include <sal/types.h>

 #define PREC_float 1
 #define PREC_double 2
@@ -29,6 +29,10 @@
 #include <string.h>
 #include <stdio.h>

+#if defined(SAL_UNX)
+#include <unistd.h>
+#endif /* SAL_UNX */
+
 namespace {

 /**
@@ -181,7 +181,6 @@ static inline unsigned int lowbit(sal_Size n)

 #if defined(SAL_UNX)

-#include <unistd.h>
 #include <pthread.h>

 typedef pthread_mutex_t rtl_memory_lock_type;
@@ -19,6 +19,7 @@
 #include <sal/config.h>

 #include <assert.h>
+#include <stdlib.h>
 #include <rtl/alloc.h>
 #include <rtl/ustring.h>
 #include <rtllifecycle.h>
@@ -26,8 +26,8 @@
 #endif

 #include <sal/types.h>
-#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
+#include <rtl/string.h>
+#include <rtl/ustring.h>

 /* ======================================================================= */
 /* Help functions for String and UString                                   */
@@ -9,6 +9,7 @@

 #include <sal/config.h>

+#include <rtl/character.hxx>
 #include <rtl/textcvt.h>
 #include <sal/types.h>

@@ -26,6 +26,7 @@
 #include <iterator>

 #include <rtl/textenc.h>
+#include <rtl/tencinfo.h>
 #include <sal/types.h>

 #define NOTABUNI_START 0xFF
@@ -22,9 +22,7 @@

 #include <sal/config.h>

-#include <rtl/tencinfo.h>
 #include <rtl/textcvt.h>
-#include <rtl/textenc.h>
 #include <sal/types.h>

 #include "unichars.hxx"
@@ -28,6 +28,7 @@

 #include <osl/module.hxx>
 #include <rtl/textenc.h>
+#include <rtl/tencinfo.h>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
@@ -22,9 +22,6 @@

 #include <sal/config.h>

-#include <cassert>
-
-#include <rtl/character.hxx>
 #include <sal/types.h>

 #define RTL_TEXTENC_UNICODE_REPLACEMENT_CHARACTER 0xFFFD