From 44b9e11ddbb5f693e299fae034163e7687043862 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Sep 2021 09:26:02 -0700 Subject: [PATCH] gl.h: Remove dllimport MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __declspec(dllimport) isn't needed for linking to functions, extern is sufficient. The preprocessor define used to determine when to set it (_DLL) was incorrect, since that preprocessor define is set anytime you're linking against dynamic CRT as opposed to static CRT. Reviewed-by: Bill Kristiansen Reviewed-by: Marek Olšák Part-of: --- include/GL/gl.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/GL/gl.h b/include/GL/gl.h index 191560ef640..e2f5408a5d5 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -38,9 +38,7 @@ #if defined(__WIN32__) && !defined(__CYGWIN__) # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) -# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ -# define GLAPI __declspec(dllimport) -# else /* for use with static link lib build of Win32 edition only */ +# else # define GLAPI extern # endif # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */