diff options
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c | 1 | ||||
| -rw-r--r-- | nx-X11/lib/X11/imLcPrs.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxLoad.c | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c index 57891b234..ed1cbd908 100644 --- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c +++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c @@ -3259,7 +3259,6 @@ parse_vp_instruction (GLcontext * ctx, GLubyte ** inst, vp->SrcReg[0].Swizzle = SWIZZLE_NOOP; vp->SrcReg[1].Swizzle = SWIZZLE_NOOP; vp->SrcReg[2].Swizzle = SWIZZLE_NOOP; - vp->SrcReg[3].Swizzle = SWIZZLE_NOOP; vp->DstReg.WriteMask = 0xf; switch (type) { diff --git a/nx-X11/lib/X11/imLcPrs.c b/nx-X11/lib/X11/imLcPrs.c index fbad5a220..9736e135c 100644 --- a/nx-X11/lib/X11/imLcPrs.c +++ b/nx-X11/lib/X11/imLcPrs.c @@ -589,7 +589,7 @@ parseline( l = _Xmbstoutf8(local_utf8_buf, rhs_string_mb, LOCAL_UTF8_BUFSIZE - 1); if (l == LOCAL_UTF8_BUFSIZE - 1) { - local_wc_buf[l] = '\0'; + local_utf8_buf[l] = '\0'; } if( (rhs_string_utf8 = (char *)Xmalloc(l + 1)) == NULL ) { Xfree( rhs_string_wc ); diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 0b779b719..7caf9b1cb 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -37,6 +37,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <errno.h> #include <stdio.h> #include <ctype.h> + +/* stat() */ +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + #define NEED_EVENTS 1 #include <X11/X.h> #include <X11/Xos.h> |