yann@108: diff -ur uClibc-0.9.29/libc/inet/rpc/rcmd.c uClibc-0.9.29-patched/libc/inet/rpc/rcmd.c yann@108: --- uClibc-0.9.29/libc/inet/rpc/rcmd.c 2007-01-10 11:46:19.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/inet/rpc/rcmd.c 2007-05-09 18:05:21.638421151 -0500 yann@108: @@ -126,7 +126,7 @@ yann@108: libc_hidden_proto(listen) yann@108: libc_hidden_proto(sigsetmask) yann@108: libc_hidden_proto(getc_unlocked) yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +//libc_hidden_proto(fgetc_unlocked) yann@108: libc_hidden_proto(fopen) yann@108: libc_hidden_proto(fclose) yann@108: libc_hidden_proto(fprintf) yann@108: diff -ur uClibc-0.9.29/libc/inet/rpc/ruserpass.c uClibc-0.9.29-patched/libc/inet/rpc/ruserpass.c yann@108: --- uClibc-0.9.29/libc/inet/rpc/ruserpass.c 2006-03-23 05:14:16.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/inet/rpc/ruserpass.c 2007-05-09 18:05:21.638421151 -0500 yann@108: @@ -63,7 +63,7 @@ yann@108: libc_hidden_proto(fopen) yann@108: libc_hidden_proto(fclose) yann@108: libc_hidden_proto(getc_unlocked) yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +//libc_hidden_proto(__fgetc_unlocked) yann@108: yann@108: #define _(X) (X) yann@108: /* #include "ftp_var.h" */ yann@108: diff -ur uClibc-0.9.29/libc/misc/error/error.c uClibc-0.9.29-patched/libc/misc/error/error.c yann@108: --- uClibc-0.9.29/libc/misc/error/error.c 2006-05-04 09:44:13.000000000 -0500 yann@108: +++ uClibc-0.9.29-patched/libc/misc/error/error.c 2007-05-09 18:05:21.646421810 -0500 yann@108: @@ -30,11 +30,14 @@ yann@108: libc_hidden_proto(strerror) yann@108: libc_hidden_proto(fprintf) yann@108: libc_hidden_proto(exit) yann@108: +//#undef putc yann@108: libc_hidden_proto(putc) yann@108: +libc_hidden_proto(fputc) yann@108: libc_hidden_proto(vfprintf) yann@108: libc_hidden_proto(fflush) yann@108: -libc_hidden_proto(fputc) yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: +//#ifdef __UCLIBC_HAS_STDIO_PUTC_MACRO__ yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: +//#endif yann@108: yann@108: /* This variable is incremented each time `error' is called. */ yann@108: unsigned int error_message_count = 0; yann@108: diff -ur uClibc-0.9.29/libc/misc/ttyent/getttyent.c uClibc-0.9.29-patched/libc/misc/ttyent/getttyent.c yann@108: --- uClibc-0.9.29/libc/misc/ttyent/getttyent.c 2006-12-07 17:24:02.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/misc/ttyent/getttyent.c 2007-05-09 18:05:21.646421810 -0500 yann@108: @@ -44,8 +44,10 @@ yann@108: libc_hidden_proto(__fsetlocking) yann@108: libc_hidden_proto(rewind) yann@108: libc_hidden_proto(fgets_unlocked) yann@108: +//#undef getc_unlocked yann@108: libc_hidden_proto(getc_unlocked) yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +//#undef fgetc_unlocked yann@108: +libc_hidden_proto(fgetc_unlocked) yann@108: libc_hidden_proto(fopen) yann@108: libc_hidden_proto(fclose) yann@108: libc_hidden_proto(abort) yann@108: diff -ur uClibc-0.9.29/libc/pwd_grp/pwd_grp.c uClibc-0.9.29-patched/libc/pwd_grp/pwd_grp.c yann@108: --- uClibc-0.9.29/libc/pwd_grp/pwd_grp.c 2007-04-13 03:32:18.000000000 -0500 yann@108: +++ uClibc-0.9.29-patched/libc/pwd_grp/pwd_grp.c 2007-05-09 18:05:21.638421151 -0500 yann@108: @@ -43,11 +43,12 @@ yann@108: libc_hidden_proto(strtoul) yann@108: libc_hidden_proto(rewind) yann@108: libc_hidden_proto(fgets_unlocked) yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: libc_hidden_proto(sprintf) yann@108: libc_hidden_proto(fopen) yann@108: libc_hidden_proto(fclose) yann@108: libc_hidden_proto(fprintf) yann@108: +//#undef fputc_unlocked yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: #ifdef __UCLIBC_HAS_XLOCALE__ yann@108: libc_hidden_proto(__ctype_b_loc) yann@108: #elif __UCLIBC_HAS_CTYPE_TABLES__ yann@108: @@ -801,7 +802,7 @@ yann@108: yann@108: do { yann@108: if (!*m) { yann@108: - if (__fputc_unlocked('\n', f) >= 0) { yann@108: + if (fputc_unlocked('\n', f) >= 0) { yann@108: rv = 0; yann@108: } yann@108: break; yann@108: @@ -867,7 +868,7 @@ yann@108: goto DO_UNLOCK; yann@108: } yann@108: yann@108: - if (__fputc_unlocked('\n', stream) > 0) { yann@108: + if (fputc_unlocked('\n', stream) > 0) { yann@108: rv = 0; yann@108: } yann@108: yann@108: diff -ur uClibc-0.9.29/libc/stdio/_scanf.c uClibc-0.9.29-patched/libc/stdio/_scanf.c yann@108: --- uClibc-0.9.29/libc/stdio/_scanf.c 2007-01-20 12:32:10.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/_scanf.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -86,7 +86,8 @@ yann@108: libc_hidden_proto(vsscanf) yann@108: libc_hidden_proto(fclose) yann@108: libc_hidden_proto(getc_unlocked) yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +//#undef fgetc_unlocked yann@108: +libc_hidden_proto(fgetc_unlocked) yann@108: #ifdef __UCLIBC_HAS_WCHAR__ yann@108: libc_hidden_proto(wcslen) yann@108: libc_hidden_proto(vfwscanf) yann@108: diff -ur uClibc-0.9.29/libc/stdio/fgetc.c uClibc-0.9.29-patched/libc/stdio/fgetc.c yann@108: --- uClibc-0.9.29/libc/stdio/fgetc.c 2006-01-15 16:41:03.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/fgetc.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -13,13 +13,13 @@ yann@108: #undef getc yann@108: #undef getc_unlocked yann@108: yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +libc_hidden_proto(fgetc_unlocked) yann@108: yann@108: #ifdef __DO_UNLOCKED yann@108: yann@108: libc_hidden_proto(fflush_unlocked) yann@108: yann@108: -int __fgetc_unlocked(FILE *stream) yann@108: +int fgetc_unlocked(FILE *stream) yann@108: { yann@108: __STDIO_STREAM_VALIDATE(stream); yann@108: yann@108: @@ -73,26 +73,22 @@ yann@108: yann@108: return EOF; yann@108: } yann@108: -libc_hidden_def(__fgetc_unlocked) yann@108: - yann@108: -libc_hidden_proto(fgetc_unlocked) yann@108: -strong_alias(__fgetc_unlocked,fgetc_unlocked) yann@108: libc_hidden_def(fgetc_unlocked) yann@108: yann@108: //libc_hidden_proto(__getc_unlocked) yann@108: -//strong_alias(__fgetc_unlocked,__getc_unlocked) yann@108: +//strong_alias(fgetc_unlocked,__getc_unlocked) yann@108: //libc_hidden_def(__getc_unlocked) yann@108: yann@108: libc_hidden_proto(getc_unlocked) yann@108: -strong_alias(__fgetc_unlocked,getc_unlocked) yann@108: +strong_alias(fgetc_unlocked,getc_unlocked) yann@108: libc_hidden_def(getc_unlocked) yann@108: yann@108: #ifndef __UCLIBC_HAS_THREADS__ yann@108: libc_hidden_proto(fgetc) yann@108: -strong_alias(__fgetc_unlocked,fgetc) yann@108: +strong_alias(fgetc_unlocked,fgetc) yann@108: libc_hidden_def(fgetc) yann@108: yann@108: -strong_alias(__fgetc_unlocked,getc) yann@108: +strong_alias(fgetc_unlocked,getc) yann@108: #endif yann@108: yann@108: #elif defined __UCLIBC_HAS_THREADS__ yann@108: diff -ur uClibc-0.9.29/libc/stdio/fgets.c uClibc-0.9.29-patched/libc/stdio/fgets.c yann@108: --- uClibc-0.9.29/libc/stdio/fgets.c 2006-01-15 16:41:03.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/fgets.c 2007-05-09 18:05:21.638421151 -0500 yann@108: @@ -10,8 +10,7 @@ yann@108: libc_hidden_proto(fgets_unlocked) yann@108: yann@108: #ifdef __DO_UNLOCKED yann@108: - yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +libc_hidden_proto(fgetc_unlocked) yann@108: yann@108: char *fgets_unlocked(char *__restrict s, int n, yann@108: register FILE * __restrict stream) yann@108: @@ -38,7 +37,7 @@ yann@108: break; yann@108: } yann@108: } else { yann@108: - if ((c = __fgetc_unlocked(stream)) == EOF) { yann@108: + if ((c = fgetc_unlocked(stream)) == EOF) { yann@108: if (__FERROR_UNLOCKED(stream)) { yann@108: goto ERROR; yann@108: } yann@108: diff -ur uClibc-0.9.29/libc/stdio/fputc.c uClibc-0.9.29-patched/libc/stdio/fputc.c yann@108: --- uClibc-0.9.29/libc/stdio/fputc.c 2007-04-14 12:03:18.000000000 -0500 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/fputc.c 2007-05-09 20:50:51.350629927 -0500 yann@108: @@ -16,7 +16,7 @@ yann@108: yann@108: #ifdef __DO_UNLOCKED yann@108: yann@108: -int __fputc_unlocked(int c, register FILE *stream) yann@108: +int fputc_unlocked(int c, register FILE *stream) yann@108: { yann@108: __STDIO_STREAM_VALIDATE(stream); yann@108: yann@108: @@ -70,22 +70,22 @@ yann@108: BAD: yann@108: return EOF; yann@108: } yann@108: -libc_hidden_def(__fputc_unlocked) yann@108: +libc_hidden_def(fputc_unlocked) yann@108: yann@108: /* exposing these would be fundamentally *wrong*! fix you, instead! */ yann@108: /* libc_hidden_proto(fputc_unlocked) */ yann@108: -strong_alias(__fputc_unlocked,fputc_unlocked) yann@108: +/* strong_alias(__fputc_unlocked,fputc_unlocked) */ yann@108: /* exposing these would be fundamentally *wrong*! fix you, instead! */ yann@108: /* libc_hidden_def(fputc_unlocked) */ yann@108: yann@108: libc_hidden_proto(putc_unlocked) yann@108: -strong_alias(__fputc_unlocked,putc_unlocked) yann@108: +strong_alias(fputc_unlocked,putc_unlocked) yann@108: libc_hidden_def(putc_unlocked) yann@108: #ifndef __UCLIBC_HAS_THREADS__ yann@108: -strong_alias(__fputc_unlocked,fputc) yann@108: +strong_alias(fputc_unlocked,fputc) yann@108: yann@108: libc_hidden_proto(putc) yann@108: -strong_alias(__fputc_unlocked,putc) yann@108: +strong_alias(fputc_unlocked,putc) yann@108: libc_hidden_def(putc) yann@108: #endif yann@108: yann@108: diff -ur uClibc-0.9.29/libc/stdio/getchar.c uClibc-0.9.29-patched/libc/stdio/getchar.c yann@108: --- uClibc-0.9.29/libc/stdio/getchar.c 2006-12-19 22:30:25.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/getchar.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -7,7 +7,8 @@ yann@108: yann@108: #include "_stdio.h" yann@108: yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +//#undef fgetc_unlocked yann@108: +libc_hidden_proto(fgetc_unlocked) yann@108: yann@108: #undef getchar yann@108: #ifdef __DO_UNLOCKED yann@108: diff -ur uClibc-0.9.29/libc/stdio/getdelim.c uClibc-0.9.29-patched/libc/stdio/getdelim.c yann@108: --- uClibc-0.9.29/libc/stdio/getdelim.c 2006-02-13 02:52:46.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/getdelim.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -11,8 +11,8 @@ yann@108: #include "_stdio.h" yann@108: yann@108: libc_hidden_proto(getdelim) yann@108: - yann@108: -libc_hidden_proto(__fgetc_unlocked) yann@108: +//#undef fgetc_unlocked yann@108: +libc_hidden_proto(fgetc_unlocked) yann@108: yann@108: /* Note: There is a defect in this function. (size_t vs ssize_t). */ yann@108: yann@108: diff -ur uClibc-0.9.29/libc/stdio/old_vfprintf.c uClibc-0.9.29-patched/libc/stdio/old_vfprintf.c yann@108: --- uClibc-0.9.29/libc/stdio/old_vfprintf.c 2006-01-22 13:35:08.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/old_vfprintf.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -149,7 +149,8 @@ yann@108: libc_hidden_proto(strnlen) yann@108: libc_hidden_proto(memcpy) yann@108: libc_hidden_proto(putc_unlocked) yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: +//#undef fputc_unlocked yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: libc_hidden_proto(__glibc_strerror_r) yann@108: yann@108: /* #undef __UCLIBC_HAS_FLOATS__ */ yann@108: diff -ur uClibc-0.9.29/libc/stdio/putchar.c uClibc-0.9.29-patched/libc/stdio/putchar.c yann@108: --- uClibc-0.9.29/libc/stdio/putchar.c 2006-01-13 18:58:03.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/putchar.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -7,7 +7,8 @@ yann@108: yann@108: #include "_stdio.h" yann@108: yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: +//#undef fputc_unlocked yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: yann@108: #undef putchar yann@108: #ifdef __DO_UNLOCKED yann@108: diff -ur uClibc-0.9.29/libc/stdio/puts.c uClibc-0.9.29-patched/libc/stdio/puts.c yann@108: --- uClibc-0.9.29/libc/stdio/puts.c 2006-01-13 18:58:03.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/puts.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -7,7 +7,8 @@ yann@108: yann@108: #include "_stdio.h" yann@108: yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: +//#undef fputc_unlocked yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: libc_hidden_proto(fputs_unlocked) yann@108: yann@108: int puts(register const char * __restrict s) yann@108: @@ -25,7 +26,7 @@ yann@108: /* Note: Nonportable as fputs need only return nonnegative on success. */ yann@108: if ((n = fputs_unlocked(s, stream)) != EOF) { yann@108: ++n; yann@108: - if (__fputc_unlocked('\n', stream) == EOF) { yann@108: + if (fputc_unlocked('\n', stream) == EOF) { yann@108: n = EOF; yann@108: } yann@108: } yann@108: diff -ur uClibc-0.9.29/libc/stdio/putwchar.c uClibc-0.9.29-patched/libc/stdio/putwchar.c yann@108: --- uClibc-0.9.29/libc/stdio/putwchar.c 2006-01-14 14:16:19.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/stdio/putwchar.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -22,7 +22,8 @@ yann@108: yann@108: #elif defined __UCLIBC_HAS_THREADS__ yann@108: yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: +//#undef fputc_unlocked yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: /* psm: should this be fputwc? */ yann@108: libc_hidden_proto(fputc) yann@108: yann@108: diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/bits/uClibc_stdio.h uClibc-0.9.29-patched/libc/sysdeps/linux/common/bits/uClibc_stdio.h yann@108: --- uClibc-0.9.29/libc/sysdeps/linux/common/bits/uClibc_stdio.h 2007-01-28 07:16:58.000000000 -0600 yann@108: +++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/bits/uClibc_stdio.h 2007-05-09 20:56:02.408110608 -0500 yann@108: @@ -381,33 +381,29 @@ yann@108: # define __FEOF(__stream) __FEOF_UNLOCKED(__stream) yann@108: #endif yann@108: yann@108: -extern int __fgetc_unlocked(FILE *__stream); yann@108: -extern int __fputc_unlocked(int __c, FILE *__stream); yann@108: - yann@108: /* First define the default definitions. yann@108: They are overridden below as necessary. */ yann@108: -#define __FGETC_UNLOCKED(__stream) (__fgetc_unlocked)((__stream)) yann@108: +#define __FGETC_UNLOCKED(__stream) (fgetc_unlocked)((__stream)) yann@108: #define __FGETC(__stream) (fgetc)((__stream)) yann@108: -#define __GETC_UNLOCKED_MACRO(__stream) (__fgetc_unlocked)((__stream)) yann@108: -#define __GETC_UNLOCKED(__stream) (__fgetc_unlocked)((__stream)) yann@108: +#define __GETC_UNLOCKED_MACRO(__stream) (fgetc_unlocked)((__stream)) yann@108: +#define __GETC_UNLOCKED(__stream) (fgetc_unlocked)((__stream)) yann@108: #define __GETC(__stream) (fgetc)((__stream)) yann@108: yann@108: -#define __FPUTC_UNLOCKED(__c, __stream) (__fputc_unlocked)((__c),(__stream)) yann@108: +#define __FPUTC_UNLOCKED(__c, __stream) (fputc_unlocked)((__c),(__stream)) yann@108: #define __FPUTC(__c, __stream) (fputc)((__c),(__stream)) yann@108: -#define __PUTC_UNLOCKED_MACRO(__c, __stream) (__fputc_unlocked)((__c),(__stream)) yann@108: -#define __PUTC_UNLOCKED(__c, __stream) (__fputc_unlocked)((__c),(__stream)) yann@108: +#define __PUTC_UNLOCKED_MACRO(__c, __stream) (fputc_unlocked)((__c),(__stream)) yann@108: +#define __PUTC_UNLOCKED(__c, __stream) (fputc_unlocked)((__c),(__stream)) yann@108: #define __PUTC(__c, __stream) (fputc)((__c),(__stream)) yann@108: yann@108: yann@108: #ifdef __STDIO_GETC_MACRO yann@108: - yann@108: extern FILE *__stdin; /* For getchar() macro. */ yann@108: yann@108: # undef __GETC_UNLOCKED_MACRO yann@108: # define __GETC_UNLOCKED_MACRO(__stream) \ yann@108: ( ((__stream)->__bufpos < (__stream)->__bufgetc_u) \ yann@108: ? (*(__stream)->__bufpos++) \ yann@108: - : __fgetc_unlocked(__stream) ) yann@108: + : fgetc_unlocked(__stream) ) yann@108: yann@108: # if 0 yann@108: /* Classic macro approach. getc{_unlocked} can have side effects. */ yann@108: @@ -453,20 +449,17 @@ yann@108: # endif yann@108: # endif yann@108: yann@108: -#else yann@108: - yann@108: #endif /* __STDIO_GETC_MACRO */ yann@108: yann@108: yann@108: #ifdef __STDIO_PUTC_MACRO yann@108: - yann@108: extern FILE *__stdout; /* For putchar() macro. */ yann@108: yann@108: # undef __PUTC_UNLOCKED_MACRO yann@108: # define __PUTC_UNLOCKED_MACRO(__c, __stream) \ yann@108: ( ((__stream)->__bufpos < (__stream)->__bufputc_u) \ yann@108: ? (*(__stream)->__bufpos++) = (__c) \ yann@108: - : __fputc_unlocked((__c),(__stream)) ) yann@108: + : (fputc_unlocked((__c),(__stream)) ) yann@108: yann@108: # if 0 yann@108: /* Classic macro approach. putc{_unlocked} can have side effects.*/ yann@108: @@ -489,7 +482,8 @@ yann@108: }) ) yann@108: yann@108: # undef __PUTC_UNLOCKED yann@108: -# define __PUTC_UNLOCKED(__c, __stream) __FPUTC_UNLOCKED((__c), (__stream)) yann@108: +# define __PUTC_UNLOCKED(__c, __stream) \ yann@108: + __FPUTC_UNLOCKED((__c), (__stream)) yann@108: yann@108: # ifdef __UCLIBC_HAS_THREADS__ yann@108: # undef __FPUTC yann@108: diff -ur uClibc-0.9.29/libc/unistd/getpass.c uClibc-0.9.29-patched/libc/unistd/getpass.c yann@108: --- uClibc-0.9.29/libc/unistd/getpass.c 2006-07-05 05:58:38.000000000 -0500 yann@108: +++ uClibc-0.9.29-patched/libc/unistd/getpass.c 2007-05-09 18:05:21.642421481 -0500 yann@108: @@ -36,7 +36,8 @@ yann@108: libc_hidden_proto(fputs) yann@108: libc_hidden_proto(fputc) yann@108: libc_hidden_proto(putc) yann@108: -libc_hidden_proto(__fputc_unlocked) yann@108: +//#undef fputc_unlocked yann@108: +libc_hidden_proto(fputc_unlocked) yann@108: yann@108: /* It is desirable to use this bit on systems that have it. yann@108: The only bit of terminal state we want to twiddle is echoing, which is