Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Unified Diff: third_party/mesa/MesaLib/include/GL/gl.h

Issue 2856063: Fixed compilation errors for Windows multi-DLL build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/mesa/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/MesaLib/include/GL/gl.h
===================================================================
--- third_party/mesa/MesaLib/include/GL/gl.h (revision 53662)
+++ third_party/mesa/MesaLib/include/GL/gl.h (working copy)
@@ -55,7 +55,11 @@
# 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)
+// We always retrieve the entry points dynamically via GetProcAddress or
+// OSMesaGetProcAddress. This works around an issue where using the MSVC
+// multi-threaded runtime library, which defines _DLL.
+//# define GLAPI __declspec(dllimport)
+# define GLAPI
# else /* for use with static link lib build of Win32 edition only */
# define GLAPI extern
# endif /* _STATIC_MESA support */
« no previous file with comments | « no previous file | third_party/mesa/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698