Browse Source

Remove __strto* from header (glibc sync), disable __asprintf/__getdelim, not provided

Peter S. Mazinger 18 years ago
parent
commit
6ff79172d5
2 changed files with 4 additions and 35 deletions
  1. 4 0
      include/stdio.h
  2. 0 35
      include/stdlib.h

+ 4 - 0
include/stdio.h

@@ -359,9 +359,11 @@ __END_NAMESPACE_C99
 extern int vasprintf (char **__restrict __ptr, __const char *__restrict __f,
 extern int vasprintf (char **__restrict __ptr, __const char *__restrict __f,
 		      __gnuc_va_list __arg)
 		      __gnuc_va_list __arg)
      __THROW __attribute__ ((__format__ (__printf__, 2, 0)));
      __THROW __attribute__ ((__format__ (__printf__, 2, 0)));
+#if 0 /* uClibc: disabled */
 extern int __asprintf (char **__restrict __ptr,
 extern int __asprintf (char **__restrict __ptr,
 		       __const char *__restrict __fmt, ...)
 		       __const char *__restrict __fmt, ...)
      __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
      __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
+#endif
 extern int asprintf (char **__restrict __ptr,
 extern int asprintf (char **__restrict __ptr,
 		     __const char *__restrict __fmt, ...)
 		     __const char *__restrict __fmt, ...)
      __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
      __THROW __attribute__ ((__format__ (__printf__, 2, 3)));
@@ -557,9 +559,11 @@ extern char *fgets_unlocked (char *__restrict __s, int __n,
    cancellation point.  But due to similarity with an POSIX interface
    cancellation point.  But due to similarity with an POSIX interface
    or due to the implementation they are cancellation points and
    or due to the implementation they are cancellation points and
    therefore not marked with __THROW.  */
    therefore not marked with __THROW.  */
+#if 0 /* uClibc: disabled */
 extern __ssize_t __getdelim (char **__restrict __lineptr,
 extern __ssize_t __getdelim (char **__restrict __lineptr,
 			       size_t *__restrict __n, int __delimiter,
 			       size_t *__restrict __n, int __delimiter,
 			       FILE *__restrict __stream);
 			       FILE *__restrict __stream);
+#endif
 extern __ssize_t getdelim (char **__restrict __lineptr,
 extern __ssize_t getdelim (char **__restrict __lineptr,
 			     size_t *__restrict __n, int __delimiter,
 			     size_t *__restrict __n, int __delimiter,
 			     FILE *__restrict __stream);
 			     FILE *__restrict __stream);

+ 0 - 35
include/stdlib.h

@@ -286,41 +286,6 @@ extern long double strtold_l (__const char *__restrict __nptr,
      __THROW __nonnull ((1, 3)) __wur;
      __THROW __nonnull ((1, 3)) __wur;
 #endif /* __UCLIBC_HAS_FLOATS__ */
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
 
-/* Internal names to support libstd++. */
-extern long int __strtol_l (__const char *__restrict __nptr,
-			  char **__restrict __endptr, int __base,
-			  __locale_t __loc) __THROW __nonnull ((1, 4));
-
-extern unsigned long int __strtoul_l (__const char *__restrict __nptr,
-				    char **__restrict __endptr,
-				    int __base, __locale_t __loc)
-     __THROW __nonnull ((1, 4));
-
-__extension__
-extern long long int __strtoll_l (__const char *__restrict __nptr,
-				char **__restrict __endptr, int __base,
-				__locale_t __loc)
-     __THROW __nonnull ((1, 4));
-
-__extension__
-extern unsigned long long int __strtoull_l (__const char *__restrict __nptr,
-					  char **__restrict __endptr,
-					  int __base, __locale_t __loc)
-     __THROW __nonnull ((1, 4));
-
-#ifdef __UCLIBC_HAS_FLOATS__
-extern double __strtod_l (__const char *__restrict __nptr,
-			char **__restrict __endptr, __locale_t __loc)
-     __THROW __nonnull ((1, 3));
-
-extern float __strtof_l (__const char *__restrict __nptr,
-		       char **__restrict __endptr, __locale_t __loc)
-     __THROW __nonnull ((1, 3));
-
-extern long double __strtold_l (__const char *__restrict __nptr,
-			      char **__restrict __endptr,
-			      __locale_t __loc) __THROW __nonnull ((1, 3));
-#endif /* __UCLIBC_HAS_FLOATS__ */
 #endif /* GNU */
 #endif /* GNU */
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 #endif /* __UCLIBC_HAS_XLOCALE__ */