Use consistent include guard macro names

Change-Id: Icc83a9a1257e422aa7593d6a8dd5af25a06a3384

include/o3tl/functional.hxx

@@ -29,8 +29,8 @@
  * Strba and Thorsten Behrens
  */
 
-#ifndef INCLUDED_O3TL_COMPAT_FUNCTIONAL_HXX
-#define INCLUDED_O3TL_COMPAT_FUNCTIONAL_HXX
+#ifndef INCLUDED_O3TL_FUNCTIONAL_HXX
+#define INCLUDED_O3TL_FUNCTIONAL_HXX
 
 namespace o3tl
 {

include/o3tl/safeint.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_O3TL_SAFE_INT_HXX
-#define INCLUDED_O3TL_SAFE_INT_HXX
+#ifndef INCLUDED_O3TL_SAFEINT_HXX
+#define INCLUDED_O3TL_SAFEINT_HXX
 
 #include <limits>
 #if defined(_MSC_VER)

include/o3tl/strong_int.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_O3TL_STRONG_TYPEDEF_HXX
-#define INCLUDED_O3TL_STRONG_TYPEDEF_HXX
+#ifndef INCLUDED_O3TL_STRONG_INT_HXX
+#define INCLUDED_O3TL_STRONG_INT_HXX
 
 #include <sal/config.h>
 
@@ -69,6 +69,6 @@ strong_int<UT,PT> operator+(strong_int<UT,PT> const & lhs, strong_int<UT,PT> con
 
 }; // namespace o3tl
 
-#endif /* INCLUDED_O3TL_STRONG_TYPEDEF_HXX */
+#endif /* INCLUDED_O3TL_STRONG_INT_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */