Index: ossp-pkg/sa/aclocal.m4 RCS File: /v/ossp/cvs/ossp-pkg/sa/aclocal.m4,v rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/sa/aclocal.m4,v' 2>/dev/null --- aclocal.m4 2004/03/26 16:55:14 1.7 +++ aclocal.m4 2004/03/26 16:57:14 1.8 @@ -80,13 +80,18 @@ CFLAGS="$CFLAGS -pedantic" CFLAGS="$CFLAGS -Wall" WMORE="" + WMORE="$WMORE -Wbad-function-cast" WMORE="$WMORE -Wcast-align" WMORE="$WMORE -Winline" WMORE="$WMORE -Wmissing-declarations" WMORE="$WMORE -Wmissing-prototypes" + WMORE="$WMORE -Wmultichar" WMORE="$WMORE -Wnested-externs" + WMORE="$WMORE -Wno-system-headers" WMORE="$WMORE -Wpointer-arith" + WMORE="$WMORE -Wredundant-decls" WMORE="$WMORE -Wshadow" + WMORE="$WMORE -Wstrict-prototypes" AC_COMPILER_OPTION(wmore, -W, $WMORE, CFLAGS="$CFLAGS $WMORE") AC_COMPILER_OPTION(wnolonglong, -Wno-long-long, -Wno-long-long, CFLAGS="$CFLAGS -Wno-long-long") else Index: ossp-pkg/sa/sa.c RCS File: /v/ossp/cvs/ossp-pkg/sa/sa.c,v rcsdiff -q -kk '-r1.77' '-r1.78' -u '/v/ossp/cvs/ossp-pkg/sa/sa.c,v' 2>/dev/null --- sa.c 2004/03/26 16:05:59 1.77 +++ sa.c 2004/03/26 16:57:14 1.78 @@ -116,49 +116,49 @@ /* system call structure declaration macros */ #define SA_SC_DECLARE_0(rc_t, fn) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(void); \ rc_t (*ctx)(void *); } fptr; \ void *fctx; \ } sc_##fn; #define SA_SC_DECLARE_1(rc_t, fn, a1_t) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(a1_t); \ rc_t (*ctx)(void *, a1_t); } fptr; \ void *fctx; \ } sc_##fn; #define SA_SC_DECLARE_2(rc_t, fn, a1_t, a2_t) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(a1_t, a2_t); \ rc_t (*ctx)(void *, a1_t, a2_t); } fptr; \ void *fctx; \ } sc_##fn; #define SA_SC_DECLARE_3(rc_t, fn, a1_t, a2_t, a3_t) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(a1_t, a2_t, a3_t); \ rc_t (*ctx)(void *, a1_t, a2_t, a3_t); } fptr; \ void *fctx; \ } sc_##fn; #define SA_SC_DECLARE_4(rc_t, fn, a1_t, a2_t, a3_t, a4_t) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(a1_t, a2_t, a3_t, a4_t); \ rc_t (*ctx)(void *, a1_t, a2_t, a3_t, a4_t); } fptr; \ void *fctx; \ } sc_##fn; #define SA_SC_DECLARE_5(rc_t, fn, a1_t, a2_t, a3_t, a4_t, a5_t) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(a1_t, a2_t, a3_t, a4_t, a5_t); \ rc_t (*ctx)(void *, a1_t, a2_t, a3_t, a4_t, a5_t); } fptr; \ void *fctx; \ } sc_##fn; #define SA_SC_DECLARE_6(rc_t, fn, a1_t, a2_t, a3_t, a4_t, a5_t, a6_t) \ struct { \ - union { void (*any)(); \ + union { void (*any)(void); \ rc_t (*std)(a1_t, a2_t, a3_t, a4_t, a5_t, a6_t); \ rc_t (*ctx)(void *, a1_t, a2_t, a3_t, a4_t, a5_t, a6_t); } fptr; \ void *fctx; \ @@ -167,7 +167,7 @@ /* system call structure assignment macro */ #define SA_SC_ASSIGN(sa, fn, ptr, ctx) \ do { \ - (sa)->scSysCall.sc_##fn.fptr.any = (void (*)())(ptr); \ + (sa)->scSysCall.sc_##fn.fptr.any = (void (*)(void))(ptr); \ (sa)->scSysCall.sc_##fn.fctx = (ctx); \ } while (0) @@ -182,7 +182,7 @@ #define SA_SC_CALL_0(sa, fn) \ ( (sa)->scSysCall.sc_##fn.fctx != NULL \ ? ((sa)->scSysCall.sc_##fn.fptr.ctx)((sa)->scSysCall.sc_##fn.fctx) \ - : ((sa)->scSysCall.sc_##fn.fptr.std)() ) + : ((sa)->scSysCall.sc_##fn.fptr.std)(void) ) #define SA_SC_CALL_1(sa, fn, a1) \ ( (sa)->scSysCall.sc_##fn.fctx != NULL \ ? ((sa)->scSysCall.sc_##fn.fptr.ctx)((sa)->scSysCall.sc_##fn.fctx, a1) \ @@ -1393,7 +1393,7 @@ } /* override system call */ -sa_rc_t sa_syscall(sa_t *sa, sa_syscall_t id, void (*fptr)(), void *fctx) +sa_rc_t sa_syscall(sa_t *sa, sa_syscall_t id, void (*fptr)(void), void *fctx) { sa_rc_t rv; Index: ossp-pkg/sa/sa.h RCS File: /v/ossp/cvs/ossp-pkg/sa/sa.h,v rcsdiff -q -kk '-r1.37' '-r1.38' -u '/v/ossp/cvs/ossp-pkg/sa/sa.h,v' 2>/dev/null --- sa.h 2003/01/23 16:21:06 1.37 +++ sa.h 2004/03/26 16:57:14 1.38 @@ -182,7 +182,7 @@ extern sa_rc_t sa_timeout (sa_t *__sa, sa_timeout_t __id, long __sec, long __usec); extern sa_rc_t sa_buffer (sa_t *__sa, sa_buffer_t __id, size_t __size); extern sa_rc_t sa_option (sa_t *__sa, sa_option_t __id, ...); -extern sa_rc_t sa_syscall (sa_t *__sa, sa_syscall_t __id, void (*__fptr)(), void *__fctx); +extern sa_rc_t sa_syscall (sa_t *__sa, sa_syscall_t __id, void (*__fptr)(void), void *__fctx); /* socket connection operations */ extern sa_rc_t sa_bind (sa_t *__sa, sa_addr_t *__laddr);