android fixes

build/android/Makefile

@@ -34,7 +34,7 @@ VERSION_TWEAK := $(shell cat $(ROOT)/../../CMakeLists.txt | \
 ANDROID_VERSION_CODE = 13
 
 #and for freeminer for skip conflict:
-ANDROID_VERSION_CODE = 33
+ANDROID_VERSION_CODE = 34
 
 PROJECT_NAME_C = freeminer
 

build/android/jni/Android.mk

@@ -77,6 +77,7 @@ endif
 
 ifeq ($(USE_ENET), 1)
 include $(CLEAR_VARS)
+LOCAL_CFLAGS := -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_GETHOSTBYNAME_R=1 -DHAS_GETADDRINFO=1 -DHAS_GETNAMEINFO=1 -DHAS_FCNTL=1 -DHAS_POLL=1 -DHAS_MSGHDR_FLAGS=1
 LOCAL_MODULE := enet
 LOCAL_C_INCLUDES := jni/src/enet/include
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/enet/*.c)
@@ -111,7 +112,6 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_      \
 				-DUSE_FREETYPE=1              \
 				-DUSE_LEVELDB=$(HAVE_LEVELDB) \
 				$(GPROF_DEF)                  \
-				-DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_GETHOSTBYNAME_R=1 -DHAS_GETADDRINFO=1 -DHAS_GETNAMEINFO=1 -DHAS_FCNTL=1 -DHAS_POLL=1 -DHAS_MSGHDR_FLAGS=1 \
 				-DUSE_MANDELBULBER=1 \
 				-DHAVE_THREAD_LOCAL=1 \
 				-DUSE_GETTEXT=1 \

src/chat.cpp

@@ -763,7 +763,13 @@ void ChatBackend::clearRecentChat()
 void ChatBackend::step(float dtime)
 {
 	m_recent_buffer.step(dtime);
-	m_recent_buffer.deleteByAge(60.0);
+	m_recent_buffer.deleteByAge(
+#ifdef __ANDROID__
+20.0
+#else
+60.0
+#endif
+	);
 
 	// no need to age messages in anything but m_recent_buffer
 }