Fix: Warnings during build (#1225)

* Initial commit * Fix:#1185 * Fix:#1185 * Update after further tests * Update navit.c Missing opening bracket. * Update navit.c Needs AND not OR when combining if clauses. * Revert "Fix:#1185" This reverts commit fd91e40. * Revert "Fix:#1185" This reverts commit be87cd3. * Fix: Warning during build * WINCE compiler needs pragma to be outside of a function
navit-gps · Mar 7, 2023 · d85f71e · d85f71e
1 parent 2ac4a84
commit d85f71e
Show file tree

Hide file tree

Showing 9 changed files with 283 additions and 237 deletions.
diff --git a/navit/attr.h b/navit/attr.h
@@ -28,28 +28,7 @@ extern "C" {
 
 enum item_type;
 
-/**
- * Attribute type values, created using macro magic.
- */
-enum attr_type {
-#define ATTR2(x,y) attr_##y=x,
-#define ATTR(x) attr_##x,
-
-    /* Special macro for unused attribute types. Creates a placeholder entry
-     * in the enum so the following values do not change. */
-#define ATTR_UNUSED ATTR_UNUSED_L(__LINE__)
-#define ATTR_UNUSED_L(x) ATTR_UNUSED_WITH_LINE_NUMBER(x)
-#define ATTR_UNUSED_WITH_LINE_NUMBER(x) ATTR_UNUSED_##x,
-
-#include "attr_def.h"
-
-#undef ATTR_UNUSED_WITH_LINE_NUMBER
-#undef ATTR_UNUSED_L
-#undef ATTR_UNUSED
-
-#undef ATTR2
-#undef ATTR
-};
+#include "attr_type_def.h"
 
 enum attr_format {
     attr_format_default=0,

diff --git a/navit/attr_type_def.h b/navit/attr_type_def.h
@@ -0,0 +1,37 @@
+#ifndef NAVIT_ATTR_TYPE_DEFH
+#define NAVIT_ATTR_TYPE_DEFH
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Attribute type values, created using macro magic.
+ */
+enum attr_type {
+#define ATTR2(x,y) attr_##y=x,
+#define ATTR(x) attr_##x,
+
+    /* Special macro for unused attribute types. Creates a placeholder entry
+     * in the enum so the following values do not change. */
+#define ATTR_UNUSED ATTR_UNUSED_L(__LINE__)
+#define ATTR_UNUSED_L(x) ATTR_UNUSED_WITH_LINE_NUMBER(x)
+#define ATTR_UNUSED_WITH_LINE_NUMBER(x) ATTR_UNUSED_##x,
+
+#include "attr_def.h"
+
+#undef ATTR_UNUSED_WITH_LINE_NUMBER
+#undef ATTR_UNUSED_L
+#undef ATTR_UNUSED
+
+#undef ATTR2
+#undef ATTR
+};
+
+#ifdef __cplusplus
+}
+/* __cplusplus */
+#endif
+
+/* NAVIT_ATTR_TYPE_DEFH */
+#endif
diff --git a/navit/debug.c b/navit/debug.c
@@ -472,6 +472,9 @@ void debug_dump_mallocs(void) {
     }
 }
 
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wframe-address"			// We know what we are doing here, suppress warning
 void *debug_malloc(const char *where, int line, const char *func, int size) {
     struct malloc_head *head;
     struct malloc_tail *tail;
@@ -508,7 +511,7 @@ void *debug_malloc(const char *where, int line, const char *func, int size) {
     tail->magic=0xdeadbef0;
     return head;
 }
-
+#pragma GCC diagnostic pop
 
 void *debug_malloc0(const char *where, int line, const char *func, int size) {
     void *ret=debug_malloc(where, line, func, size);

diff --git a/navit/item.h b/navit/item.h
@@ -25,14 +25,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>
-
-enum item_type {
-#define ITEM2(x,y) type_##y=x,
-#define ITEM(x) type_##x,
-#include "item_def.h"
-#undef ITEM2
-#undef ITEM
-};
+#include "item_type_def.h"
 
 #define route_item_first type_street_0
 #define route_item_last type_street_parking_lane

diff --git a/navit/item_type_def.h b/navit/item_type_def.h
@@ -0,0 +1,22 @@
+#ifndef NAVIT_ITEM_TYPE_DEFH
+#define NAVIT_ITEM_TYPE_DEFH
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum item_type {
+#define ITEM2(x,y) type_##y=x,
+#define ITEM(x) type_##x,
+#include "item_def.h"
+#undef ITEM2
+#undef ITEM
+};
+
+#ifdef __cplusplus
+}
+/* __cplusplus */
+#endif
+
+/* NAVIT_ITEM_TYPE_DEFH */
+#endif