aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesalib/src/mesa/glapi/glapi.h4
-rw-r--r--xorg-server/glx/glapi.c1
-rw-r--r--xorg-server/glx/glapi.h4
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 <unistd.h>
#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;