From 5348c8918a9ebee313538786fb711e36e492e40c Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 11 Sep 2010 20:50:48 +0000 Subject: Solved regression swrast_dri not working anymore --- mesalib/src/mesa/glapi/glapi.h | 4 ++-- xorg-server/glx/glapi.c | 1 - xorg-server/glx/glapi.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mesalib/src/mesa/glapi/glapi.h b/mesalib/src/mesa/glapi/glapi.h index 9add5e7ee..8603317da 100644 --- a/mesalib/src/mesa/glapi/glapi.h +++ b/mesalib/src/mesa/glapi/glapi.h @@ -95,9 +95,9 @@ extern __thread void * _glapi_tls_Context #else #ifdef INSERVER -#define EXTERN _declspec(dllexport) +#define EXTERN _declspec(dllimport) #else -#define EXTERN extern +#define EXTERN _declspec(dllexport) #endif EXTERN struct _glapi_table *_glapi_Dispatch; diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c index 4d98344e1..17b7feed8 100644 --- a/xorg-server/glx/glapi.c +++ b/xorg-server/glx/glapi.c @@ -74,7 +74,6 @@ #include #define str_dup strdup -#define INSERVER #include "glapi.h" #include "glapioffsets.h" #include "GL/gl.h" diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index 9add5e7ee..8603317da 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -95,9 +95,9 @@ extern __thread void * _glapi_tls_Context #else #ifdef INSERVER -#define EXTERN _declspec(dllexport) +#define EXTERN _declspec(dllimport) #else -#define EXTERN extern +#define EXTERN _declspec(dllexport) #endif EXTERN struct _glapi_table *_glapi_Dispatch; -- cgit v1.2.3