diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-05-12 15:03:23 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-05-12 15:03:23 +0000 |
| commit | fd5aade84080ce74df1622958ea2c56c3e827703 (patch) | |
| tree | ba9d237790fd514955f4e716afc162b7d7091d31 /pjlib/src/pj/os_core_symbian.cpp | |
| parent | 3727cae28c3f725ff6f909955718523737a597fa (diff) | |
Symbian fixes to compile on GCCE (nested callbacks etc)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1269 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pj/os_core_symbian.cpp')
| -rw-r--r-- | pjlib/src/pj/os_core_symbian.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pjlib/src/pj/os_core_symbian.cpp b/pjlib/src/pj/os_core_symbian.cpp index 742fe5ab..a3ec3c04 100644 --- a/pjlib/src/pj/os_core_symbian.cpp +++ b/pjlib/src/pj/os_core_symbian.cpp @@ -301,7 +301,7 @@ on_error: } -PJ_DEF(pj_status_t) pj_atexit(void (*func)(void)) +PJ_DEF(pj_status_t) pj_atexit(pj_exit_callback func) { if (atexit_count >= PJ_ARRAY_SIZE(atexit_func)) return PJ_ETOOMANY; @@ -459,7 +459,7 @@ PJ_DEF(pj_status_t) pj_thread_local_alloc(long *index) */ PJ_DEF(void) pj_thread_local_free(long index) { - PJ_ASSERT_ON_FAIL(index >= 0 && index < PJ_ARRAY_SIZE(tls_vars) && + PJ_ASSERT_ON_FAIL(index >= 0 && index < (int)PJ_ARRAY_SIZE(tls_vars) && tls_vars[index] != 0, return); tls_vars[index] = 0; @@ -473,7 +473,7 @@ PJ_DEF(pj_status_t) pj_thread_local_set(long index, void *value) { pj_thread_t *rec = pj_thread_this(); - PJ_ASSERT_RETURN(index >= 0 && index < PJ_ARRAY_SIZE(tls_vars) && + PJ_ASSERT_RETURN(index >= 0 && index < (int)PJ_ARRAY_SIZE(tls_vars) && tls_vars[index] != 0, PJ_EINVAL); rec->tls_values[index] = value; @@ -487,7 +487,7 @@ PJ_DEF(void*) pj_thread_local_get(long index) { pj_thread_t *rec = pj_thread_this(); - PJ_ASSERT_RETURN(index >= 0 && index < PJ_ARRAY_SIZE(tls_vars) && + PJ_ASSERT_RETURN(index >= 0 && index < (int)PJ_ARRAY_SIZE(tls_vars) && tls_vars[index] != 0, NULL); return rec->tls_values[index]; |