diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-05 10:43:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-05 10:44:44 +0200 |
| commit | 180290f941da61bd80284d817e27c01cf789ee53 (patch) | |
| tree | 77d3db164df6f3248290bc6c725f8f0b86933402 /mesalib | |
| parent | 1b079a7ca16c0aa3423d7d4ed59dc3d19a4e7a1d (diff) | |
| download | vcxsrv-180290f941da61bd80284d817e27c01cf789ee53.tar.gz vcxsrv-180290f941da61bd80284d817e27c01cf789ee53.tar.bz2 vcxsrv-180290f941da61bd80284d817e27c01cf789ee53.zip | |
Synchronised mesa and glx
Diffstat (limited to 'mesalib')
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_table.py | 2 | ||||
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/remap_helper.py | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/remap.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/remap.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py index afcd17d38..0c9c0b8a1 100755 --- a/mesalib/src/mapi/glapi/gen/gl_table.py +++ b/mesalib/src/mapi/glapi/gen/gl_table.py @@ -157,7 +157,7 @@ class PrintRemapTable(gl_XML.gl_print_base): remap_table = "driDispatchRemapTable" print '#define %s_size %u' % (remap_table, count) - print 'extern int %s[ %s_size ];' % (remap_table, remap_table) + print 'SERVEXTERN int %s[ %s_size ];' % (remap_table, remap_table) print '' for f, index in functions: diff --git a/mesalib/src/mapi/glapi/gen/remap_helper.py b/mesalib/src/mapi/glapi/gen/remap_helper.py index e1a13d0b3..8ac047ccc 100755 --- a/mesalib/src/mapi/glapi/gen/remap_helper.py +++ b/mesalib/src/mapi/glapi/gen/remap_helper.py @@ -64,8 +64,8 @@ class PrintGlRemap(gl_XML.gl_print_base): def printRealHeader(self): - print '#include "main/dispatch.h"' - print '#include "main/remap.h"' + print '#include "dispatch.h"' + print '#include "remap.h"' print '' return diff --git a/mesalib/src/mesa/main/remap.c b/mesalib/src/mesa/main/remap.c index 44ec96498..1ae924555 100644 --- a/mesalib/src/mesa/main/remap.c +++ b/mesalib/src/mesa/main/remap.c @@ -36,9 +36,9 @@ * a dynamic entry, or the corresponding static entry, in glapi. */ +#include "glapi/glapi.h" #include "remap.h" #include "imports.h" -#include "glapi/glapi.h" #define MAX_ENTRY_POINTS 16 @@ -47,7 +47,7 @@ /* this is global for quick access */ -int driDispatchRemapTable[driDispatchRemapTable_size]; +SERVEXTERN int driDispatchRemapTable[driDispatchRemapTable_size]; /** diff --git a/mesalib/src/mesa/main/remap.h b/mesalib/src/mesa/main/remap.h index bfef6ac4e..65d4f5faa 100644 --- a/mesalib/src/mesa/main/remap.h +++ b/mesalib/src/mesa/main/remap.h @@ -41,7 +41,7 @@ struct gl_function_remap { }; -extern int +SERVEXTERN int driDispatchRemapTable[]; extern const char * |