From 09e967c2d732783b2579e4e120cd9b608404cb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= Date: Wed, 4 Jun 2003 18:31:57 +0000 Subject: Merge from R9_0-AMD64, most notably: - AMD64 support to insmod-busybox, minilibc, et al. - Sync with insmod-modutils 2.4.19 something but everyone should use dietlibc nowadays - Factor out compilation and prefix with $(DIET) for dietlibc builds - 64-bit & varargs fixes --- mdk-stage1/dietlibc/lib/socket.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'mdk-stage1/dietlibc/lib/socket.c') diff --git a/mdk-stage1/dietlibc/lib/socket.c b/mdk-stage1/dietlibc/lib/socket.c index 1684a6a2b..c18df5123 100644 --- a/mdk-stage1/dietlibc/lib/socket.c +++ b/mdk-stage1/dietlibc/lib/socket.c @@ -1,12 +1,11 @@ -#include +#include extern int socketcall(int callno,long* args); -int socket(int a, int b, int c) { -#ifdef __i386__ - return socketcall(SYS_SOCKET, (long*)&a); -#else +int __libc_socket(int a, int b, int c); +int __libc_socket(int a, int b, int c) { unsigned long args[] = { a, b, c }; return socketcall(SYS_SOCKET, args); -#endif } + +int socket(int a,int b,int c) __attribute__((weak,alias("__libc_socket"))); -- cgit v1.2.1