RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-12 08:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: syscalls: remove improper inline statement in front of syscalls

Browse Source 
Trying to build with an old gcc and glibc revealed that we must not
state "inline" in our _syscall* definitions since it's already present
in the declaration making use of the _syscall* macros.
This commit is contained in:
Willy Tarreau 2014-05-08 22:36:29 +02:00
parent bb66030a30
commit cefad67689
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/accept4.h
View File

@ -58,7 +58,7 @@ static int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int fl
return socketcall(SYS_ACCEPT4, args); return socketcall(SYS_ACCEPT4, args);
} }
#else #else
static _syscall4(int, accept4, int, sockfd, struct sockaddr *, addr, socklen_t *, addrlen, int, flags); static inline _syscall4(int, accept4, int, sockfd, struct sockaddr *, addr, socklen_t *, addrlen, int, flags);
#endif /* VSYSCALL etc... */ #endif /* VSYSCALL etc... */
#endif /* USE_MY_ACCEPT4 */ #endif /* USE_MY_ACCEPT4 */
#endif /* __linux__ && USE_ACCEPT4 */ #endif /* __linux__ && USE_ACCEPT4 */

2
include/common/splice.h
View File

@ -62,7 +62,7 @@ extern int splice(int fdin, loff_t *off_in, int fdout, loff_t *off_out, size_t l
#define __NR_splice 313 #define __NR_splice 313
#endif /* __NR_splice */ #endif /* __NR_splice */
static _syscall6(int, splice, int, fdin, loff_t *, off_in, int, fdout, loff_t *, off_out, size_t, len, unsigned long, flags); static inline _syscall6(int, splice, int, fdin, loff_t *, off_in, int, fdout, loff_t *, off_out, size_t, len, unsigned long, flags);
#endif /* VSYSCALL */ #endif /* VSYSCALL */
#else #else

12
include/common/syscall.h
View File

@ -37,42 +37,42 @@
*/ */
#ifndef _syscall1 #ifndef _syscall1
#define _syscall1(tr, nr, t1, n1) \ #define _syscall1(tr, nr, t1, n1) \
inline tr nr(t1 n1) { \ tr nr(t1 n1) { \
return syscall(__NR_##nr, n1); \ return syscall(__NR_##nr, n1); \
} }
#endif #endif
#ifndef _syscall2 #ifndef _syscall2
#define _syscall2(tr, nr, t1, n1, t2, n2) \ #define _syscall2(tr, nr, t1, n1, t2, n2) \
inline tr nr(t1 n1, t2 n2) { \ tr nr(t1 n1, t2 n2) { \
return syscall(__NR_##nr, n1, n2); \ return syscall(__NR_##nr, n1, n2); \
} }
#endif #endif
#ifndef _syscall3 #ifndef _syscall3
#define _syscall3(tr, nr, t1, n1, t2, n2, t3, n3) \ #define _syscall3(tr, nr, t1, n1, t2, n2, t3, n3) \
inline tr nr(t1 n1, t2 n2, t3 n3) { \ tr nr(t1 n1, t2 n2, t3 n3) { \
return syscall(__NR_##nr, n1, n2, n3); \ return syscall(__NR_##nr, n1, n2, n3); \
} }
#endif #endif
#ifndef _syscall4 #ifndef _syscall4
#define _syscall4(tr, nr, t1, n1, t2, n2, t3, n3, t4, n4) \ #define _syscall4(tr, nr, t1, n1, t2, n2, t3, n3, t4, n4) \
inline tr nr(t1 n1, t2 n2, t3 n3, t4 n4) { \ tr nr(t1 n1, t2 n2, t3 n3, t4 n4) { \
return syscall(__NR_##nr, n1, n2, n3, n4); \ return syscall(__NR_##nr, n1, n2, n3, n4); \
} }
#endif #endif
#ifndef _syscall5 #ifndef _syscall5
#define _syscall5(tr, nr, t1, n1, t2, n2, t3, n3, t4, n4, t5, n5) \ #define _syscall5(tr, nr, t1, n1, t2, n2, t3, n3, t4, n4, t5, n5) \
inline tr nr(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5) { \ tr nr(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5) { \
return syscall(__NR_##nr, n1, n2, n3, n4, n5); \ return syscall(__NR_##nr, n1, n2, n3, n4, n5); \
} }
#endif #endif
#ifndef _syscall6 #ifndef _syscall6
#define _syscall6(tr, nr, t1, n1, t2, n2, t3, n3, t4, n4, t5, n5, t6, n6) \ #define _syscall6(tr, nr, t1, n1, t2, n2, t3, n3, t4, n4, t5, n5, t6, n6) \
inline tr nr(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6) { \ tr nr(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6) { \
return syscall(__NR_##nr, n1, n2, n3, n4, n5, n6); \ return syscall(__NR_##nr, n1, n2, n3, n4, n5, n6); \
} }
#endif #endif