diff options
Diffstat (limited to 'libc/stdlib/strtod.c')
| -rw-r--r-- | libc/stdlib/strtod.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/libc/stdlib/strtod.c b/libc/stdlib/strtod.c index 3934d9a8b..0a19446c1 100644 --- a/libc/stdlib/strtod.c +++ b/libc/stdlib/strtod.c @@ -91,12 +91,6 @@ * directly -- and assumed always to succeed. */ -#ifdef ANDROID_CHANGES -#include <pthread.h> -#define mutex_lock(x) pthread_mutex_lock(x) -#define mutex_unlock(x) pthread_mutex_unlock(x) -#endif - #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: strtod.c,v 1.45.2.1 2005/04/19 13:35:54 tron Exp $"); @@ -151,18 +145,14 @@ __RCSID("$NetBSD: strtod.c,v 1.45.2.1 2005/04/19 13:35:54 tron Exp $"); #ifndef KR_headers #include "stdlib.h" #include "string.h" -#ifndef ANDROID_CHANGES #include "locale.h" -#endif /* ANDROID_CHANGES */ #else #include "malloc.h" #include "memory.h" #endif #endif -#ifndef ANDROID_CHANGES -#include "extern.h" -#include "reentrant.h" -#endif /* ANDROID_CHANGES */ +#include "../upstream-netbsd/extern.h" /* Android-changed. */ +#include "../upstream-netbsd/reentrant.h" /* Android-changed. */ #ifdef MALLOC #ifdef KR_headers @@ -370,13 +360,9 @@ Bigint { static Bigint *freelist[Kmax+1]; -#ifdef ANDROID_CHANGES - static pthread_mutex_t freelist_mutex = PTHREAD_MUTEX_INITIALIZER; -#else #ifdef _REENTRANT static mutex_t freelist_mutex = MUTEX_INITIALIZER; #endif -#endif /* Special value used to indicate an invalid Bigint value, * e.g. when a memory allocation fails. The idea is that we @@ -1346,16 +1332,14 @@ strtod Bigint *bb1, *bd0; Bigint *bb = NULL, *bd = NULL, *bs = NULL, *delta = NULL;/* pacify gcc */ -#ifdef ANDROID_CHANGES CONST char decimal_point = '.'; -#else /* ANDROID_CHANGES */ +#if 0 /* BEGIN android-changed: no localeconv. */ #ifndef KR_headers CONST char decimal_point = localeconv()->decimal_point[0]; #else CONST char decimal_point = '.'; #endif - -#endif /* ANDROID_CHANGES */ +#endif /* END android-changed */ sign = nz0 = nz = 0; value(rv) = 0.; |