diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/errno.h | 9 | ||||
| -rw-r--r-- | include/features.h | 41 | ||||
| -rw-r--r-- | include/inttypes.h | 139 | ||||
| -rw-r--r-- | include/stdio.h | 21 | ||||
| -rw-r--r-- | include/stdlib.h | 224 | ||||
| -rw-r--r-- | include/string.h | 44 | ||||
| -rw-r--r-- | include/sys/sysmacros.h | 12 | ||||
| -rw-r--r-- | include/unistd.h | 22 | ||||
| -rw-r--r-- | include/wchar.h | 98 |
9 files changed, 22 insertions, 588 deletions
diff --git a/include/errno.h b/include/errno.h index dfcab4789..8c7f666fe 100644 --- a/include/errno.h +++ b/include/errno.h @@ -47,15 +47,6 @@ __BEGIN_DECLS extern int errno; #endif -#if 0 -#ifdef __USE_GNU - -/* The full and simple forms of the name with which the program was - invoked. These variables are set up automatically at startup based on - the value of ARGV[0] (this works only if you use GNU ld). */ -extern char *program_invocation_name, *program_invocation_short_name; -#endif /* __USE_GNU */ -#endif #endif /* _ERRNO_H */ __END_DECLS diff --git a/include/features.h b/include/features.h index 15da6886a..9f58132ba 100644 --- a/include/features.h +++ b/include/features.h @@ -256,16 +256,16 @@ * specific releases. */ #define __UCLIBC__ 1 -/* Major and minor version number of the uClibc library package are - * can be used to test for features in specific uClibc releases. - * - * Now included from bits/uClibc_config.h */ -#if 0 -/* For uClibc release 0.9.12, these numbers would be: */ -#define __UCLIBC_MAJOR__ 0 -#define __UCLIBC_MINOR__ 9 -#define __UCLIBC_SUBLEVEL__ 12 -#endif +/* Load up the current set of uClibc supported features along + * with the current uClibc major and minor version numbers. + * For uClibc release 0.9.26, these numbers would be: + * #define __UCLIBC_MAJOR__ 0 + * #define __UCLIBC_MINOR__ 9 + * #define __UCLIBC_SUBLEVEL__ 26 + */ +#define __need_uClibc_config_h +#include <bits/uClibc_config.h> +#undef __need_uClibc_config_h /* There is an unwholesomely huge amount of code out there that depends on the * presence of GNU libc header files. We have GNU libc header files. So here @@ -278,7 +278,7 @@ # define __GNU_LIBRARY__ 6 # define __GLIBC__ 2 # define __GLIBC_MINOR__ 2 -#endif +#endif /* Convenience macros to test the versions of glibc and gcc. Use them like this: @@ -318,25 +318,6 @@ # define __USE_EXTERN_INLINES 1 #endif -/* This is here only because every header file already includes this one. */ -#if 0 -/*#ifndef _LIBC*/ -/* Get the definitions of all the appropriate `__stub_FUNCTION' symbols. - <gnu/stubs.h> contains `#define __stub_FUNCTION' when FUNCTION is a stub - which will always return failure (and set errno to ENOSYS). - - We avoid including <gnu/stubs.h> when compiling the C library itself to - avoid a dependency loop. stubs.h depends on every object file. If - this #include were done for the library source code, then every object - file would depend on stubs.h. */ - -# include <gnu/stubs.h> -#endif - -/* Load up the current set of uClibc supported features */ -#define __need_uClibc_config_h -#include <bits/uClibc_config.h> -#undef __need_uClibc_config_h /* Make sure users large file options agree with uClibc's configuration. */ #ifndef __UCLIBC_HAS_LFS__ diff --git a/include/inttypes.h b/include/inttypes.h index 18592e978..6e0210087 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -323,145 +323,6 @@ extern uintmax_t wcstoumax (__const __gwchar_t *__restrict __nptr, __THROW; #endif -#if 0 /* disabled for uClibc */ -#ifdef __USE_EXTERN_INLINES - -# if __WORDSIZE == 64 - -/* Like `strtol' but convert to `intmax_t'. */ -# ifndef __strtol_internal_defined -extern long int __strtol_internal (__const char *__restrict __nptr, - char **__restrict __endptr, - int __base, int __group) __THROW; -# define __strtol_internal_defined 1 -# endif -extern __inline intmax_t -strtoimax (__const char *__restrict nptr, char **__restrict endptr, - int base) __THROW -{ - return __strtol_internal (nptr, endptr, base, 0); -} - -/* Like `strtoul' but convert to `uintmax_t'. */ -# ifndef __strtoul_internal_defined -extern unsigned long int __strtoul_internal (__const char * - __restrict __nptr, - char ** __restrict __endptr, - int __base, int __group) __THROW; -# define __strtoul_internal_defined 1 -# endif -extern __inline uintmax_t -strtoumax (__const char *__restrict nptr, char **__restrict endptr, - int base) __THROW -{ - return __strtoul_internal (nptr, endptr, base, 0); -} - -/* Like `wcstol' but convert to `intmax_t'. */ -# ifndef __wcstol_internal_defined -extern long int __wcstol_internal (__const __gwchar_t * __restrict __nptr, - __gwchar_t **__restrict __endptr, - int __base, int __group) __THROW; -# define __wcstol_internal_defined 1 -# endif -extern __inline intmax_t -wcstoimax (__const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, - int base) __THROW -{ - return __wcstol_internal (nptr, endptr, base, 0); -} - - -/* Like `wcstoul' but convert to `uintmax_t'. */ -# ifndef __wcstoul_internal_defined -extern unsigned long int __wcstoul_internal (__const __gwchar_t * - __restrict __nptr, - __gwchar_t ** - __restrict __endptr, - int __base, int __group) __THROW; -# define __wcstoul_internal_defined 1 -# endif -extern __inline uintmax_t -wcstoumax (__const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, - int base) __THROW -{ - return __wcstoul_internal (nptr, endptr, base, 0); -} - -# else /* __WORDSIZE == 32 */ - -/* Like `strtol' but convert to `intmax_t'. */ -# ifndef __strtoll_internal_defined -__extension__ -extern long long int __strtoll_internal (__const char *__restrict __nptr, - char **__restrict __endptr, - int __base, int __group) __THROW; -# define __strtoll_internal_defined 1 -# endif -extern __inline intmax_t -strtoimax (__const char *__restrict nptr, char **__restrict endptr, - int base) __THROW -{ - return __strtoll_internal (nptr, endptr, base, 0); -} - -/* Like `strtoul' but convert to `uintmax_t'. */ -# ifndef __strtoull_internal_defined -__extension__ -extern unsigned long long int __strtoull_internal (__const char * - __restrict __nptr, - char ** - __restrict __endptr, - int __base, - int __group) __THROW; -# define __strtoull_internal_defined 1 -# endif -extern __inline uintmax_t -strtoumax (__const char *__restrict nptr, char **__restrict endptr, - int base) __THROW -{ - return __strtoull_internal (nptr, endptr, base, 0); -} - -/* Like `wcstol' but convert to `intmax_t'. */ -# ifndef __wcstoll_internal_defined -__extension__ -extern long long int __wcstoll_internal (__const __gwchar_t * - __restrict __nptr, - __gwchar_t **__restrict __endptr, - int __base, int __group) __THROW; -# define __wcstoll_internal_defined 1 -# endif -extern __inline intmax_t -wcstoimax (__const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, - int base) __THROW -{ - return __wcstoll_internal (nptr, endptr, base, 0); -} - - -/* Like `wcstoul' but convert to `uintmax_t'. */ -# ifndef __wcstoull_internal_defined -__extension__ -extern unsigned long long int __wcstoull_internal (__const __gwchar_t * - __restrict __nptr, - __gwchar_t ** - __restrict __endptr, - int __base, - int __group) __THROW; -# define __wcstoull_internal_defined 1 -# endif -extern __inline uintmax_t -wcstoumax (__const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, - int base) __THROW -{ - return __wcstoull_internal (nptr, endptr, base, 0); -} -# endif /* __WORDSIZE == 32 */ -#endif /* Use extern inlines. */ -#endif /* disabled for uClibc */ - - __END_DECLS #endif /* inttypes.h */ diff --git a/include/stdio.h b/include/stdio.h index 979e4eeb2..f9067084e 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -555,11 +555,6 @@ extern void perror (__const char *__s) __THROW; extern int sys_nerr; extern __const char *__const sys_errlist[]; #endif -#if 0 -/* #ifdef __USE_GNU */ -extern int _sys_nerr; -extern __const char *__const _sys_errlist[]; -#endif #endif /* __UCLIBC_HAS_SYS_ERRLIST__ */ @@ -596,16 +591,17 @@ extern char *cuserid (char *__s) __THROW; #endif /* Use X/Open, but not issue 6. */ -#if 0 -/* #ifdef __USE_GNU */ +#ifdef __USE_GNU struct obstack; /* See <obstack.h>. */ /* Write formatted output to an obstack. */ extern int obstack_printf (struct obstack *__restrict __obstack, - __const char *__restrict __format, ...) __THROW; + __const char *__restrict __format, ...) + __THROW __attribute__ ((__format__ (__printf__, 2, 3))); extern int obstack_vprintf (struct obstack *__restrict __obstack, __const char *__restrict __format, - __gnuc_va_list __args) __THROW; + _G_va_list __args) + __THROW __attribute__ ((__format__ (__printf__, 2, 0))); #endif /* Use GNU. */ @@ -632,11 +628,6 @@ extern void funlockfile (FILE *__stream) __THROW; /* If we are compiling with optimizing read this file. It contains several optimizing inline functions and macros. */ -#if 0 -/* #ifdef __USE_EXTERN_INLINES */ -# include <bits/stdio.h> -#elif 1 - #define fgetc(_fp) __FGETC(_fp) #define fputc(_ch, _fp) __FPUTC(_ch, _fp) @@ -664,8 +655,6 @@ extern void funlockfile (FILE *__stream) __THROW; #define ferror_unlocked(_fp) __FERROR_UNLOCKED(_fp) #endif -#endif - __END_DECLS #endif /* <stdio.h> included. */ diff --git a/include/stdlib.h b/include/stdlib.h index e633a5c1a..eaeb7a104 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -302,152 +302,6 @@ extern long double __strtold_l (__const char *__restrict __nptr, #endif /* __UCLIBC_HAS_XLOCALE__ */ -#if 0 -/* The internal entry points for `strtoX' take an extra flag argument - saying whether or not to parse locale-dependent number grouping. */ - -extern double __strtod_internal (__const char *__restrict __nptr, - char **__restrict __endptr, int __group) - __THROW; -extern float __strtof_internal (__const char *__restrict __nptr, - char **__restrict __endptr, int __group) - __THROW; -extern long double __strtold_internal (__const char *__restrict __nptr, - char **__restrict __endptr, - int __group) __THROW; -#ifndef __strtol_internal_defined -extern long int __strtol_internal (__const char *__restrict __nptr, - char **__restrict __endptr, - int __base, int __group) __THROW; -# define __strtol_internal_defined 1 -#endif -#ifndef __strtoul_internal_defined -extern unsigned long int __strtoul_internal (__const char *__restrict __nptr, - char **__restrict __endptr, - int __base, int __group) __THROW; -# define __strtoul_internal_defined 1 -#endif -#if defined __GNUC__ || defined __USE_ISOC99 -# ifndef __strtoll_internal_defined -__extension__ -extern long long int __strtoll_internal (__const char *__restrict __nptr, - char **__restrict __endptr, - int __base, int __group) __THROW; -# define __strtoll_internal_defined 1 -# endif -# ifndef __strtoull_internal_defined -__extension__ -extern unsigned long long int __strtoull_internal (__const char * - __restrict __nptr, - char **__restrict __endptr, - int __base, int __group) - __THROW; -# define __strtoull_internal_defined 1 -# endif -#endif /* GCC */ -#endif /* 0 */ - -#if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ - && defined __USE_EXTERN_INLINES -/* Define inline functions which call the internal entry points. */ - -/* __BEGIN_NAMESPACE_STD */ -/* extern __inline double */ -/* strtod (__const char *__restrict __nptr, char **__restrict __endptr) __THROW */ -/* { */ -/* return __strtod_internal (__nptr, __endptr, 0); */ -/* } */ -/* extern __inline long int */ -/* strtol (__const char *__restrict __nptr, char **__restrict __endptr, */ -/* int __base) __THROW */ -/* { */ -/* return __strtol_internal (__nptr, __endptr, __base, 0); */ -/* } */ -/* extern __inline unsigned long int */ -/* strtoul (__const char *__restrict __nptr, char **__restrict __endptr, */ -/* int __base) __THROW */ -/* { */ -/* return __strtoul_internal (__nptr, __endptr, __base, 0); */ -/* } */ -/* __END_NAMESPACE_STD */ - -/* # ifdef __USE_ISOC99 */ -/* __BEGIN_NAMESPACE_C99 */ -/* extern __inline float */ -/* strtof (__const char *__restrict __nptr, char **__restrict __endptr) __THROW */ -/* { */ -/* return __strtof_internal (__nptr, __endptr, 0); */ -/* } */ -/* extern __inline long double */ -/* strtold (__const char *__restrict __nptr, char **__restrict __endptr) __THROW */ -/* { */ -/* return __strtold_internal (__nptr, __endptr, 0); */ -/* } */ -/* __END_NAMESPACE_C99 */ -/* # endif */ - -/* # ifdef __USE_BSD */ -/* __extension__ extern __inline long long int */ -/* strtoq (__const char *__restrict __nptr, char **__restrict __endptr, */ -/* int __base) __THROW */ -/* { */ -/* return __strtoll_internal (__nptr, __endptr, __base, 0); */ -/* } */ -/* __extension__ extern __inline unsigned long long int */ -/* strtouq (__const char *__restrict __nptr, char **__restrict __endptr, */ -/* int __base) __THROW */ -/* { */ -/* return __strtoull_internal (__nptr, __endptr, __base, 0); */ -/* } */ -/* # endif */ - -/* # if defined __USE_MISC || defined __USE_ISOC99 */ -/* __BEGIN_NAMESPACE_C99 */ -/* __extension__ extern __inline long long int */ -/* strtoll (__const char *__restrict __nptr, char **__restrict __endptr, */ -/* int __base) __THROW */ -/* { */ -/* return __strtoll_internal (__nptr, __endptr, __base, 0); */ -/* } */ -/* __extension__ extern __inline unsigned long long int */ -/* strtoull (__const char * __restrict __nptr, char **__restrict __endptr, */ -/* int __base) __THROW */ -/* { */ -/* return __strtoull_internal (__nptr, __endptr, __base, 0); */ -/* } */ -/* __END_NAMESPACE_C99 */ -/* # endif */ - -__BEGIN_NAMESPACE_STD -extern __inline double -atof (__const char *__nptr) __THROW -{ - return strtod (__nptr, (char **) NULL); -} -extern __inline int -atoi (__const char *__nptr) __THROW -{ - return (int) strtol (__nptr, (char **) NULL, 10); -} -extern __inline long int -atol (__const char *__nptr) __THROW -{ - return strtol (__nptr, (char **) NULL, 10); -} -__END_NAMESPACE_STD - -# if defined __USE_MISC || defined __USE_ISOC99 -__BEGIN_NAMESPACE_C99 -__extension__ extern __inline long long int -atoll (__const char *__nptr) __THROW -{ - return strtoll (__nptr, (char **) NULL, 10); -} -__END_NAMESPACE_C99 -# endif -#endif /* Optimizing and Inlining. */ - - #if defined __USE_SVID || defined __USE_XOPEN_EXTENDED /* Convert N to base 64 using the digits "./0-9A-Za-z", least-significant digit first. Returns a pointer to static storage overwritten by the @@ -638,20 +492,6 @@ extern void *valloc (size_t __size) __THROW __attribute_malloc__; /* Allocate memory of SIZE bytes with an alignment of ALIGNMENT. */ extern int posix_memalign (void **__memptr, size_t __alignment, size_t __size) __THROW __attribute_malloc__; -#if 0 -/* Cope with autoconf's broken AC_FUNC_MALLOC macro, which - * redefines malloc to rpl_malloc if it does not detect glibc - * style returning-a-valid-pointer-for-malloc(0) behavior. This - * calls malloc() as usual, but if __size is zero, we allocate and - * return a 1-byte block instead.... sigh... */ -static __inline void *rpl_malloc (size_t __size) -{ - if (__size == 0) { - __size++; - } - return malloc(__size); -} -#endif #endif __BEGIN_NAMESPACE_STD @@ -777,14 +617,6 @@ extern int system (__const char *__command); __END_NAMESPACE_STD -#if 0 -/*#ifdef __USE_GNU*/ -/* Return a malloc'd string containing the canonical absolute name of the - named file. The last file name component need not exist, and may be a - symlink to a nonexistent file. */ -extern char *canonicalize_file_name (__const char *__name) __THROW; -#endif - #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED /* Return the canonical absolute name of file NAME. The last file name component need not exist, and may be a symlink to a nonexistent file. @@ -849,60 +681,6 @@ __END_NAMESPACE_C99 #endif -#if 0 -#ifdef __UCLIBC_HAS_FLOATS__ -#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED -/* Convert floating point numbers to strings. The returned values are - valid only until another call to the same function. */ - -/* Convert VALUE to a string with NDIGIT digits and return a pointer to - this. Set *DECPT with the position of the decimal character and *SIGN - with the sign of the number. */ -extern char *ecvt (double __value, int __ndigit, int *__restrict __decpt, - int *__restrict __sign) __THROW; - -/* Convert VALUE to a string rounded to NDIGIT decimal digits. Set *DECPT - with the position of the decimal character and *SIGN with the sign of - the number. */ -extern char *fcvt (double __value, int __ndigit, int *__restrict __decpt, - int *__restrict __sign) __THROW; - -/* If possible convert VALUE to a string with NDIGIT significant digits. - Otherwise use exponential representation. The resulting string will - be written to BUF. */ -extern char *gcvt (double __value, int __ndigit, char *__buf) __THROW; - - -# ifdef __USE_MISC -/* Long double versions of above functions. */ -extern char *qecvt (long double __value, int __ndigit, - int *__restrict __decpt, int *__restrict __sign) __THROW; -extern char *qfcvt (long double __value, int __ndigit, - int *__restrict __decpt, int *__restrict __sign) __THROW; -extern char *qgcvt (long double __value, int __ndigit, char *__buf) __THROW; - - -/* Reentrant version of the functions above which provide their own - buffers. */ -extern int ecvt_r (double __value, int __ndigit, int *__restrict __decpt, - int *__restrict __sign, char *__restrict __buf, - size_t __len) __THROW; -extern int fcvt_r (double __value, int __ndigit, int *__restrict __decpt, - int *__restrict __sign, char *__restrict __buf, - size_t __len) __THROW; - -extern int qecvt_r (long double __value, int __ndigit, - int *__restrict __decpt, int *__restrict __sign, - char *__restrict __buf, size_t __len) __THROW; -extern int qfcvt_r (long double __value, int __ndigit, - int *__restrict __decpt, int *__restrict __sign, - char *__restrict __buf, size_t __len) __THROW; -# endif /* misc */ -#endif /* use MISC || use X/Open Unix */ -#endif /* __UCLIBC_HAS_FLOATS__ */ -#endif - - #ifdef __UCLIBC_HAS_WCHAR__ __BEGIN_NAMESPACE_STD /* Return the length of the multibyte character @@ -984,9 +762,7 @@ extern char *ptsname (int __fd) __THROW; /* Store at most BUFLEN characters of the pathname of the slave pseudo terminal associated with the master FD is open on in BUF. Return 0 on success, otherwise an error number. */ -#if 0 extern int ptsname_r (int __fd, char *__buf, size_t __buflen) __THROW; -#endif /* Open a master pseudo terminal and return its file descriptor. */ extern int getpt (void) __THROW; diff --git a/include/string.h b/include/string.h index a2045eeda..35e98a805 100644 --- a/include/string.h +++ b/include/string.h @@ -349,11 +349,6 @@ extern char *strsep (char **__restrict __stringp, #endif #ifdef __USE_GNU -#if 0 -/* Compare S1 and S2 as strings holding name & indices/version numbers. */ -extern int strverscmp (__const char *__s1, __const char *__s2) - __THROW __attribute_pure__; -#endif /* Return a string describing the meaning of the signal number in SIG. */ extern char *strsignal (int __sig) __THROW; @@ -371,14 +366,6 @@ extern char *__stpncpy (char *__restrict __dest, extern char *stpncpy (char *__restrict __dest, __const char *__restrict __src, size_t __n) __THROW; -#if 0 -/* Sautee STRING briskly. */ -extern char *strfry (char *__string) __THROW; - -/* Frobnicate N bytes of S. */ -extern void *memfrob (void *__s, size_t __n) __THROW; -#endif - # ifndef basename /* Return the file name within directory of FILENAME. We don't declare the function if the `basename' macro is available (defined @@ -389,37 +376,6 @@ extern char *basename (__const char *__filename) __THROW; #endif -#if 0 -#if defined __GNUC__ && __GNUC__ >= 2 -# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ - && !defined __NO_INLINE__ && !defined __cplusplus -/* When using GNU CC we provide some optimized versions of selected - functions from this header. There are two kinds of optimizations: - - - machine-dependent optimizations, most probably using inline - assembler code; these might be quite expensive since the code - size can increase significantly. - These optimizations are not used unless the symbol - __USE_STRING_INLINES - is defined before including this header. - - - machine-independent optimizations which do not increase the - code size significantly and which optimize mainly situations - where one or more arguments are compile-time constants. - These optimizations are used always when the compiler is - taught to optimize. - - One can inhibit all optimizations by defining __NO_STRING_INLINES. */ - -/* Get the machine-dependent optimizations (if any). */ -# include <bits/string.h> - -/* These are generic optimizations which do not add too much inline code. */ -# include <bits/string2.h> -# endif -#endif -#endif - #ifdef __USE_BSD /* Two OpenBSD extension functions. */ extern size_t strlcat(char *__restrict dst, const char *__restrict src, diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h index 8feb3bbea..85dc3d281 100644 --- a/include/sys/sysmacros.h +++ b/include/sys/sysmacros.h @@ -26,30 +26,30 @@ not going to hack weird hacks to support the dev_t representation they need. */ __extension__ -extern __inline unsigned int gnu_dev_major (unsigned long long int __dev) +static __inline unsigned int gnu_dev_major (unsigned long long int __dev) __THROW; __extension__ -extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev) +static __inline unsigned int gnu_dev_minor (unsigned long long int __dev) __THROW; __extension__ -extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major, +static __inline unsigned long long int gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW; #if defined __GNUC__ && __GNUC__ >= 2 -__extension__ extern __inline unsigned int +__extension__ static __inline unsigned int gnu_dev_major (unsigned long long int __dev) __THROW { return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); } -__extension__ extern __inline unsigned int +__extension__ static __inline unsigned int gnu_dev_minor (unsigned long long int __dev) __THROW { return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); } -__extension__ extern __inline unsigned long long int +__extension__ static __inline unsigned long long int gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW { return ((__minor & 0xff) | ((__major & 0xfff) << 8) diff --git a/include/unistd.h b/include/unistd.h index 931fe9951..0908c647a 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -259,13 +259,6 @@ typedef __socklen_t socklen_t; /* Test for access to NAME using the real UID and real GID. */ extern int access (__const char *__name, int __type) __THROW; -#if 0 -/*#ifdef __USE_GNU*/ -/* Test for access to NAME using the effective UID and GID - (as normal file operations use). */ -extern int euidaccess (__const char *__name, int __type) __THROW; -#endif - /* Values for the WHENCE argument to lseek. */ #ifndef _STDIO_H /* <stdio.h> has the same definitions. */ @@ -454,15 +447,6 @@ extern char **environ; extern int execve (__const char *__path, char *__const __argv[], char *__const __envp[]) __THROW; -#if 0 -/*#ifdef __USE_GNU*/ -/* Execute the file FD refers to, overlaying the running program image. - ARGV and ENVP are passed to the new program, as for `execve'. */ -extern int fexecve (int __fd, char *__const __argv[], char *__const __envp[]) - __THROW; -#endif - - /* Execute PATH with arguments ARGV and environment from `environ'. */ extern int execv (__const char *__path, char *__const __argv[]) __THROW; @@ -601,12 +585,6 @@ extern __gid_t getegid (void) __THROW; of its supplementary groups in LIST and return the number written. */ extern int getgroups (int __size, __gid_t __list[]) __THROW; -#if 0 -/*#ifdef __USE_GNU*/ -/* Return nonzero iff the calling process is in group GID. */ -extern int group_member (__gid_t __gid) __THROW; -#endif - /* Set the user ID of the calling process to UID. If the calling process is the super-user, set the real and effective user IDs, and the saved set-user-ID to UID; diff --git a/include/wchar.h b/include/wchar.h index 3787bbb43..ed83ccc4a 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -341,17 +341,7 @@ extern size_t __mbrlen (__const char *__restrict __s, size_t __n, mbstate_t *__restrict __ps) __THROW; extern size_t mbrlen (__const char *__restrict __s, size_t __n, mbstate_t *__restrict __ps) __THROW; -__END_NAMESPACE_C99 - -#ifdef __USE_EXTERN_INLINES -/* Define inline function as optimization. */ -extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n, - mbstate_t *__restrict __ps) __THROW -{ return (__ps != NULL - ? mbrtowc (NULL, __s, __n, __ps) : __mbrlen (__s, __n, NULL)); } -#endif -__BEGIN_NAMESPACE_C99 /* Write wide character representation of multibyte character string SRC to DST. */ extern size_t mbsrtowcs (wchar_t *__restrict __dst, @@ -533,94 +523,6 @@ extern long double __wcstold_l (__const wchar_t *__restrict __nptr, #endif /* GNU */ -#if 0 -#ifdef __UCLIBC_HAS_FLOATS__ -/* The internal entry points for `wcstoX' take an extra flag argument - saying whether or not to parse locale-dependent number grouping. */ -extern double __wcstod_internal (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __group) - __THROW; -extern float __wcstof_internal (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __group) - __THROW; -extern long double __wcstold_internal (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, - int __group) __THROW; -#endif /* __UCLIBC_HAS_FLOATS__ */ - -#ifndef __wcstol_internal_defined -extern long int __wcstol_internal (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, - int __base, int __group) __THROW; -# define __wcstol_internal_defined 1 -#endif -#ifndef __wcstoul_internal_defined -extern unsigned long int __wcstoul_internal (__const wchar_t *__restrict __npt, - wchar_t **__restrict __endptr, - int __base, int __group) __THROW; -# define __wcstoul_internal_defined 1 -#endif -#ifndef __wcstoll_internal_defined -__extension__ -extern long long int __wcstoll_internal (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, - int __base, int __group) __THROW; -# define __wcstoll_internal_defined 1 -#endif -#ifndef __wcstoull_internal_defined -__extension__ -extern unsigned long long int __wcstoull_internal (__const wchar_t * - __restrict __nptr, - wchar_t ** - __restrict __endptr, - int __base, - int __group) __THROW; -# define __wcstoull_internal_defined 1 -#endif - - -#if defined __OPTIMIZE__ && __GNUC__ >= 2 -/* Define inline functions which call the internal entry points. */ -/* __BEGIN_NAMESPACE_C99 */ - -/* extern __inline double wcstod (__const wchar_t *__restrict __nptr, */ -/* wchar_t **__restrict __endptr) __THROW */ -/* { return __wcstod_internal (__nptr, __endptr, 0); } */ -/* extern __inline long int wcstol (__const wchar_t *__restrict __nptr, */ -/* wchar_t **__restrict __endptr, */ -/* int __base) __THROW */ -/* { return __wcstol_internal (__nptr, __endptr, __base, 0); } */ -/* extern __inline unsigned long int wcstoul (__const wchar_t *__restrict __nptr, */ -/* wchar_t **__restrict __endptr, */ -/* int __base) __THROW */ -/* { return __wcstoul_internal (__nptr, __endptr, __base, 0); } */ -/* __END_NAMESPACE_C99 */ - -# ifdef __USE_GNU -/* extern __inline float wcstof (__const wchar_t *__restrict __nptr, */ -/* wchar_t **__restrict __endptr) __THROW */ -/* { return __wcstof_internal (__nptr, __endptr, 0); } */ -/* extern __inline long double wcstold (__const wchar_t *__restrict __nptr, */ -/* wchar_t **__restrict __endptr) __THROW */ -/* { return __wcstold_internal (__nptr, __endptr, 0); } */ - - -/* __extension__ */ -/* extern __inline long long int wcstoq (__const wchar_t *__restrict __nptr, */ -/* wchar_t **__restrict __endptr, */ -/* int __base) __THROW */ -/* { return __wcstoll_internal (__nptr, __endptr, __base, 0); } */ -/* __extension__ */ -/* extern __inline unsigned long long int wcstouq (__const wchar_t * */ -/* __restrict __nptr, */ -/* wchar_t **__restrict __endptr, */ -/* int __base) __THROW */ -/* { return __wcstoull_internal (__nptr, __endptr, __base, 0); } */ -# endif /* Use GNU. */ -#endif /* Optimizing GCC >=2. */ -#endif /* 0 */ - - #ifdef __USE_GNU /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ |