Permalink
Browse files

[droid] move getdelim to match rand_r

  • Loading branch information...
1 parent 92e2a05 commit f6526b39d9905890b035784d81674171820e780b Cory Fields committed Sep 24, 2012
@@ -1,4 +1,5 @@
SRCS = rand_r.c
+SRCS += getdelim.c
LIB = bionic_supplement.a
include ../../../Makefile.include
@@ -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
}
File renamed without changes.
@@ -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"
View
@@ -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
View
@@ -1,32 +0,0 @@
-/* getdelim.h --- Prototype for replacement getdelim function.
- Copyright (C) 2005 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
-
-/* Written by Simon Josefsson. */
-# include <stddef.h>
-# include <stdio.h>
-# include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *stream);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
@@ -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>

0 comments on commit f6526b3

Please sign in to comment.