Fix:Various:Made working on WM 6.1

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

diff --git a/navit/file.c b/navit/file.c
index 06d60ae..d758e8e 100644 (file)
--- a/navit/file.c
+++ b/navit/file.c
@@ -63,12 +63,14 @@ file_create(char *name)
        if (! file)
                return file;
        file->fd=open(name, O_RDONLY|O_LARGEFILE | O_BINARY);
-       if (file->fd < 0) {
+       if (file->fd == -1) {
                g_free(file);
                return NULL;
        }
+       dbg(1,"fd=%d\n", file->fd);
        fstat(file->fd, &stat);
        file->size=stat.st_size;
+       dbg(1,"size=%Ld\n", file->size);
        file->name = g_strdup(name);
        dbg_assert(file != NULL);
        return file;

diff --git a/navit/gui/win32/gui_win32.c b/navit/gui/win32/gui_win32.c
index e551813..6d6d0c0 100644 (file)
--- a/navit/gui/win32/gui_win32.c
+++ b/navit/gui/win32/gui_win32.c
@@ -391,9 +391,13 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l
                        } else if (wParam == '3') {
                                navit_zoom_out(gui->nav, 2, NULL);
                        } else if (wParam == '7') {
+#if 0
                                toggle_backlight();
+#endif
                        } else if (wParam == '9') {
+#if 0
                                toggle_fullscreen(hwnd);
+#endif
                        }
                        }
                break;

diff --git a/navit/zipfile.h b/navit/zipfile.h
index 8df075b..288d683 100644 (file)
--- a/navit/zipfile.h
+++ b/navit/zipfile.h
@@ -18,7 +18,8 @@
  */
 
 #ifndef __ZIPFILE_H__
-#ifdef __CEGCC__
+#ifdef HAVE_API_WIN32_CE
+#warning OK
 /* cegcc doesn't honor the __attribute__(packed) need pragma to work */
 #pragma pack(push)
 #pragma pack(1)