[droid] move getdelim to match rand_r

xbmc · Sep 24, 2012 · f6526b3 · f6526b3
1 parent 92e2a05
commit f6526b3
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 38 deletions.
diff --git a/xbmc/android/bionic_supplement/Makefile b/xbmc/android/bionic_supplement/Makefile
@@ -1,4 +1,5 @@
 SRCS     = rand_r.c
+SRCS    += getdelim.c
 LIB      = bionic_supplement.a
 
 include ../../../Makefile.include

diff --git a/xbmc/android/bionic_supplement/bionic_supplement.h b/xbmc/android/bionic_supplement/bionic_supplement.h
@@ -19,11 +19,13 @@
  *
  */
 
+#include <stdio.h>
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 int rand_r (unsigned int *seed);
+ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *stream);
 
 #ifdef __cplusplus
 }

diff --git a/xbmc/linux/getdelim.c → xbmc/android/bionic_supplement/getdelim.c b/xbmc/linux/getdelim.c → xbmc/android/bionic_supplement/getdelim.c
diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
@@ -21,7 +21,7 @@
 #include <time.h>
 #include "system.h"
 #ifdef TARGET_ANDROID
-#include "linux/getdelim.h"
+#include "android/bionic_supplement/bionic_supplement.h"
 #endif
 #include "PlatformInclude.h"
 #include "LinuxTimezone.h"

diff --git a/xbmc/linux/Makefile.in b/xbmc/linux/Makefile.in
@@ -21,10 +21,6 @@ SRCS += OMXClock.cpp
 SRCS += OMXCore.cpp
 endif
 
-ifeq (@USE_ANDROID@,1)
-SRCS += getdelim.c
-endif
-
 LIB = linux.a
 
 include @abs_top_srcdir@/Makefile.include

diff --git a/xbmc/linux/getdelim.h b/xbmc/linux/getdelim.h
diff --git a/xbmc/network/linux/NetworkLinux.cpp b/xbmc/network/linux/NetworkLinux.cpp
@@ -28,7 +28,7 @@
   #include <linux/sockios.h>
 #endif
 #ifdef TARGET_ANDROID
-#include "linux/getdelim.h"
+#include "android/bionic_supplement/bionic_supplement.h"
 #include "sys/system_properties.h"
 #endif
 #include <errno.h>