diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-29 12:39:58 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-29 12:39:58 +0000 |
| commit | d922ac415effad706da7a5f3e7dcf7fc7523de26 (patch) | |
| tree | 947b1edf9fa82847d8b834c2fd1d00f22f3f2e56 /navit | |
| parent | dbe2f9915433283b9ba76862701439fd5ace7c16 (diff) | |
| download | navit-d922ac415effad706da7a5f3e7dcf7fc7523de26.tar.gz | |
Fix:Various:Made working on WM 6.1
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1613 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/file.c | 4 | ||||
| -rw-r--r-- | navit/gui/win32/gui_win32.c | 4 | ||||
| -rw-r--r-- | navit/zipfile.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/navit/file.c b/navit/file.c index 06d60ae45..d758e8ea2 100644 --- 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 e551813ad..6d6d0c0c0 100644 --- 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 8df075b66..288d68348 100644 --- 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) |