Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

12 files changed, 31 insertions, 31 deletions

diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.h
index 7033e38d744a..2548dea042a2 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILE_ERROR_TRANSL_H_
-#define _FILE_ERROR_TRANSL_H_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
+#define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
 
 #include <osl/file.h>
 #include <sal/types.h>
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index d1031bc07298..e1ed0affc8f2 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FILE_IMPL_HXX
-#define INCLUDED_FILE_IMPL_HXX
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
 
 #include "osl/file.h"
 #include <stddef.h>
@@ -53,6 +53,6 @@ oslFileError openFilePath(
     oslFileHandle* pHandle,
     sal_uInt32 uFlags, mode_t mode );
 
-#endif /* INCLUDED_FILE_IMPL_HXX */
+#endif // INCLUDED_SAL_OSL_UNX_FILE_IMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h
index bf084ba4e18c..799f497ce475 100644
--- a/sal/osl/unx/file_path_helper.h
+++ b/sal/osl/unx/file_path_helper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_PATH_HELPER_H_
-#define _OSL_FILE_PATH_HELPER_H_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
+#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_H
 
 #include <sal/types.h>
 #include <rtl/ustring.h>
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index a2b4607ba5ab..6b1418daec9a 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_PATH_HELPER_HXX_
-#define _OSL_FILE_PATH_HELPER_HXX_
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
 
 #include "file_path_helper.h"
 
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.h
index 4f418b264705..10168636da52 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FILE_URL_H
-#define INCLUDED_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_H
+#define INCLUDED_SAL_OSL_UNX_FILE_URL_H
 
 #include "osl/file.h"
 
@@ -39,6 +39,6 @@ int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_t
 }
 #endif
 
-#endif /* #define INCLUDED_FILE_URL_H */
+#endif /* #define INCLUDED_SAL_OSL_UNX_FILE_URL_H */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 057257e691f6..3a0babd4e53c 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __OSL_SYSTEM_H__
-#define __OSL_SYSTEM_H__
+#ifndef INCLUDED_SAL_OSL_UNX_SYSTEM_H
+#define INCLUDED_SAL_OSL_UNX_SYSTEM_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -411,6 +411,6 @@ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
 #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
 #endif
 
-#endif /* __OSL_SYSTEM_H__ */
+#endif // INCLUDED_SAL_OSL_UNX_SYSTEM_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
index 3b431ad292e2..76b5e4146dfd 100644
--- a/sal/osl/unx/uunxapi.h
+++ b/sal/osl/unx/uunxapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_UUNXAPI_H_
-#define _OSL_UUNXAPI_H_
+#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_H
+#define INCLUDED_SAL_OSL_UNX_UUNXAPI_H
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -65,6 +65,6 @@ int ftruncate_with_name(int fd, sal_uInt64 uSize, rtl_String* path);
 }
 #endif
 
-#endif /* _OSL_UUNXAPI_H_ */
+#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx
index 1a2fc4722feb..fbacb83ef69c 100644
--- a/sal/osl/unx/uunxapi.hxx
+++ b/sal/osl/unx/uunxapi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_UUNXAPI_HXX_
-#define _OSL_UUNXAPI_HXX_
+#ifndef INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
+#define INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
 
 #include "uunxapi.h"
 
@@ -62,6 +62,6 @@ namespace osl
     }
 } // end namespace osl
 
-#endif /* _OSL_UUNXAPI_HXX_ */
+#endif // INCLUDED_SAL_OSL_UNX_UUNXAPI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_error.h b/sal/osl/w32/file_error.h
index d31f1f842b79..483b966ff9c9 100644
--- a/sal/osl/w32/file_error.h
+++ b/sal/osl/w32/file_error.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OSL_FILE_ERROR_H
-#define INCLUDED_OSL_FILE_ERROR_H
+#ifndef INCLUDED_SAL_OSL_W32_FILE_ERROR_H
+#define INCLUDED_SAL_OSL_W32_FILE_ERROR_H
 
 #include "osl/file.h"
 
@@ -32,6 +32,6 @@ oslFileError oslTranslateFileError (/*DWORD*/ unsigned long dwError);
 }
 #endif
 
-#endif /* INCLUDED_OSL_FILE_ERROR_H */
+#endif // INCLUDED_SAL_OSL_W32_FILE_ERROR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/file_url.h b/sal/osl/w32/file_url.h
index 0115d99cf0d5..080b3ca7f93c 100644
--- a/sal/osl/w32/file_url.h
+++ b/sal/osl/w32/file_url.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_OSL_FILE_URL_H
-#define INCLUDED_OSL_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_W32_FILE_URL_H
+#define INCLUDED_SAL_OSL_W32_FILE_URL_H
 
 #include "sal/types.h"
 #include "rtl/ustring.h"
@@ -86,6 +86,6 @@ oslFileError _osl_getFileURLFromSystemPath (
 }
 #endif
 
-#endif /* INCLUDED_OSL_FILE_URL_H */
+#endif // INCLUDED_SAL_OSL_W32_FILE_URL_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/path_helper.h b/sal/osl/w32/path_helper.h
index b1ceb4fc62d1..056a1ca299e8 100644
--- a/sal/osl/w32/path_helper.h
+++ b/sal/osl/w32/path_helper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PATH_HELPER_H_
-#define _PATH_HELPER_H_
+#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_H
+#define INCLUDED_SAL_OSL_W32_PATH_HELPER_H
 
 #include <sal/types.h>
 #include <rtl/ustring.h>
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index fc44e25df170..6092098a560e 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PATH_HELPER_HXX_
-#define _PATH_HELPER_HXX_
+#ifndef INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
+#define INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
 
 #include "path_helper.h"
 #include <rtl/ustring.hxx>