[vlc-commits] Do not redefine strtof and atof for Android (the NDK headers are broken).

Rémi Duraffort git at videolan.org
Wed Feb 23 22:55:44 CET 2011


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Feb 23 21:46:39 2011 +0100| [d2c15baf70547f8a6e624dea916011fb89e87f09] | committer: Rémi Duraffort

Do not redefine strtof and atof for Android (the NDK headers are broken).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d2c15baf70547f8a6e624dea916011fb89e87f09
---

 include/vlc_fixups.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index f6ca7e8..19c1b88 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -94,12 +94,16 @@ size_t strlcpy (char *, const char *, size_t);
 #endif
 
 #ifndef HAVE_STRTOF
+#ifndef HAVE_ANDROID
 float strtof (const char *, char **);
 #endif
+#endif
 
 #ifndef HAVE_ATOF
+#ifndef HAVE_ANDROID
 double atof (const char *);
 #endif
+#endif
 
 #ifndef HAVE_STRTOLL
 long long int strtoll (const char *, char **, int);



More information about the vlc-commits mailing list