diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 15:22:40 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 15:22:40 +0100 |
| commit | d1d04c7bd3f1465b7bb6690022d086c6bb005b70 (patch) | |
| tree | 058884f2af1a2994f07d887c88bfdea63cc47703 /xorg-server | |
| parent | 52b728b4b397d26f8841848ee921950e083991d0 (diff) | |
| download | vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.gz vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.bz2 vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.zip | |
Synchronised files
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/dix/registry.c | 4 | ||||
| -rw-r--r-- | xorg-server/glx/glapi.h | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c index aa2edf3e8..319973920 100644 --- a/xorg-server/dix/registry.c +++ b/xorg-server/dix/registry.c @@ -204,7 +204,7 @@ RegisterResourceName(RESTYPE resource, const char *name) resource &= TypeMask; while (resource >= nresource) { - if (!double_size(&resources, nresource, sizeof(char *))) + if (!double_size((void*)&resources, nresource, sizeof(char *))) return; nresource = nresource ? nresource * 2 : BASE_SIZE; } @@ -300,7 +300,7 @@ dixResetRegistry(void) free(errors[nerror]); free(errors); - free(resources); + free((void*)resources); requests = NULL; nminor = NULL; diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index 39b209fe1..f0955fce4 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -44,6 +44,13 @@ #ifndef _GLAPI_H #define _GLAPI_H +#include "glapi/glthread.h" + + +#ifdef __cplusplus +extern "C" { +#endif + #ifdef _GLAPI_NO_EXPORTS # define _GLAPI_EXPORT #else /* _GLAPI_NO_EXPORTS */ @@ -81,7 +88,6 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); #define _glapi_Dispatch _mglapi_Dispatch #endif - /* * Number of extension functions which we can dynamically add at runtime. */ @@ -178,3 +184,7 @@ extern struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix); #endif + +#ifdef __cplusplus +} +#endif |