simplify include guards

Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f

7 files changed, 7 insertions, 12 deletions

diff --git a/sal/inc/osl/doublecheckedlocking.h b/sal/inc/osl/doublecheckedlocking.h
index 7dbabf792bb2..64b07d46cd6c 100644
--- a/sal/inc/osl/doublecheckedlocking.h
+++ b/sal/inc/osl/doublecheckedlocking.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
+#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
 #define INCLUDED_OSL_DOUBLECHECKEDLOCKING_H
 
 #if defined __cplusplus
diff --git a/sal/inc/osl/getglobalmutex.hxx b/sal/inc/osl/getglobalmutex.hxx
index 0dcedecbbe9d..4fbd32a3e4b5 100644
--- a/sal/inc/osl/getglobalmutex.hxx
+++ b/sal/inc/osl/getglobalmutex.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_OSL_GETGLOBALMUTEX_HXX
+#ifndef INCLUDED_OSL_GETGLOBALMUTEX_HXX
 #define INCLUDED_OSL_GETGLOBALMUTEX_HXX
 
 #include "osl/mutex.hxx"
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 36bbd0036685..2aa9e2a68c5d 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -25,16 +25,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if !defined INCLUDED_RTL_ALLOCATOR_HXX
+#ifndef INCLUDED_RTL_ALLOCATOR_HXX
 #define INCLUDED_RTL_ALLOCATOR_HXX
 
-#if ! defined(_SAL_TYPES_H_)
 #include "sal/types.h"
-#endif
-#if ! defined(_RTL_ALLOC_H_)
 #include "rtl/alloc.h"
-#endif
-
 #include <cstddef>
 
 /// @cond INTERNAL
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 9520dacfd16a..85d7306ac80d 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_RTL_INSTANCE_HXX
+#ifndef INCLUDED_RTL_INSTANCE_HXX
 #define INCLUDED_RTL_INSTANCE_HXX
 
 #include "osl/doublecheckedlocking.h"
diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h
index 77f29b129b23..4b34b13ac5f3 100644
--- a/sal/inc/rtl/math.h
+++ b/sal/inc/rtl/math.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_RTL_MATH_H
+#ifndef INCLUDED_RTL_MATH_H
 #define INCLUDED_RTL_MATH_H
 
 #include "rtl/ustring.h"
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 40eba502ef9a..47814bfdfea6 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_RTL_MATH_HXX
+#ifndef INCLUDED_RTL_MATH_HXX
 #define INCLUDED_RTL_MATH_HXX
 
 #include "rtl/math.h"
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 35d7bff2011d..9a046c5f0f3e 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_SAL_MATHCONF_H
+#ifndef INCLUDED_SAL_MATHCONF_H
 #define INCLUDED_SAL_MATHCONF_H
 
 #include "osl/endian.h"