diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /xorg-server/glx/glapi.c | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/glx/glapi.c')
| -rw-r--r-- | xorg-server/glx/glapi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c index 481d59f81..a7913a3a1 100644 --- a/xorg-server/glx/glapi.c +++ b/xorg-server/glx/glapi.c @@ -49,9 +49,10 @@ #include <unistd.h> #include "glapi.h" +#include "dispatch.h" #include "glapitable.h" -#define _gloffset_FIRST_DYNAMIC (sizeof(struct _glapi_table) / sizeof(void *)) +#define FIRST_DYNAMIC_OFFSET (sizeof(struct _glapi_table) / sizeof(void *)) #if defined(PTHREADS) || defined(GLX_USE_TLS) static void init_glapi_relocs(void); @@ -206,7 +207,7 @@ _glapi_get_dispatch(void) ***/ #if defined(USE_X64_64_ASM) && defined(GLX_USE_TLS) -# define DISPATCH_FUNCTION_SIZE 16 +# define DISPATCH_FUNCTION_SIZE 16 #elif defined(USE_X86_ASM) # if defined(THREADS) && !defined(GLX_USE_TLS) # define DISPATCH_FUNCTION_SIZE 32 @@ -386,7 +387,7 @@ PUBLIC int _glapi_add_dispatch( const char * const * function_names, const char * parameter_signature ) { - static int next_dynamic_offset = _gloffset_FIRST_DYNAMIC; + static int next_dynamic_offset = FIRST_DYNAMIC_OFFSET; const char * const real_sig = (parameter_signature != NULL) ? parameter_signature : ""; struct _glapi_function * entry[8]; |