svn commit: trunk/uClibc/libc: inet inet/rpc misc/ftw misc/internals mi etc...
psm at uclibc.org
psm at uclibc.org
Tue Nov 29 00:50:19 UTC 2005
Author: psm
Date: 2005-11-28 16:50:10 -0800 (Mon, 28 Nov 2005)
New Revision: 12562
Log:
Hiding again
Modified:
trunk/uClibc/libc/inet/resolv.c
trunk/uClibc/libc/inet/rpc/auth_unix.c
trunk/uClibc/libc/inet/rpc/clnt_tcp.c
trunk/uClibc/libc/inet/rpc/clnt_unix.c
trunk/uClibc/libc/inet/rpc/rcmd.c
trunk/uClibc/libc/inet/rpc/ruserpass.c
trunk/uClibc/libc/inet/rpc/svc.c
trunk/uClibc/libc/inet/rpc/svc_tcp.c
trunk/uClibc/libc/inet/rpc/svc_udp.c
trunk/uClibc/libc/inet/rpc/svc_unix.c
trunk/uClibc/libc/inet/rpc/xdr_rec.c
trunk/uClibc/libc/misc/ftw/ftw.c
trunk/uClibc/libc/misc/internals/__uClibc_main.c
trunk/uClibc/libc/misc/locale/locale.c
trunk/uClibc/libc/misc/search/tsearch.c
trunk/uClibc/libc/misc/time/time.c
trunk/uClibc/libc/misc/utmp/utent.c
trunk/uClibc/libc/misc/wchar/wchar.c
trunk/uClibc/libc/misc/wchar/wstdio.c
trunk/uClibc/libc/misc/wordexp/wordexp.c
trunk/uClibc/libc/stdio/fgetwc.c
trunk/uClibc/libc/stdio/scanf.c
trunk/uClibc/libc/stdio/vfprintf.c
trunk/uClibc/libc/stdlib/malloc-standard/malloc.h
trunk/uClibc/libc/stdlib/rand.c
trunk/uClibc/libc/stdlib/random.c
trunk/uClibc/libc/stdlib/random_r.c
trunk/uClibc/libc/stdlib/seed48.c
trunk/uClibc/libc/stdlib/seed48_r.c
trunk/uClibc/libc/stdlib/setenv.c
trunk/uClibc/libc/stdlib/stdlib.c
trunk/uClibc/libc/stdlib/unix_grantpt.c
trunk/uClibc/libc/string/generic/bp-checks.h
trunk/uClibc/libc/sysdeps/linux/common/clock_getres.c
trunk/uClibc/libc/sysdeps/linux/common/getegid.c
trunk/uClibc/libc/sysdeps/linux/common/getgid.c
trunk/uClibc/libc/sysdeps/linux/common/getgroups.c
trunk/uClibc/libc/sysdeps/linux/common/setgroups.c
trunk/uClibc/libc/sysdeps/linux/common/ulimit.c
trunk/uClibc/libc/unistd/sysconf.c
Changeset:
Modified: trunk/uClibc/libc/inet/resolv.c
===================================================================
--- trunk/uClibc/libc/inet/resolv.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/resolv.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -137,6 +137,7 @@
#define strnlen __strnlen
#define strncat __strncat
#define strstr __strstr
+#define random __random
#define __FORCE_GLIBC
#include <features.h>
@@ -279,6 +280,11 @@
u_char *, size_t) attribute_hidden;
+extern int __gethostent_r (struct hostent *__restrict __result_buf,
+ char *__restrict __buf, size_t __buflen,
+ struct hostent **__restrict __result,
+ int *__restrict __h_errnop) attribute_hidden;
+
#ifdef L_encodeh
int attribute_hidden __encode_header(struct resolv_header *h, unsigned char *dest, int maxlen)
{
@@ -1604,7 +1610,7 @@
UNLOCK;
}
-int gethostent_r(struct hostent *result_buf, char *buf, size_t buflen,
+int attribute_hidden __gethostent_r(struct hostent *result_buf, char *buf, size_t buflen,
struct hostent **result, int *h_errnop)
{
int ret;
@@ -1627,6 +1633,7 @@
UNLOCK;
return(ret);
}
+strong_alias(__gethostent_r,gethostent_r)
struct hostent *gethostent (void)
{
@@ -1642,7 +1649,7 @@
struct hostent *host;
LOCK;
- gethostent_r(&h, buf, sizeof(buf), &host, &h_errno);
+ __gethostent_r(&h, buf, sizeof(buf), &host, &h_errno);
UNLOCK;
return(host);
}
Modified: trunk/uClibc/libc/inet/rpc/auth_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/auth_unix.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/auth_unix.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -38,6 +38,9 @@
* for the credentials.
*/
+#define sysconf __sysconf
+#define getegid __getegid
+
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/clnt_tcp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_tcp.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/clnt_tcp.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -51,6 +51,7 @@
*/
#define authnone_create __authnone_create
+#define xdrrec_create __xdrrec_create
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/clnt_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/clnt_unix.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/clnt_unix.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -47,6 +47,8 @@
*/
#define authnone_create __authnone_create
+#define xdrrec_create __xdrrec_create
+#define getegid __getegid
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/rcmd.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rcmd.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/rcmd.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -36,6 +36,7 @@
#endif /* LIBC_SCCS and not lint */
#define bcopy __bcopy
+#define sysconf __sysconf
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/ruserpass.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/ruserpass.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/ruserpass.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -28,6 +28,8 @@
*/
#define __fsetlocking __libc_fsetlocking
+#define getgid __getgid
+#define getegid __getegid
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/svc.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/svc.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -85,8 +85,8 @@
/* *************** SVCXPRT related stuff **************** */
/* Activate a transport handle. */
-void
-xprt_register (SVCXPRT *xprt)
+void attribute_hidden
+__xprt_register (SVCXPRT *xprt)
{
register int sock = xprt->xp_sock;
register int i;
@@ -125,6 +125,7 @@
POLLRDNORM | POLLRDBAND);
}
}
+strong_alias(__xprt_register,xprt_register)
/* De-activate a transport handle. */
void
Modified: trunk/uClibc/libc/inet/rpc/svc_tcp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_tcp.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/svc_tcp.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -41,6 +41,9 @@
* and a record/tcp stream.
*/
+#define xdrrec_create __xdrrec_create
+#define xprt_register __xprt_register
+
#define __FORCE_GLIBC
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/svc_udp.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_udp.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/svc_udp.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -39,6 +39,8 @@
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
+#define xprt_register __xprt_register
+
#define __FORCE_GLIBC
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/svc_unix.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/svc_unix.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/svc_unix.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -37,6 +37,10 @@
* and a record/unix stream.
*/
+#define xdrrec_create __xdrrec_create
+#define xprt_register __xprt_register
+#define getegid __getegid
+
#define __FORCE_GLIBC
#include <features.h>
Modified: trunk/uClibc/libc/inet/rpc/xdr_rec.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/xdr_rec.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/inet/rpc/xdr_rec.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -142,8 +142,8 @@
* write respectively. They are like the system
* calls expect that they take an opaque handle rather than an fd.
*/
-void
-xdrrec_create (XDR *xdrs, u_int sendsize,
+void attribute_hidden
+__xdrrec_create (XDR *xdrs, u_int sendsize,
u_int recvsize, caddr_t tcp_handle,
int (*readit) (char *, char *, int),
int (*writeit) (char *, char *, int))
@@ -204,6 +204,7 @@
rstrm->fbtbc = 0;
rstrm->last_frag = TRUE;
}
+strong_alias(__xdrrec_create,xdrrec_create)
/*
Modified: trunk/uClibc/libc/misc/ftw/ftw.c
===================================================================
--- trunk/uClibc/libc/misc/ftw/ftw.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/ftw/ftw.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -19,6 +19,7 @@
02111-1307 USA. */
#define mempcpy __libc_mempcpy
+#define tsearch __tsearch
#define _GNU_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -13,6 +13,9 @@
* avoided in the static library case.
*/
+#define getgid __getgid
+#define getegid __getegid
+
#define _ERRNO_H
#include <features.h>
#include <unistd.h>
Modified: trunk/uClibc/libc/misc/locale/locale.c
===================================================================
--- trunk/uClibc/libc/misc/locale/locale.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/locale/locale.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -1415,8 +1415,8 @@
#define Cc2wc_ROW_LEN __LOCALE_DATA_Cc2wc_ROW_LEN
extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
- const char **__restrict src, size_t n,
- mbstate_t *ps, int allow_continuation);
+ const char **__restrict src, size_t n,
+ mbstate_t *ps, int allow_continuation) attribute_hidden;
int __locale_mbrtowc_l(wchar_t *__restrict dst,
const char *__restrict src,
Modified: trunk/uClibc/libc/misc/search/tsearch.c
===================================================================
--- trunk/uClibc/libc/misc/search/tsearch.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/search/tsearch.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -51,7 +51,7 @@
int (*compar)(); ordering function
*/
-void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
+void attribute_hidden *__tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
{
register node *q;
register node **rootp = (node **) vrootp;
@@ -77,6 +77,7 @@
}
return (q);
}
+strong_alias(__tsearch,tsearch)
#endif
#ifdef L_tfind
Modified: trunk/uClibc/libc/misc/time/time.c
===================================================================
--- trunk/uClibc/libc/misc/time/time.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/time/time.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -131,6 +131,7 @@
#define _uintmaxtostr __libc__uintmaxtostr
#define strnlen __strnlen
+#define memcpy __memcpy
#define _GNU_SOURCE
#include <stdio.h>
@@ -224,15 +225,21 @@
extern time_t _time_mktime_tzi(struct tm *timeptr, int store_on_success,
rule_struct *tzi) attribute_hidden;
+extern char *__asctime (__const struct tm *__tp) attribute_hidden;
+
+extern char *__asctime_r (__const struct tm *__restrict __tp,
+ char *__restrict __buf) attribute_hidden;
+
/**********************************************************************/
#ifdef L_asctime
static char __time_str[26];
-char *asctime(const struct tm *__restrict ptm)
+char attribute_hidden *__asctime(const struct tm *ptm)
{
- return asctime_r(ptm, __time_str);
+ return __asctime_r(ptm, __time_str);
}
+strong_alias(__asctime,asctime)
#endif
/**********************************************************************/
@@ -300,7 +307,7 @@
' ', '?', '?', '?', '?', '\n', 0
};
-char *asctime_r(register const struct tm *__restrict ptm,
+char attribute_hidden *__asctime_r(register const struct tm *__restrict ptm,
register char *__restrict buffer)
{
int tmp;
@@ -374,6 +381,7 @@
return buffer - 8;
}
+strong_alias(__asctime_r,asctime_r)
#endif
/**********************************************************************/
@@ -448,7 +456,7 @@
char *ctime(const time_t *clock)
{
/* ANSI/ISO/SUSv3 say that ctime is equivalent to the following. */
- return asctime(localtime(clock));
+ return __asctime(localtime(clock));
}
#endif
@@ -459,7 +467,7 @@
{
struct tm xtm;
- return asctime_r(localtime_r(clock, &xtm), buf);
+ return __asctime_r(localtime_r(clock, &xtm), buf);
}
#endif
Modified: trunk/uClibc/libc/misc/utmp/utent.c
===================================================================
--- trunk/uClibc/libc/misc/utmp/utent.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/utmp/utent.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -108,7 +108,7 @@
}
/* Locking is done in __getutent */
-struct utmp *getutid (const struct utmp *utmp_entry)
+struct utmp attribute_hidden *__getutid (const struct utmp *utmp_entry)
{
struct utmp *lutmp;
@@ -133,6 +133,7 @@
return NULL;
}
+strong_alias(__getutid,getutid)
/* Locking is done in __getutent */
struct utmp *getutline(const struct utmp *utmp_entry)
@@ -150,6 +151,8 @@
return NULL;
}
+extern struct utmp *getutid (__const struct utmp *__id) attribute_hidden;
+
struct utmp *pututline (const struct utmp *utmp_entry)
{
LOCK;
@@ -157,7 +160,7 @@
the file pointer where they want it, everything will work out. */
lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
- if (getutid(utmp_entry) != NULL) {
+ if (__getutid(utmp_entry) != NULL) {
lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR);
if (write(static_fd, utmp_entry, sizeof(struct utmp)) != sizeof(struct utmp))
return NULL;
Modified: trunk/uClibc/libc/misc/wchar/wchar.c
===================================================================
--- trunk/uClibc/libc/misc/wchar/wchar.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/wchar/wchar.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -176,11 +176,11 @@
/* Implementation-specific work functions. */
extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
- const char **__restrict src, size_t n,
- mbstate_t *ps, int allow_continuation);
+ const char **__restrict src, size_t n,
+ mbstate_t *ps, int allow_continuation) attribute_hidden;
extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
- const wchar_t **__restrict src, size_t wn);
+ const wchar_t **__restrict src, size_t wn) attribute_hidden;
/* glibc extensions. */
@@ -271,16 +271,14 @@
/**********************************************************************/
#ifdef L_mbrlen
-size_t __mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps)
+size_t attribute_hidden __mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps)
{
static mbstate_t mbstate; /* Rely on bss 0-init. */
return __mbrtowc(NULL, s, n, (ps != NULL) ? ps : &mbstate);
}
+strong_alias(__mbrlen,mbrlen)
-size_t mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps)
- __attribute__ ((__weak__, __alias__("__mbrlen")));
-
#endif
/**********************************************************************/
#ifdef L_mbrtowc
@@ -372,7 +370,7 @@
/**********************************************************************/
#ifdef L_mbsrtowcs
-size_t mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src,
+size_t attribute_hidden __mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src,
size_t len, mbstate_t *__restrict ps)
{
static mbstate_t mbstate; /* Rely on bss 0-init. */
@@ -380,6 +378,7 @@
return __mbsnrtowcs(dst, src, SIZE_MAX, len,
((ps != NULL) ? ps : &mbstate));
}
+strong_alias(__mbsrtowcs,mbsrtowcs)
#endif
/**********************************************************************/
@@ -389,11 +388,12 @@
* TODO: Check for valid state anyway? */
-size_t wcsrtombs(char *__restrict dst, const wchar_t **__restrict src,
+size_t attribute_hidden __wcsrtombs(char *__restrict dst, const wchar_t **__restrict src,
size_t len, mbstate_t *__restrict ps)
{
return __wcsnrtombs(dst, src, SIZE_MAX, len, ps);
}
+strong_alias(__wcsrtombs,wcsrtombs)
#endif
/**********************************************************************/
@@ -410,7 +410,7 @@
#endif
#endif
-size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
+size_t attribute_hidden _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
const char **__restrict src, size_t n,
mbstate_t *ps, int allow_continuation)
{
@@ -581,7 +581,7 @@
/**********************************************************************/
#ifdef L__wchar_wcsntoutf8s
-size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
+size_t attribute_hidden _wchar_wcsntoutf8s(char *__restrict s, size_t n,
const wchar_t **__restrict src, size_t wn)
{
register char *p;
@@ -1034,7 +1034,7 @@
0, 2, 1, 2, 1, 0, 1,
};
-int wcswidth(const wchar_t *pwcs, size_t n)
+int attribute_hidden __wcswidth(const wchar_t *pwcs, size_t n)
{
int h, l, m, count;
wchar_t wc;
@@ -1131,7 +1131,7 @@
#else /* __UCLIBC_HAS_LOCALE__ */
-int wcswidth(const wchar_t *pwcs, size_t n)
+int attribute_hidden __wcswidth(const wchar_t *pwcs, size_t n)
{
int count;
wchar_t wc;
@@ -1154,13 +1154,17 @@
#endif /* __UCLIBC_HAS_LOCALE__ */
+strong_alias(__wcswidth,wcswidth)
+
#endif
/**********************************************************************/
#ifdef L_wcwidth
+extern int __wcswidth (__const wchar_t *__s, size_t __n) attribute_hidden;
+
int wcwidth(wchar_t wc)
{
- return wcswidth(&wc, 1);
+ return __wcswidth(&wc, 1);
}
#endif
Modified: trunk/uClibc/libc/misc/wchar/wstdio.c
===================================================================
--- trunk/uClibc/libc/misc/wchar/wstdio.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/wchar/wstdio.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -50,6 +50,8 @@
*/
#define wcslen __wcslen
+#define wcsrtombs __wcsrtombs
+#define mbrtowc __mbrtowc
#define _GNU_SOURCE
#include <stdio.h>
Modified: trunk/uClibc/libc/misc/wordexp/wordexp.c
===================================================================
--- trunk/uClibc/libc/misc/wordexp/wordexp.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/misc/wordexp/wordexp.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -22,6 +22,7 @@
#define mempcpy __libc_mempcpy
#define strndup __strndup
#define strspn __strspn
+#define unsetenv __unsetenv
#define _GNU_SOURCE
#include <sys/cdefs.h>
Modified: trunk/uClibc/libc/stdio/fgetwc.c
===================================================================
--- trunk/uClibc/libc/stdio/fgetwc.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdio/fgetwc.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -5,6 +5,8 @@
* Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details.
*/
+#define mbrtowc __mbrtowc
+
#include "_stdio.h"
#ifdef __DO_UNLOCKED
Modified: trunk/uClibc/libc/stdio/scanf.c
===================================================================
--- trunk/uClibc/libc/stdio/scanf.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdio/scanf.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -44,6 +44,8 @@
*/
#define wcslen __wcslen
+#define mbsrtowcs __mbsrtowcs
+#define mbrtowc __mbrtowc
#define _ISOC99_SOURCE /* for LLONG_MAX primarily... */
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/stdio/vfprintf.c
===================================================================
--- trunk/uClibc/libc/stdio/vfprintf.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdio/vfprintf.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -92,6 +92,8 @@
#define strnlen __strnlen
#define wcslen __wcslen
#define wcsnlen __wcsnlen
+#define wcsrtombs __wcsrtombs
+#define mbsrtowcs __mbsrtowcs
#define _ISOC99_SOURCE /* for ULLONG primarily... */
#define _GNU_SOURCE
Modified: trunk/uClibc/libc/stdlib/malloc-standard/malloc.h
===================================================================
--- trunk/uClibc/libc/stdlib/malloc-standard/malloc.h 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/malloc-standard/malloc.h 2005-11-29 00:50:10 UTC (rev 12562)
@@ -14,6 +14,8 @@
Hacked up for uClibc by Erik Andersen <andersen at codepoet.org>
*/
+#define sysconf __sysconf
+
#include <features.h>
#include <stddef.h>
#include <unistd.h>
Modified: trunk/uClibc/libc/stdlib/rand.c
===================================================================
--- trunk/uClibc/libc/stdlib/rand.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/rand.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -17,6 +17,8 @@
* write to the Free Software Foundation, Inc., 675 Mass Ave,
* Cambridge, MA 02139, USA. */
+#define random __random
+
#include <stdlib.h>
int rand (void)
Modified: trunk/uClibc/libc/stdlib/random.c
===================================================================
--- trunk/uClibc/libc/stdlib/random.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/random.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -22,6 +22,9 @@
* Rewritten to use reentrant functions by Ulrich Drepper, 1995.
*/
+#define random_r __random_r
+#define srandom_r __srandom_r
+
#define _GNU_SOURCE
#include <features.h>
#include <limits.h>
@@ -243,7 +246,7 @@
rear pointers can't wrap on the same call by not testing the rear
pointer if the front one has wrapped. Returns a 31-bit random number. */
-long int random ()
+long int attribute_hidden __random ()
{
int32_t retval;
@@ -252,4 +255,4 @@
__pthread_mutex_unlock(&lock);
return retval;
}
-
+strong_alias(__random,random)
Modified: trunk/uClibc/libc/stdlib/random_r.c
===================================================================
--- trunk/uClibc/libc/stdlib/random_r.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/random_r.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -131,7 +131,7 @@
information a given number of times to get rid of any initial dependencies
introduced by the L.C.R.N.G. Note that the initialization of randtbl[]
for default usage relies on values produced by this routine. */
-int srandom_r (unsigned int seed, struct random_data *buf)
+int attribute_hidden __srandom_r (unsigned int seed, struct random_data *buf)
{
int type;
int32_t *state;
@@ -176,7 +176,7 @@
while (--kc >= 0)
{
int32_t discard;
- (void) random_r (buf, &discard);
+ (void) __random_r (buf, &discard);
}
done:
@@ -185,6 +185,7 @@
fail:
return -1;
}
+strong_alias(__srandom_r,srandom_r)
/* Initialize the state information in the given array of N bytes for
future random number generation. Based on the number of bytes we
@@ -237,7 +238,7 @@
buf->state = state;
- srandom_r (seed, buf);
+ __srandom_r (seed, buf);
state[-1] = TYPE_0;
if (type != TYPE_0)
@@ -313,7 +314,7 @@
rear pointers can't wrap on the same call by not testing the rear
pointer if the front one has wrapped. Returns a 31-bit random number. */
-int random_r (buf, result)
+int attribute_hidden __random_r (buf, result)
struct random_data *buf;
int32_t *result;
{
@@ -362,4 +363,4 @@
__set_errno (EINVAL);
return -1;
}
-
+strong_alias(__random_r,random_r)
Modified: trunk/uClibc/libc/stdlib/seed48.c
===================================================================
--- trunk/uClibc/libc/stdlib/seed48.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/seed48.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -17,6 +17,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#define seed48_r __seed48_r
+
#include <stdlib.h>
/* Global state for non-reentrant functions. Defined in drand48-iter.c. */
Modified: trunk/uClibc/libc/stdlib/seed48_r.c
===================================================================
--- trunk/uClibc/libc/stdlib/seed48_r.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/seed48_r.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -17,11 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#define memcpy __memcpy
+
#include <stdlib.h>
#include <string.h>
#include <limits.h>
-int seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
+int attribute_hidden __seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
{
/* Save old value at a private place to be used as return value. */
memcpy (buffer->__old_x, buffer->__x, sizeof (buffer->__x));
@@ -36,3 +38,4 @@
return 0;
}
+strong_alias(__seed48_r,seed48_r)
Modified: trunk/uClibc/libc/stdlib/setenv.c
===================================================================
--- trunk/uClibc/libc/stdlib/setenv.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/setenv.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -38,6 +38,7 @@
# define UNLOCK
#endif
+extern int __unsetenv (__const char *__name) attribute_hidden;
/* If this variable is not a null pointer we allocated the current
environment. */
@@ -139,7 +140,7 @@
return __add_to_environ (name, value, NULL, replace);
}
-int unsetenv (const char *name)
+int attribute_hidden __unsetenv (const char *name)
{
size_t len;
char **ep;
@@ -167,6 +168,7 @@
UNLOCK;
return 0;
}
+strong_alias(__unsetenv,unsetenv)
/* The `clearenv' was planned to be added to POSIX.1 but probably
never made it. Nevertheless the POSIX.9 standard (POSIX bindings
@@ -197,7 +199,7 @@
free(name);
return(result);
}
- unsetenv (string);
+ __unsetenv (string);
return 0;
}
Modified: trunk/uClibc/libc/stdlib/stdlib.c
===================================================================
--- trunk/uClibc/libc/stdlib/stdlib.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/stdlib.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -32,6 +32,11 @@
* Add wscto{inttype} functions.
*/
+#define wcsrtombs __wcsrtombs
+#define mbsrtowcs __mbsrtowcs
+#define mbrtowc __mbrtowc
+#define mbrlen __mbrlen
+
#define _ISOC99_SOURCE /* for ULLONG primarily... */
#define _GNU_SOURCE
#include <limits.h>
Modified: trunk/uClibc/libc/stdlib/unix_grantpt.c
===================================================================
--- trunk/uClibc/libc/stdlib/unix_grantpt.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/stdlib/unix_grantpt.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -18,6 +18,7 @@
Boston, MA 02111-1307, USA. */
#define memchr __memchr
+#define getgid __getgid
#include <assert.h>
#include <errno.h>
Modified: trunk/uClibc/libc/string/generic/bp-checks.h
===================================================================
--- trunk/uClibc/libc/string/generic/bp-checks.h 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/string/generic/bp-checks.h 2005-11-29 00:50:10 UTC (rev 12562)
@@ -92,7 +92,7 @@
cover a region of NBYTES. Such a vector occupies one byte per page
of memory. */
# define CHECK_N_PAGES(ARG, NBYTES) \
- ({ int _page_size_ = sysconf (_SC_PAGE_SIZE); \
+ ({ int _page_size_ = __sysconf (_SC_PAGE_SIZE); \
CHECK_N ((const char *) (ARG), \
((NBYTES) + _page_size_ - 1) / _page_size_); })
Modified: trunk/uClibc/libc/sysdeps/linux/common/clock_getres.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/clock_getres.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/sysdeps/linux/common/clock_getres.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -19,6 +19,8 @@
*
*/
+#define sysconf __sysconf
+
#define _GNU_SOURCE
#include "syscalls.h"
#include <time.h>
Modified: trunk/uClibc/libc/sysdeps/linux/common/getegid.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getegid.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/sysdeps/linux/common/getegid.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -7,19 +7,22 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define getgid __getgid
+
#include "syscalls.h"
#include <unistd.h>
#ifdef __NR_getegid
#define __NR___syscall_getegid __NR_getegid
static inline _syscall0(int, __syscall_getegid);
-gid_t getegid(void)
+gid_t attribute_hidden __getegid(void)
{
return (__syscall_getegid());
}
#else
-gid_t getegid(void)
+gid_t attribute_hidden __getegid(void)
{
return (getgid());
}
#endif
+strong_alias(__getegid,getegid)
Modified: trunk/uClibc/libc/sysdeps/linux/common/getgid.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getgid.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/sysdeps/linux/common/getgid.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -16,7 +16,8 @@
#endif
static inline _syscall0(int, __syscall_getgid);
-gid_t getgid(void)
+gid_t attribute_hidden __getgid(void)
{
return (__syscall_getgid());
}
+strong_alias(__getgid,getgid)
Modified: trunk/uClibc/libc/sysdeps/linux/common/getgroups.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getgroups.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/sysdeps/linux/common/getgroups.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -7,6 +7,8 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define sysconf __sysconf
+
#include "syscalls.h"
#include <unistd.h>
Modified: trunk/uClibc/libc/sysdeps/linux/common/setgroups.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/setgroups.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/sysdeps/linux/common/setgroups.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -7,6 +7,8 @@
* GNU Library General Public License (LGPL) version 2 or later.
*/
+#define sysconf __sysconf
+
#include "syscalls.h"
#include <unistd.h>
#include <grp.h>
Modified: trunk/uClibc/libc/sysdeps/linux/common/ulimit.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/ulimit.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/sysdeps/linux/common/ulimit.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -18,6 +18,8 @@
*
*/
+#define sysconf __sysconf
+
#define _GNU_SOURCE
#define _LARGEFILE64_SOURCE
#include <features.h>
Modified: trunk/uClibc/libc/unistd/sysconf.c
===================================================================
--- trunk/uClibc/libc/unistd/sysconf.c 2005-11-28 22:03:45 UTC (rev 12561)
+++ trunk/uClibc/libc/unistd/sysconf.c 2005-11-29 00:50:10 UTC (rev 12562)
@@ -70,7 +70,7 @@
#endif /* _UCLIBC_GENERATE_SYSCONF_ARCH */
/* Get the value of the system variable NAME. */
-long int __sysconf(int name)
+long int attribute_hidden __sysconf(int name)
{
switch (name)
{
@@ -882,5 +882,4 @@
#endif
}
}
-weak_alias(__sysconf, sysconf);
-
+strong_alias(__sysconf,sysconf)
More information about the uClibc-cvs
mailing list