Revision 001faf32 darwin-user/syscall.c

b/darwin-user/syscall.c
627 627
    tswap16s(&w->ws_ypixel);
628 628
}
629 629

  
630
#define STRUCT(name, list...) STRUCT_ ## name,
630
#define STRUCT(name, ...) STRUCT_ ## name,
631 631
#define STRUCT_SPECIAL(name) STRUCT_ ## name,
632 632
enum {
633 633
#include "ioctls_types.h"
......
635 635
#undef STRUCT
636 636
#undef STRUCT_SPECIAL
637 637

  
638
#define STRUCT(name, list...) const argtype struct_ ## name ## _def[] = { list, TYPE_NULL };
638
#define STRUCT(name, ...) const argtype struct_ ## name ## _def[] = {  __VA_ARGS__, TYPE_NULL };
639 639
#define STRUCT_SPECIAL(name)
640 640
#include "ioctls_types.h"
641 641
#undef STRUCT
......
656 656
#define MAX_STRUCT_SIZE 4096
657 657

  
658 658
static IOCTLEntry ioctl_entries[] = {
659
#define IOCTL(cmd, access, types...) \
660
    { cmd, cmd, #cmd, access, { types } },
659
#define IOCTL(cmd, access,  ...)                        \
660
    { cmd, cmd, #cmd, access, {  __VA_ARGS__ } },
661 661
#include "ioctls.h"
662 662
    { 0, 0, },
663 663
};
......
898 898
#define WRAPPER_CALL_DIRECT_6(function, _arg1, _arg2, _arg3, _arg4, _arg5, _arg6) long __qemu_##function(void *cpu_env) { int i = 0;   typeof(_arg1) arg1 = _arg1; typeof(_arg2) arg2 = _arg2; typeof(_arg3) arg3 = _arg3; typeof(_arg4) arg4 = _arg4; typeof(_arg5) arg5 = _arg5; typeof(_arg6) arg6 = _arg6;  return (long)function(arg1, arg2, arg3, arg4, arg5, arg6); }
899 899
#define WRAPPER_CALL_DIRECT_7(function, _arg1, _arg2, _arg3, _arg4, _arg5, _arg6, _arg7) long __qemu_##function(void *cpu_env) { int i = 0;   typeof(_arg1) arg1 = _arg1; typeof(_arg2) arg2 = _arg2; typeof(_arg3) arg3 = _arg3; typeof(_arg4) arg4 = _arg4; typeof(_arg5) arg5 = _arg5; typeof(_arg6) arg6 = _arg6; typeof(_arg7) arg7 = _arg7; return (long)function(arg1, arg2, arg3, arg4, arg5, arg6, arg7); }
900 900
#define WRAPPER_CALL_DIRECT_8(function, _arg1, _arg2, _arg3, _arg4, _arg5, _arg6, _arg7, _arg8) long __qemu_##function(void *cpu_env) { int i = 0;   typeof(_arg1) arg1 = _arg1; typeof(_arg2) arg2 = _arg2; typeof(_arg3) arg3 = _arg3; typeof(_arg4) arg4 = _arg4; typeof(_arg5) arg5 = _arg5; typeof(_arg6) arg6 = _arg6; typeof(_arg7) arg7 = _arg7; typeof(_arg8) arg8 = _arg8;  return (long)function(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); }
901
#define WRAPPER_CALL_DIRECT(function, nargs, args...) WRAPPER_CALL_DIRECT_##nargs(function, args)
902
#define WRAPPER_CALL_NOERRNO(function, nargs, args...)  WRAPPER_CALL_DIRECT(function, nargs, args)
903
#define WRAPPER_CALL_INDIRECT(function, nargs, args...)
904
#define ENTRY(name, number, function, nargs, call_type, args...)  WRAPPER_##call_type(function, nargs, args)
901
#define WRAPPER_CALL_DIRECT(function, nargs, ...) WRAPPER_CALL_DIRECT_##nargs(function, __VA_ARGS__)
902
#define WRAPPER_CALL_NOERRNO(function, nargs, ...)  WRAPPER_CALL_DIRECT(function, nargs, __VA_ARGS__)
903
#define WRAPPER_CALL_INDIRECT(function, nargs, ...)
904
#define ENTRY(name, number, function, nargs, call_type, ...)  WRAPPER_##call_type(function, nargs, __VA_ARGS__)
905 905

  
906 906
#include "syscalls.h"
907 907

  
......
926 926
#define ENTRY_CALL_DIRECT(name, number, function, nargs, call_type)  _ENTRY(name, number, __qemu_##function, nargs, call_type)
927 927
#define ENTRY_CALL_NOERRNO(name, number, function, nargs, call_type) ENTRY_CALL_DIRECT(name, number, function, nargs, call_type)
928 928
#define ENTRY_CALL_INDIRECT(name, number, function, nargs, call_type) _ENTRY(name, number, function, nargs, call_type)
929
#define ENTRY(name, number, function, nargs, call_type, args...) ENTRY_##call_type(name, number, function, nargs, call_type)
929
#define ENTRY(name, number, function, nargs, call_type, ...) ENTRY_##call_type(name, number, function, nargs, call_type)
930 930

  
931 931
#define CALL_DIRECT 1
932 932
#define CALL_INDIRECT 2

Also available in: Unified diff