diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-31 11:39:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-31 11:39:10 +0200 |
| commit | bdc38022df44bde91e7ff95f6446cf20e19eaa5f (patch) | |
| tree | 63386f21679537a891a7cc44fb7dc15ad57cf1df /mesalib/src/mesa/drivers/windows/gdi | |
| parent | a15173d276fcc8bb45637bba9f027136f4915652 (diff) | |
| parent | d14fe6598b87092374b1be6eb655153d270c3066 (diff) | |
| download | vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.gz vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.bz2 vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/README.WIN32
mesalib/docs/install.html
mesalib/src/glu/sgi/include/gluos.h
mesalib/src/mesa/drivers/windows/gdi/wgl.c
mesalib/src/mesa/main/state.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/tnl/t_draw.c
Diffstat (limited to 'mesalib/src/mesa/drivers/windows/gdi')
| -rw-r--r-- | mesalib/src/mesa/drivers/windows/gdi/wgl.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/mesalib/src/mesa/drivers/windows/gdi/wgl.c b/mesalib/src/mesa/drivers/windows/gdi/wgl.c index d9285c420..0756c27cc 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/wgl.c +++ b/mesalib/src/mesa/drivers/windows/gdi/wgl.c @@ -29,31 +29,8 @@ */
-/* We're essentially building part of GDI here, so define this so that
- * we get the right export linkage. */
-#ifdef __MINGW32__
-
-#include <stdarg.h>
-#include <windef.h>
-#include <wincon.h>
-#include <winbase.h>
-
-# if defined(BUILD_GL32)
-# define WINGDIAPI __declspec(dllexport)
-# else
-# define __W32API_USE_DLLIMPORT__
-# endif
-
-#include <wingdi.h>
-#include "GL/mesa_wgl.h"
-#include <stdlib.h>
-
-#else
-
-#define _GDI32_
#include <windows.h>
-#endif
#include "main/config.h"
#include "glapi/glapi.h"
#include "GL/wmesa.h" /* protos for wmesa* functions */
|