Changeset 5543

Timestamp:

Jan 24, 2017 5:36:50 AM (8 years ago)

Author:

nanang

Message:

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).

Location:

pjproject/trunk

Files:

• pjlib/include/pj/compat/os_auto.h.in (modified) (1 diff)
• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -38 +38 @@
 #undef PJ_RTEMS
 #undef PJ_SUNOS
+#undef PJ_ANDROID
 
 #if defined(PJ_WIN32_WINNT) && !defined(_WIN32_WINNT)

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -365 +365 @@
  */
 #if PJ_CONFIG_ANDROID
-
-    #define PJ_ANDROID                          1
 
     /*

pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h

@@ -79 +79 @@
  */
 #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