diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
| commit | 1d301c517e613dbb7e14e8b5fe5552919366fc4e (patch) | |
| tree | fbcc0812cafcd14eb4512bb66b751314736671fc /nx-X11/programs/Xserver/GL/glx | |
| parent | 91ca51bffc299519f723cc3adeb207bbad8a26c3 (diff) | |
| parent | 8bb1579f40bb74b9dad302e79c124541694b3265 (diff) | |
| download | nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.gz nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.bz2 nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.zip | |
Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.x
Attributes GH PR #333: https://github.com/ArcticaProject/nx-libs/pull/333
Diffstat (limited to 'nx-X11/programs/Xserver/GL/glx')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxcmds.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxfb.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/unpack.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxcmds.c b/nx-X11/programs/Xserver/GL/glx/glxcmds.c index efe5b25e9..602b79099 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxcmds.c +++ b/nx-X11/programs/Xserver/GL/glx/glxcmds.c @@ -1762,7 +1762,7 @@ static int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc) if (ret == Success) { if (barrier) /* add source for cleanup when drawable is gone */ - AddResource(drawable, __glXSwapBarrierRes, (void *)screen); + AddResource(drawable, __glXSwapBarrierRes, (void *)(intptr_t)screen); else /* delete source */ FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE); diff --git a/nx-X11/programs/Xserver/GL/glx/glxfb.c b/nx-X11/programs/Xserver/GL/glx/glxfb.c index 7248b6ffb..13f02d448 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxfb.c +++ b/nx-X11/programs/Xserver/GL/glx/glxfb.c @@ -113,7 +113,7 @@ __glXFBMemSwapBuffers(__GLXdrawablePrivate *glxPriv) depth, 0, 0, width, height, pad, ZPixmap, - buf); + (char *)buf); return GL_TRUE; } diff --git a/nx-X11/programs/Xserver/GL/glx/unpack.h b/nx-X11/programs/Xserver/GL/glx/unpack.h index 7d84ff575..9554ba4b9 100644 --- a/nx-X11/programs/Xserver/GL/glx/unpack.h +++ b/nx-X11/programs/Xserver/GL/glx/unpack.h @@ -52,7 +52,7 @@ ** Fetch a double from potentially unaligned memory. */ #ifdef __GLX_ALIGN64 -#define __GLX_MEM_COPY(dst,src,n) if (src && dst) memcpy(dst,src,n) +#define __GLX_MEM_COPY(dst,src,n) memmove(dst,src,n) #define __GLX_GET_DOUBLE(dst,src) __GLX_MEM_COPY(&dst,src,8) #else #define __GLX_GET_DOUBLE(dst,src) (dst) = *((GLdouble*)(src)) |