Mercurial > repos > blastem
diff util.c @ 876:540cc4a7d626
Fix Android build breakage
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Mon, 09 Nov 2015 20:55:17 -0800 |
parents | 54ffba3768d6 |
children | a77670cd178d |
line wrap: on
line diff
--- a/util.c Sun Nov 08 22:03:34 2015 -0800 +++ b/util.c Mon Nov 09 20:55:17 2015 -0800 @@ -13,7 +13,7 @@ #include "render.h" //for render_errorbox #include "util.h" -char * alloc_concat(char * first, char * second) +char * alloc_concat(char const * first, char const * second) { int flen = strlen(first); int slen = strlen(second); @@ -23,7 +23,7 @@ return ret; } -char * alloc_concat_m(int num_parts, char ** parts) +char * alloc_concat_m(int num_parts, char const ** parts) { int total = 0; for (int i = 0; i < num_parts; i++) { @@ -327,7 +327,7 @@ #include <SDL.h> char *read_bundled_file(char *name, long *sizeret) { - SDL_RWops *rw = SDL_RWFromFile(config_path, "rb"); + SDL_RWops *rw = SDL_RWFromFile(name, "rb"); if (!rw) { if (sizeret) { *sizeret = -1; @@ -353,7 +353,7 @@ return ret; } -char *get_config_dir() +char const *get_config_dir() { return SDL_AndroidGetInternalStoragePath(); } @@ -399,7 +399,7 @@ return ret; } -char *get_config_dir() +char const *get_config_dir() { static char* confdir; if (!confdir) {