diff options
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/file.c | 2 | ||||
| -rw-r--r-- | navit/file.h | 2 | ||||
| -rw-r--r-- | navit/graphics/opengl/graphics_opengl.c | 5 | ||||
| -rw-r--r-- | navit/graphics/sdl/graphics_sdl.c | 1 | ||||
| -rw-r--r-- | navit/navit_nls.c | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/navit/file.c b/navit/file.c index dd6fa82f..9c07988d 100644 --- a/navit/file.c +++ b/navit/file.c @@ -485,7 +485,7 @@ file_data_flush(struct file *file, long long offset, int size) } int -file_data_write(struct file *file, long long offset, int size, unsigned char *data) +file_data_write(struct file *file, long long offset, int size, const void *data) { file_data_flush(file, offset, size); lseek(file->fd, offset, SEEK_SET); diff --git a/navit/file.h b/navit/file.h index 40114faa..bb8b8bdd 100644 --- a/navit/file.h +++ b/navit/file.h @@ -73,7 +73,7 @@ unsigned char *file_data_read(struct file *file, long long offset, int size); unsigned char *file_data_read_special(struct file *file, int size, int *size_ret); unsigned char *file_data_read_all(struct file *file); void file_data_flush(struct file *file, long long offset, int size); -int file_data_write(struct file *file, long long offset, int size, unsigned char *data); +int file_data_write(struct file *file, long long offset, int size, const void *data); int file_get_contents(char *name, unsigned char **buffer, int *size); unsigned char *file_data_read_compressed(struct file *file, long long offset, int size, int size_uncomp); unsigned char *file_data_read_encrypted(struct file *file, long long offset, int size, int size_uncomp, int compressed, char *passwd); diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c index 204fab96..962c1705 100644 --- a/navit/graphics/opengl/graphics_opengl.c +++ b/navit/graphics/opengl/graphics_opengl.c @@ -104,6 +104,9 @@ typedef GLfixed GLf; #define glScalef glScalex #define glColor4f glColor4x #endif +#ifdef FREEGLUT +#include <GL/freeglut_ext.h> +#endif #define SCREEN_WIDTH 700 #define SCREEN_HEIGHT 700 @@ -1103,7 +1106,7 @@ handle_mouse_queue() { #ifdef USE_OPENGLES #else - static locked = 0; + static int locked = 0; if (!locked) { locked = 1; } else { diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c index 71b81558..70e157a2 100644 --- a/navit/graphics/sdl/graphics_sdl.c +++ b/navit/graphics/sdl/graphics_sdl.c @@ -50,7 +50,6 @@ #undef ALPHA #undef SDL_TTF -#define SDL_IMAGE #undef LINUX_TOUCHSCREEN #ifdef USE_WEBOS diff --git a/navit/navit_nls.c b/navit/navit_nls.c index aba4b97a..496850ad 100644 --- a/navit/navit_nls.c +++ b/navit/navit_nls.c @@ -19,6 +19,8 @@ navit_nls_add_textdomain(const char *package, const char *dir) bind_textdomain_codeset(package, "UTF-8"); textdomains=g_list_append(textdomains, g_strdup(package)); return ret; +#else + return NULL; #endif } |