diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2017-01-24 05:36:50 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2017-01-24 05:36:50 +0000 |
| commit | e4275a54cfd41a3d0f107f18130de3b780a17aac (patch) | |
| tree | 839ba95a0a4dd644b7aaa2d8a1507f9d6703e74b | |
| parent | 64c347b26fdcac0eb1cb8dabc5d255a6b6e8ca9b (diff) | |
Misc (re #1945): Automatically define macro PJ_ANDROID=1 on Android platforms (previously should be defined manually via config_site_sample.h or config_site.h).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5543 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib/include/pj/compat/os_auto.h.in | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/config_site_sample.h | 2 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-audiodev/config.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in index 55dd6520..1d4de17b 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in @@ -37,6 +37,7 @@ #undef PJ_LINUX #undef PJ_RTEMS #undef PJ_SUNOS +#undef PJ_ANDROID #if defined(PJ_WIN32_WINNT) && !defined(_WIN32_WINNT) # define _WIN32_WINNT PJ_WIN32_WINNT diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 059f6e83..31bfd6e1 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -365,8 +365,6 @@ */ #if PJ_CONFIG_ANDROID - #define PJ_ANDROID 1 - /* * PJLIB settings. */ diff --git a/pjmedia/include/pjmedia-audiodev/config.h b/pjmedia/include/pjmedia-audiodev/config.h index f427a7d0..6ee637de 100644 --- a/pjmedia/include/pjmedia-audiodev/config.h +++ b/pjmedia/include/pjmedia-audiodev/config.h @@ -78,7 +78,7 @@ PJ_BEGIN_DECL * included. */ #ifndef PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI -# define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI 0 +# define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI PJ_ANDROID #endif /** |