diff options
Diffstat (limited to 'pjlib/include/pj/compat')
-rw-r--r-- | pjlib/include/pj/compat/cc_armcc.h | 6 | ||||
-rw-r--r-- | pjlib/include/pj/compat/os_symbian.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pjlib/include/pj/compat/cc_armcc.h b/pjlib/include/pj/compat/cc_armcc.h index 504ca889..52fe74c0 100644 --- a/pjlib/include/pj/compat/cc_armcc.h +++ b/pjlib/include/pj/compat/cc_armcc.h @@ -33,8 +33,12 @@ #define PJ_CC_VER_2 __ARMCC_MINOR__ #define PJ_CC_VER_3 __ARMCC_PATCHLEVEL__ +#ifdef __cplusplus +# define PJ_INLINE_SPECIFIER inline +#else +# define PJ_INLINE_SPECIFIER static __inline +#endif -#define PJ_INLINE_SPECIFIER static // why is not inline accepted? #define PJ_THREAD_FUNC #define PJ_NORETURN #define PJ_ATTR_NORETURN __attribute__ ((noreturn)) diff --git a/pjlib/include/pj/compat/os_symbian.h b/pjlib/include/pj/compat/os_symbian.h index b1b1cd1a..f6787b06 100644 --- a/pjlib/include/pj/compat/os_symbian.h +++ b/pjlib/include/pj/compat/os_symbian.h @@ -144,7 +144,9 @@ #define PJ_HAS_SOCKLEN_T 1 typedef unsigned int socklen_t; +#ifndef __GCCE__ #include <e32def.h> +#endif /* #if defined(PJ_EXPORTING) |