demux: ts: remove pid array

[vlc] / compat / strtof.c

diff --git a/compat/strtof.c b/compat/strtof.c
index 807db0e39f2d14494315a32673858b7f634c43a7..2fc2fbdd6aad61716799c3ff7b4a9fc3b01f8b9f 100644 (file)
--- a/compat/strtof.c
+++ b/compat/strtof.c
@@ -1,21 +1,21 @@
 /*****************************************************************************
- * strtof.c: strtof replacement
+ * strtof.c: C strtof() replacement
  *****************************************************************************
- * Copyright © 1998-2008 the VideoLAN project
+ * Copyright © 1998-2009 VLC authors and VideoLAN
  *
- * 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 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -24,7 +24,9 @@
 
 #include <stdlib.h>
 
+#ifndef __ANDROID__
 float strtof (const char *str, char **end)
 {
     return strtod (str, end);
 }
+#endif