diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2021-09-08 09:26:02 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-09-08 18:42:57 +0000 |
| commit | 44b9e11ddbb5f693e299fae034163e7687043862 (patch) | |
| tree | 6c9046f94eaf02cc285714d07b2d59da30dc66e3 /include | |
| parent | 5ab27ad01e330a8331a0247aeca861a9efe553ad (diff) | |
gl.h: Remove dllimport
__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 <billkris@Microsoft.com>
Reviewed-by: Marek Olák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12776>
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 4 |
1 files changed, 1 insertions, 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 */ |