diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 15:05:45 +0200 |
| commit | 4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8 (patch) | |
| tree | 3ddf28be6916dd5ea27837431b5be8c94017cd9a /libXt/src/Varargs.c | |
| parent | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (diff) | |
| parent | 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff) | |
| download | vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.gz vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.tar.bz2 vcxsrv-4b35ef19b76849cbd854c3b6f92bbc1c2d50f2d8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXt/src/Varargs.c')
| -rw-r--r-- | libXt/src/Varargs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libXt/src/Varargs.c b/libXt/src/Varargs.c index 6c9f9ee5f..b33e287d8 100644 --- a/libXt/src/Varargs.c +++ b/libXt/src/Varargs.c @@ -234,6 +234,8 @@ TypedArgToArg( else { if (to_val.size == sizeof(long)) arg_return->value = (XtArgVal) *(long *)to_val.addr; + else if (to_val.size == sizeof(int)) + arg_return->value = (XtArgVal) *(int *)to_val.addr; else if (to_val.size == sizeof(short)) arg_return->value = (XtArgVal) *(short *)to_val.addr; else if (to_val.size == sizeof(char)) @@ -500,7 +502,7 @@ _XtVaToTypedArgList( args[count].size = va_arg(var, int); ++count; } else if (strcmp(attr, XtVaNestedList) == 0) { - count += NestedArgtoTypedArg(&args[count], + count += NestedArgtoTypedArg(&args[count], va_arg(var, XtTypedArgList)); } else { args[count].name = attr; |