diff options
-rwxr-xr-x | CMakeLists.txt | 4 | ||||
-rw-r--r-- | navit/font/freetype/font_freetype.c | 4 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/RenderArea.cpp | 4 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/RenderArea.h | 4 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 22 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.h | 6 | ||||
-rw-r--r-- | navit/gui/internal/gui_internal_search.c | 2 | ||||
-rw-r--r-- | navit/main.c | 2 | ||||
-rw-r--r-- | navit/maptool/google/protobuf-c/protobuf-c.c | 24 | ||||
-rw-r--r-- | navit/search.c | 4 |
10 files changed, 38 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c35b9930..3833ba14 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -664,8 +664,8 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY # Unclear if it's really worth correcting. include(CheckCCompilerFlag) if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare ") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wundef -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wundef -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare ") # -Wno-missing-field-initializers does not work with old gcc check_c_compiler_flag(-Wno-missing-field-initializers HAS_NO_MISSING_FIELD_INI) if (HAS_NO_MISSING_FIELD_INI) diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c index d78e6204..5e39092f 100644 --- a/navit/font/freetype/font_freetype.c +++ b/navit/font/freetype/font_freetype.c @@ -29,7 +29,7 @@ #if USE_CACHING #include FT_CACHE_H #endif -#if USE_FRIBIDI +#ifdef USE_FRIBIDI #include <fribidi.h> #endif #include FT_GLYPH_H @@ -215,7 +215,7 @@ font_freetype_text_new(char *text, struct font_freetype_font *font, int dx, FT_Set_Transform(font->face, &matrix, &pen); #endif -#if USE_FRIBIDI +#ifdef USE_FRIBIDI // Need to use fribidi to handle the string properly char visual_text[len*4+1]; { diff --git a/navit/graphics/qt_qpainter/RenderArea.cpp b/navit/graphics/qt_qpainter/RenderArea.cpp index 291786f3..96515f92 100644 --- a/navit/graphics/qt_qpainter/RenderArea.cpp +++ b/navit/graphics/qt_qpainter/RenderArea.cpp @@ -67,7 +67,7 @@ RenderArea::RenderArea(struct graphics_priv *priv, QT_QPAINTER_RENDERAREA_PARENT #endif is_overlay=overlay; gra=priv; -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT timer_type=g_hash_table_new(NULL, NULL); timer_callback=g_hash_table_new(NULL, NULL); watches=g_hash_table_new(NULL, NULL); @@ -303,7 +303,7 @@ void RenderArea::keyPressEvent(QKeyEvent *event) void RenderArea::watchEvent(int fd) { -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT struct event_watch *ev=(struct event_watch *)g_hash_table_lookup(watches, (void *)fd); dbg(1,"fd=%d ev=%p cb=%p\n", fd, ev, ev->cb); callback_call_0(ev->cb); diff --git a/navit/graphics/qt_qpainter/RenderArea.h b/navit/graphics/qt_qpainter/RenderArea.h index 9404bc85..a78c23ca 100644 --- a/navit/graphics/qt_qpainter/RenderArea.h +++ b/navit/graphics/qt_qpainter/RenderArea.h @@ -39,7 +39,7 @@ class RenderArea : public QT_QPAINTER_RENDERAREA_PARENT struct callback_list *cbl; struct graphics_priv *gra; -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT GHashTable *timer_type; GHashTable *timer_callback; GHashTable *watches; @@ -59,7 +59,7 @@ protected: void keyPressEvent(QKeyEvent *event); void closeEvent(QCloseEvent *event); bool event(QEvent *event); -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT void timerEvent(QTimerEvent *event); #endif protected slots: diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index cddd1284..9e771b8a 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -154,7 +154,7 @@ struct graphics_image_priv { //############################################################################################################## static void graphics_destroy(struct graphics_priv *gr) { -#if QT_QPAINTER_USE_FREETYPE +#ifdef QT_QPAINTER_USE_FREETYPE gr->freetype_methods.destroy(); #endif g_free(gr->window_title); @@ -404,7 +404,7 @@ static void draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, s static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) { QPainter *painter=gr->painter; -#if !QT_QPAINTER_USE_FREETYPE +#ifndef QT_QPAINTER_USE_FREETYPE QString tmp=QString::fromUtf8(text); #ifndef QT_NO_TRANSFORMATIONS #if QT_VERSION >= 0x040000 @@ -787,7 +787,7 @@ static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graph { *meth=graphics_methods; struct graphics_priv *ret=g_new0(struct graphics_priv, 1); -#if QT_QPAINTER_USE_FREETYPE +#ifdef QT_QPAINTER_USE_FREETYPE if (gr->font_freetype_new) { ret->font_freetype_new=gr->font_freetype_new; gr->font_freetype_new(&ret->freetype_methods); @@ -808,7 +808,7 @@ static struct graphics_priv * overlay_new(struct graphics_priv *gr, struct graph return ret; } -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT static struct graphics_priv *event_gr; @@ -921,17 +921,17 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct struct attr *attr; dbg(0,"enter\n"); -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT if (event_gr) return NULL; if (! event_request_system("qt","graphics_qt_qpainter_new")) return NULL; #endif -#if QT_QPAINTER_USE_EVENT_GLIB +#ifdef QT_QPAINTER_USE_EVENT_GLIB if (! event_request_system("glib","graphics_qt_qpainter_new")) return NULL; #endif -#if QT_QPAINTER_USE_FREETYPE +#ifdef QT_QPAINTER_USE_FREETYPE font_freetype_new=(struct font_priv *(*)(void *))plugin_get_font_type("freetype"); if (!font_freetype_new) { dbg(0,"no freetype\n"); @@ -941,14 +941,14 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct ret=g_new0(struct graphics_priv, 1); *meth=graphics_methods; ret->nav=nav; -#if QT_QPAINTER_USE_FREETYPE +#ifdef QT_QPAINTER_USE_FREETYPE ret->font_freetype_new=font_freetype_new; font_freetype_new(&ret->freetype_methods); meth->font_new=(struct graphics_font_priv *(*)(struct graphics_priv *, struct graphics_font_methods *, char *, int, int))ret->freetype_methods.font_new; meth->get_text_bbox=(void (*)(struct graphics_priv*, struct graphics_font_priv*, char*, int, int, struct point*, int))ret->freetype_methods.get_text_bbox; #endif -#if QT_QPAINTER_USE_EMBEDDING && QT_VERSION >= 0x040500 +#if defined QT_QPAINTER_USE_EMBEDDING && QT_VERSION >= 0x040500 if ((attr=attr_search(attrs, NULL, attr_gc_type))) QApplication::setGraphicsSystem(attr->u.str); else @@ -973,7 +973,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct ret->widget= new RenderArea(ret); ret->widget->cbl=cbl; ret->painter = new QPainter; -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT event_gr=ret; #endif ret->w=800; @@ -1000,7 +1000,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct void plugin_init(void) { plugin_register_graphics_type("qt_qpainter", graphics_qt_qpainter_new); -#if QT_QPAINTER_USE_EVENT_QT +#ifdef QT_QPAINTER_USE_EVENT_QT plugin_register_event_type("qt", event_qt_new); #endif } diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.h b/navit/graphics/qt_qpainter/graphics_qt_qpainter.h index c1970a61..74e63a59 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.h +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.h @@ -41,7 +41,7 @@ #define QT_QPAINTER_USE_FREETYPE 1 #endif -#if QT_QPAINTER_USE_FREETYPE +#ifdef QT_QPAINTER_USE_FREETYPE #include "navit/font/freetype/font_freetype.h" #endif @@ -94,7 +94,7 @@ #endif -#if QT_QPAINTER_USE_EMBEDDING +#ifdef QT_QPAINTER_USE_EMBEDDING #include <QX11EmbedWidget> #endif @@ -136,7 +136,7 @@ struct graphics_priv { int cleanup; int overlay_disable; int wraparound; -#if QT_QPAINTER_USE_FREETYPE +#ifdef QT_QPAINTER_USE_FREETYPE struct font_priv * (*font_freetype_new)(void *meth); struct font_freetype_methods freetype_methods; #endif diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c index 9a4bed41..b9e3a5e9 100644 --- a/navit/gui/internal/gui_internal_search.c +++ b/navit/gui/internal/gui_internal_search.c @@ -498,7 +498,7 @@ gui_internal_search(struct gui_priv *this, const char *what, const char *type, i wnext->func=gui_internal_search_town; } else if (!strcmp(type,"Town")) { if (this->country_iso2) { -#if HAVE_API_ANDROID +#ifdef HAVE_API_ANDROID char country_iso2[strlen(this->country_iso2)+1]; strtolower(country_iso2, this->country_iso2); country=g_strdup_printf("country_%s", country_iso2); diff --git a/navit/main.c b/navit/main.c index c8c27dca..bd228b32 100644 --- a/navit/main.c +++ b/navit/main.c @@ -50,7 +50,7 @@ #include "callback.h" #include "navit_nls.h" #include "util.h" -#if HAVE_API_WIN32_BASE +#ifdef HAVE_API_WIN32_BASE #include <windows.h> #include <winbase.h> #endif diff --git a/navit/maptool/google/protobuf-c/protobuf-c.c b/navit/maptool/google/protobuf-c/protobuf-c.c index 7d16f7da..7cb727bf 100644 --- a/navit/maptool/google/protobuf-c/protobuf-c.c +++ b/navit/maptool/google/protobuf-c/protobuf-c.c @@ -594,7 +594,7 @@ sint64_pack (int64_t value, uint8_t *out) static inline size_t fixed32_pack (uint32_t value, uint8_t *out) { -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN memcpy (out, &value, 4); #else out[0] = value; @@ -613,7 +613,7 @@ fixed32_pack (uint32_t value, uint8_t *out) static inline size_t fixed64_pack (uint64_t value, uint8_t *out) { -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN memcpy (out, &value, 8); #else fixed32_pack (value, out); @@ -817,7 +817,7 @@ sizeof_elt_in_repeated_array (ProtobufCType type) static void copy_to_little_endian_32 (void *out, const void *in, unsigned N) { -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN memcpy (out, in, N * 4); #else unsigned i; @@ -829,7 +829,7 @@ copy_to_little_endian_32 (void *out, const void *in, unsigned N) static void copy_to_little_endian_64 (void *out, const void *in, unsigned N) { -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN memcpy (out, in, N * 8); #else unsigned i; @@ -1219,7 +1219,7 @@ pack_buffer_packed_payload (const ProtobufCFieldDescriptor *field, case PROTOBUF_C_TYPE_SFIXED32: case PROTOBUF_C_TYPE_FIXED32: case PROTOBUF_C_TYPE_FLOAT: -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN rv = count * 4; goto no_packing_needed; #else @@ -1234,7 +1234,7 @@ pack_buffer_packed_payload (const ProtobufCFieldDescriptor *field, case PROTOBUF_C_TYPE_SFIXED64: case PROTOBUF_C_TYPE_FIXED64: case PROTOBUF_C_TYPE_DOUBLE: -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN rv = count * 8; goto no_packing_needed; #else @@ -1303,7 +1303,7 @@ pack_buffer_packed_payload (const ProtobufCFieldDescriptor *field, } return rv; -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN no_packing_needed: buffer->append (buffer, rv, array); return rv; @@ -1613,7 +1613,7 @@ unzigzag32 (uint32_t v) static inline uint32_t parse_fixed_uint32 (const uint8_t *data) { -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN uint32_t t; memcpy (&t, data, 4); return t; @@ -1650,7 +1650,7 @@ unzigzag64 (uint64_t v) static inline uint64_t parse_fixed_uint64 (const uint8_t *data) { -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN uint64_t t; memcpy (&t, data, 8); return t; @@ -1853,7 +1853,7 @@ parse_packed_repeated_member (ScannedMember *scanned_member, case PROTOBUF_C_TYPE_FIXED32: case PROTOBUF_C_TYPE_FLOAT: count = (scanned_member->len - scanned_member->length_prefix_len) / 4; -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN goto no_unpacking_needed; #else for (i = 0; i < count; i++) @@ -1867,7 +1867,7 @@ parse_packed_repeated_member (ScannedMember *scanned_member, case PROTOBUF_C_TYPE_FIXED64: case PROTOBUF_C_TYPE_DOUBLE: count = (scanned_member->len - scanned_member->length_prefix_len) / 8; -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN goto no_unpacking_needed; #else for (i = 0; i < count; i++) @@ -1969,7 +1969,7 @@ parse_packed_repeated_member (ScannedMember *scanned_member, *p_n += count; return TRUE; -#if IS_LITTLE_ENDIAN +#ifdef IS_LITTLE_ENDIAN no_unpacking_needed: memcpy (array, at, count * siz); *p_n += count; diff --git a/navit/search.c b/navit/search.c index d5a04e9c..29b2b787 100644 --- a/navit/search.c +++ b/navit/search.c @@ -35,7 +35,7 @@ #include "geom.h" #include "util.h" -#if HAVE_API_ANDROID +#ifdef HAVE_API_ANDROID #include "android.h" #endif #include "layout.h" @@ -528,7 +528,7 @@ search_list_country_new(struct item *item) if (item_attr_get(item, attr_country_car, &attr)) ret->car=g_strdup(attr.u.str); if (item_attr_get(item, attr_country_iso2, &attr)) { -#if HAVE_API_ANDROID +#ifdef HAVE_API_ANDROID ret->iso2=g_malloc(strlen(attr.u.str)+1); strtolower(ret->iso2, attr.u.str); #else |