diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
| commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
| tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/glx | |
| parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
| parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
| download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/Makefile.am | 4 | ||||
| -rw-r--r-- | xorg-server/glx/glapi.c | 7 | ||||
| -rw-r--r-- | xorg-server/glx/unpack.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/xorg-server/glx/Makefile.am b/xorg-server/glx/Makefile.am index a23ae0a47..9d9fa3c31 100644 --- a/xorg-server/glx/Makefile.am +++ b/xorg-server/glx/Makefile.am @@ -58,6 +58,8 @@ if DRI2_AIGLX libglxdri_la_SOURCES += glxdri2.c endif +libglxdri_la_LIBADD = $(DLOPEN_LIBS) + libglx_la_SOURCES = \ $(indirect_sources) \ $(glapi_sources) \ @@ -95,3 +97,5 @@ libglx_la_SOURCES = \ swap_interval.c \ unpack.h \ xfont.c + +libglx_la_LIBADD = $(DLOPEN_LIBS) diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c index fa3808e4d..d6a568e88 100644 --- a/xorg-server/glx/glapi.c +++ b/xorg-server/glx/glapi.c @@ -114,10 +114,15 @@ warn(void) } } +#if defined(__GNUC__) && (__GNUC__ > 2) +#define possibly_unused __attribute((unused)) +#else +#define possibly_unused +#endif #define KEYWORD1 static #define KEYWORD1_ALT static -#define KEYWORD2 GLAPIENTRY +#define KEYWORD2 GLAPIENTRY possibly_unused #define NAME(func) NoOp##func #define F NULL diff --git a/xorg-server/glx/unpack.h b/xorg-server/glx/unpack.h index a1dd17d52..90cb71bd7 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 && dst) memcpy(dst,src,n) +#define __GLX_MEM_COPY(dst,src,n) if (src != NULL && dst != NULL) memcpy(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)) |