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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/mesa/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Mesa 3-D graphics library 2 * Mesa 3-D graphics library
3 * Version: 7.6 3 * Version: 7.6
4 * 4 *
5 * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. 5 * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
6 * Copyright (C) 2009 VMware, Inc. All Rights Reserved. 6 * Copyright (C) 2009 VMware, Inc. All Rights Reserved.
7 * 7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a 8 * Permission is hereby granted, free of charge, to any person obtaining a
9 * copy of this software and associated documentation files (the "Software"), 9 * copy of this software and associated documentation files (the "Software"),
10 * to deal in the Software without restriction, including without limitation 10 * to deal in the Software without restriction, including without limitation
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #endif 48 #endif
49 49
50 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) 50 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
51 #define __WIN32__ 51 #define __WIN32__
52 #endif 52 #endif
53 53
54 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) 54 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
55 # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ 55 # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
56 # define GLAPI __declspec(dllexport) 56 # define GLAPI __declspec(dllexport)
57 # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag spec ifying we're building for DLL runtime support */ 57 # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag spec ifying we're building for DLL runtime support */
58 # define GLAPI __declspec(dllimport) 58 // We always retrieve the entry points dynamically via GetProcAddress or
59 // OSMesaGetProcAddress. This works around an issue where using the MSVC
60 // multi-threaded runtime library, which defines _DLL.
61 //# define GLAPI __declspec(dllimport)
62 # define GLAPI
59 # else /* for use with static link lib build of Win32 edition only */ 63 # else /* for use with static link lib build of Win32 edition only */
60 # define GLAPI extern 64 # define GLAPI extern
61 # endif /* _STATIC_MESA support */ 65 # endif /* _STATIC_MESA support */
62 # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* Th e generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ 66 # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* Th e generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
63 # define GLAPIENTRY 67 # define GLAPIENTRY
64 # else 68 # else
65 # define GLAPIENTRY __stdcall 69 # define GLAPIENTRY __stdcall
66 # endif 70 # endif
67 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl3 2 */ 71 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl3 2 */
68 # define GLAPI extern 72 # define GLAPI extern
(...skipping 2148 matching lines...) Expand 10 before | Expand all | Expand 10 after
2217 /* 2221 /*
2218 * End system-specific stuff 2222 * End system-specific stuff
2219 **********************************************************************/ 2223 **********************************************************************/
2220 2224
2221 2225
2222 #ifdef __cplusplus 2226 #ifdef __cplusplus
2223 } 2227 }
2224 #endif 2228 #endif
2225 2229
2226 #endif /* __gl_h_ */ 2230 #endif /* __gl_h_ */
OLDNEW
« 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