From: Toni Nikkanen Date: Sat, 7 Mar 2009 17:03:44 +0000 (+0200) Subject: More compile fixes X-Git-Url: http://git.maemo.org/git/?p=erwise;a=commitdiff_plain;h=9c0f1bac782eb53c9d174685ab8eebafe9ebb4be More compile fixes --- diff --git a/Ui/UiMisc.c b/Ui/UiMisc.c index d1789a9..2885492 100644 --- a/Ui/UiMisc.c +++ b/Ui/UiMisc.c @@ -480,9 +480,7 @@ void uiUndefineCursor() ArgList -uiVaSetArgs(nargs, va_alist) -int *nargs; -va_dcl +uiVaSetArgs(int *nargs, ...) { static Arg args[50]; String tmpstr; @@ -490,7 +488,7 @@ va_dcl *nargs = 0; - va_start(pvar); + va_start(pvar,nargs); tmpstr = va_arg(pvar, String); while (tmpstr) { XtSetArg(args[(int) *nargs], tmpstr, va_arg(pvar, XtArgVal)); diff --git a/Ui/UiProtos.h b/Ui/UiProtos.h index c4520fd..321e123 100644 --- a/Ui/UiProtos.h +++ b/Ui/UiProtos.h @@ -83,7 +83,8 @@ extern void uiDialogVariableCB(Widget wdg, caddr_t variablename, XmAnyCallbackStruct * calldata); extern void uiDefineCursor(Cursor cursor); extern void uiUndefineCursor(void); -extern ArgList uiVaSetArgs( /*int *nargs, va_alist*/ ); +/* Toni */ +extern ArgList uiVaSetArgs( int *nargs, ...); extern XtArgVal uiGetArg(Widget wdg, String resource); extern void *uiMalloc(int size); extern void *uiReAlloc(void *, int size);