diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-03-29 11:38:32 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-03-29 11:38:32 +0000 |
| commit | 3c05b84fb3bcb9bd272cf4a25ee5cb72f972f4cd (patch) | |
| tree | 954baa7532752aa3e0521f6890e7baef4b6975c5 /navit/debug.c | |
| parent | 5c8566c7d10971dfb6d4d3080e33c23857cafcfe (diff) | |
| download | navit-svn-3c05b84fb3bcb9bd272cf4a25ee5cb72f972f4cd.tar.gz | |
Fix:port_android:Do not catch SIGSEGV because catching it breaks Lollipop NullPointerException handling.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6033 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/debug.c')
| -rw-r--r-- | navit/debug.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/navit/debug.c b/navit/debug.c index 80daeb83..6d1bd4c9 100644 --- a/navit/debug.c +++ b/navit/debug.c @@ -88,8 +88,10 @@ static void sigsegv(int sig) void debug_init(const char *program_name) { +#ifndef HAVE_API_ANDROID gdb_program=g_strdup(program_name); signal(SIGSEGV, sigsegv); +#endif debug_hash=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); #ifdef __IPHONE_OS_VERSION_MIN_REQUIRED debug_fp = stdout; @@ -120,11 +122,13 @@ void debug_level_set(const char *name, dbg_level level) { if (!strcmp(name, "segv")) { +#ifndef HAVE_API_ANDROID segv_level=level; if (segv_level) signal(SIGSEGV, sigsegv); else signal(SIGSEGV, NULL); +#endif } else if (!strcmp(name, "timestamps")) { timestamp_prefix=level; } else if (!strcmp(name, DEBUG_MODULE_GLOBAL)) { |