diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-08 19:40:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-08 19:40:59 +0000 |
| commit | 432768f75da13ee5343957df6ce5cd316a62929f (patch) | |
| tree | b02a3961540984c3d2caf783a6f0854b9b00f92a /xorg-server/glx | |
| parent | 43b6c9073b8aad1170536ae5c6a5a019617659f1 (diff) | |
| download | vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.tar.gz vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.tar.bz2 vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.zip | |
xserver mesa libX11 xkbcomp pixman git update 8/1/2011
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxdri2.c | 2 | ||||
| -rw-r--r-- | xorg-server/glx/unpack.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index ce8014396..c9c316be5 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -594,7 +594,7 @@ static const __DRIextension *loader_extensions[] = { &systemTimeExtension.base,
&loaderExtension.base,
#ifdef __DRI_USE_INVALIDATE
- &dri2UseInvalidate,
+ &dri2UseInvalidate.base,
#endif
NULL
};
diff --git a/xorg-server/glx/unpack.h b/xorg-server/glx/unpack.h index 7e6a55105..a5f211555 100644 --- a/xorg-server/glx/unpack.h +++ b/xorg-server/glx/unpack.h @@ -47,7 +47,7 @@ ** Fetch a double from potentially unaligned memory.
*/
#ifdef __GLX_ALIGN64
-#define __GLX_MEM_COPY(dst,src,n) if (src != NULL && dst != NULL) 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))
|