diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-05-13 17:53:17 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-05-13 17:53:17 +0000 |
| commit | 001faf3269541f0231482e0fccc846f62f8930b2 (patch) | |
| tree | a5a7b0143f3fd9d71e42eb03c4967f8763ec3501 /linux-user/syscall.c | |
| parent | 4cfce484c5d7e514c23689f3194055b5463d6054 (diff) | |
Replace gcc variadic macro extension with C99 version
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0bc9902ebc..76f0c95b9d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2563,7 +2563,7 @@ static abi_long do_ipc(unsigned int call, int first, /* kernel structure types definitions */ #define IFNAMSIZ 16 -#define STRUCT(name, list...) STRUCT_ ## name, +#define STRUCT(name, ...) STRUCT_ ## name, #define STRUCT_SPECIAL(name) STRUCT_ ## name, enum { #include "syscall_types.h" @@ -2571,7 +2571,7 @@ enum { #undef STRUCT #undef STRUCT_SPECIAL -#define STRUCT(name, list...) static const argtype struct_ ## name ## _def[] = { list, TYPE_NULL }; +#define STRUCT(name, ...) static const argtype struct_ ## name ## _def[] = { __VA_ARGS__, TYPE_NULL }; #define STRUCT_SPECIAL(name) #include "syscall_types.h" #undef STRUCT @@ -2592,8 +2592,8 @@ typedef struct IOCTLEntry { #define MAX_STRUCT_SIZE 4096 static IOCTLEntry ioctl_entries[] = { -#define IOCTL(cmd, access, types...) \ - { TARGET_ ## cmd, cmd, #cmd, access, { types } }, +#define IOCTL(cmd, access, ...) \ + { TARGET_ ## cmd, cmd, #cmd, access, { __VA_ARGS__ } }, #include "ioctls.h" { 0, 0, }, }; @@ -3497,7 +3497,7 @@ void syscall_init(void) int size; int i; -#define STRUCT(name, list...) thunk_register_struct(STRUCT_ ## name, #name, struct_ ## name ## _def); +#define STRUCT(name, ...) thunk_register_struct(STRUCT_ ## name, #name, struct_ ## name ## _def); #define STRUCT_SPECIAL(name) thunk_register_struct_direct(STRUCT_ ## name, #name, &struct_ ## name ## _def); #include "syscall_types.h" #undef STRUCT |