diff options
| author | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
| commit | 3b8bc1f46758d4da9155419fcf558a493e729501 (patch) | |
| tree | 0dbfb4ae1ed6b49caaed3e662b27db30fe2e8801 /src/glut/glx/win32_x11.h | |
| parent | ffe58739da9eee2e99682747cc8f26e412c87430 (diff) | |
| parent | ffa2659204121f703208782ff225a22e0c21b173 (diff) | |
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/glut/glx/win32_x11.h')
| -rw-r--r-- | src/glut/glx/win32_x11.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/glut/glx/win32_x11.h b/src/glut/glx/win32_x11.h index 1d8d048b2e..6f5c3a9aea 100644 --- a/src/glut/glx/win32_x11.h +++ b/src/glut/glx/win32_x11.h @@ -6,16 +6,14 @@ /* This program is freely distributable without licensing fees and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ - +#ifdef __MINGW32__ +#include <GL/gl.h> +#endif #include <stdlib.h> #include <windows.h> /* These definitions are missing from windows.h */ -WINGDIAPI int WINAPI wglChoosePixelFormat(HDC, PIXELFORMATDESCRIPTOR *); -WINGDIAPI int WINAPI wglDescribePixelFormat(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); -WINGDIAPI int WINAPI wglGetPixelFormat(HDC); -WINGDIAPI BOOL WINAPI wglSetPixelFormat(HDC, int, PIXELFORMATDESCRIPTOR *); -WINGDIAPI BOOL WINAPI wglSwapBuffers(HDC); + /* Type definitions (conversions) */ typedef int Visual; /* Win32 equivalent of X11 type */ |