Fix:Core:Fix bug #512 slightly modified and without style changes. compile problems...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3041 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/map/mg/street.c b/navit/navit/map/mg/street.c
index 7f86996..656da21 100644 (file)
--- a/navit/navit/map/mg/street.c
+++ b/navit/navit/map/mg/street.c
@@ -579,11 +579,11 @@ street_lookup_housenumber(struct street_priv *street)
                                        project(c, scount, dir, dlr, &street->hnc[street->hn_count]);
                                        street->hn[street->hn_count]=nn.first;
                                        street->hn_count++;
-                                       g_assert(street->hn_count < 100);
+                                       dbg_assert(street->hn_count < 100);
                                        project(c, scount, -dir, dlr, &street->hnc[street->hn_count]);
                                        street->hn[street->hn_count]=nn.last;
                                        street->hn_count++;
-                                       g_assert(street->hn_count < 100);
+                                       dbg_assert(street->hn_count < 100);
                                        dbg(1,"found %d%s %d%s\n",nn.first.number,nn.first.suffix,nn.last.number,nn.last.suffix);
                                }       
                        }

diff --git a/navit/navit/util.c b/navit/navit/util.c
index 3f1fdd6..da9c4e0 100644 (file)
--- a/navit/navit/util.c
+++ b/navit/navit/util.c
@@ -101,6 +101,7 @@ g_utf8_strlen_force_link(gchar *buffer, int max)
 
 #if defined(_WIN32) || defined(__CEGCC__)
 #include <windows.h>
+#include <sys/types.h>
 #endif
 
 #if defined(_WIN32) || defined(__CEGCC__) || defined (__APPLE__)