Merge pull request #1406 from joto/fix-include-guards

Clean up of include guards so they all use the same format

Author: lonvia

src/lua-utils.hpp

@@ -1,5 +1,5 @@
-#ifndef OSM2PGSQL_FLEX_LUA_HPP
-#define OSM2PGSQL_FLEX_LUA_HPP
+#ifndef OSM2PGSQL_LUA_UTILS_HPP
+#define OSM2PGSQL_LUA_UTILS_HPP
 
 /**
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -60,4 +60,4 @@ bool luaX_get_table_bool(lua_State *lua_state, char const *key, int table_index,
 
 int luaX_pcall(lua_State *lua_state, int narg, int nres);
 
-#endif // OSM2PGSQL_FLEX_LUA_HPP
+#endif // OSM2PGSQL_LUA_UTILS_HPP

tests/common-import.hpp

@@ -1,5 +1,5 @@
-#ifndef OSM2PGSQL_TEST_COMMON_IMPORT_HPP
-#define OSM2PGSQL_TEST_COMMON_IMPORT_HPP
+#ifndef OSM2PGSQL_TESTS_COMMON_IMPORT_HPP
+#define OSM2PGSQL_TESTS_COMMON_IMPORT_HPP
 
 /**
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -237,4 +237,4 @@ class import_t
 } // namespace db
 } // namespace testing
 
-#endif // OSM2PGSQL_TEST_COMMON_IMPORT_HPP
+#endif // OSM2PGSQL_TESTS_COMMON_IMPORT_HPP

tests/common-pg.hpp

@@ -1,5 +1,5 @@
-#ifndef OSM2PGSQL_TEST_COMMON_PG_HPP
-#define OSM2PGSQL_TEST_COMMON_PG_HPP
+#ifndef OSM2PGSQL_TESTS_COMMON_PG_HPP
+#define OSM2PGSQL_TESTS_COMMON_PG_HPP
 
 /**
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -153,4 +153,4 @@ class tempdb_t
 } // namespace pg
 } // namespace testing
 
-#endif // OSM2PGSQL_TEST_COMMON_PG_HPP
+#endif // OSM2PGSQL_TESTS_COMMON_PG_HPP