osdep/android: remove strnlen workaround

It has been fixed by now in Android NDK. See: https://code.google.com/p/android/issues/detail?id=74741
kasper93 · Oct 25, 2023 · 31019e2 · 31019e2
1 parent 032b7de
commit 31019e2
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 109 deletions.
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
@@ -28,7 +28,6 @@
 #include "audio/format.h"
 #include "osdep/timer.h"
 #include "osdep/io.h"
-#include "osdep/strnlen.h"
 #include "ao_wasapi.h"
 
 DEFINE_PROPERTYKEY(mp_PKEY_Device_FriendlyName,

diff --git a/common/common.c b/common/common.c
@@ -27,7 +27,6 @@
 #include "misc/bstr.h"
 #include "misc/ctype.h"
 #include "common/common.h"
-#include "osdep/strnlen.h"
 
 #define appendf(ptr, ...) \
     do {(*(ptr)) = talloc_asprintf_append_buffer(*(ptr), __VA_ARGS__);} while(0)

diff --git a/meson.build b/meson.build
@@ -467,7 +467,6 @@ if features['android']
     dependencies += cc.find_library('android')
     sources += files('audio/out/ao_audiotrack.c',
                      'misc/jni.c',
-                     'osdep/android/strnlen.c',
                      'video/out/android_common.c',
                      'video/out/vo_mediacodec_embed.c')
 endif

diff --git a/misc/language.c b/misc/language.c
@@ -20,7 +20,6 @@
 #include "language.h"
 
 #include "common/common.h"
-#include "osdep/strnlen.h"
 
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/osdep/android/strnlen.c b/osdep/android/strnlen.c
diff --git a/osdep/android/strnlen.h b/osdep/android/strnlen.h
diff --git a/osdep/strnlen.h b/osdep/strnlen.h
diff --git a/ta/ta_utils.c b/ta/ta_utils.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
-#include "osdep/strnlen.h"
 
 #define TA_NO_WRAPPERS
 #include "ta.h"