diff options
| -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 /** |