diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-27 03:21:43 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-11-27 03:21:43 +0000 |
| commit | 39c86eac9bc4215c617f57e7fa0761a1a5068c64 (patch) | |
| tree | 8bbc513dc60dcab9dd0f11acb6456fbf49c2ee69 /src/glu | |
| parent | 568f7578d3789f58d52394d9d42a818b85d9a196 (diff) | |
| download | external_mesa3d-39c86eac9bc4215c617f57e7fa0761a1a5068c64.zip external_mesa3d-39c86eac9bc4215c617f57e7fa0761a1a5068c64.tar.gz external_mesa3d-39c86eac9bc4215c617f57e7fa0761a1a5068c64.tar.bz2 | |
removed a bunch of #define cruft, in case anyone still uses this code
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/mesa/gluP.h | 50 |
1 files changed, 3 insertions, 47 deletions
diff --git a/src/glu/mesa/gluP.h b/src/glu/mesa/gluP.h index 965bc7e..dc1b05b 100644 --- a/src/glu/mesa/gluP.h +++ b/src/glu/mesa/gluP.h @@ -1,8 +1,7 @@ - /* * Mesa 3-D graphics library - * Version: 3.3 - * Copyright (C) 1995-2000 Brian Paul + * Version: 6.3 + * Copyright (C) 1995-2004 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +35,7 @@ #if defined(_WIN32) && !defined(__WIN32__) -# define __WIN32__ +# define __WIN32__ #endif #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__)) @@ -51,65 +50,22 @@ # pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */ # pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ # endif -# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ -# define GLAPI __declspec(dllexport) -# define WGLAPI __declspec(dllexport) -# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ -# define GLAPI __declspec(dllimport) -# define WGLAPI __declspec(dllimport) -# else /* for use with static link lib build of Win32 edition only */ -# define GLAPI extern -# define WGLAPI __declspec(dllimport) -# endif /* _STATIC_MESA support */ -# define GLAPIENTRY __stdcall -# define GLAPIENTRYP __stdcall * # define GLCALLBACK __stdcall -# define GLCALLBACKP __stdcall * # if defined(__CYGWIN__) # define GLCALLBACKPCAST * # else # define GLCALLBACKPCAST __stdcall * # endif -# define GLWINAPI __stdcall -# define GLWINAPIV __cdecl #else /* non-Windows compilation */ -# define GLAPI extern -# define GLAPIENTRY -# define GLAPIENTRYP * # define GLCALLBACK -# define GLCALLBACKP * # define GLCALLBACKPCAST * -# define GLWINAPI -# define GLWINAPIV #endif /* WIN32 / CYGWIN bracket */ /* compatability guard so we don't need to change client code */ #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) # define CALLBACK GLCALLBACK -typedef int (GLAPIENTRY *PROC)(); -typedef void *HGLRC; -typedef void *HDC; -typedef unsigned long COLORREF; -#endif - -#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) -# define WGL_FONT_LINES 0 -# define WGL_FONT_POLYGONS 1 -#ifndef _GNU_H_WINDOWS32_FUNCTIONS -# ifdef UNICODE -# define wglUseFontBitmaps wglUseFontBitmapsW -# define wglUseFontOutlines wglUseFontOutlinesW -# else -# define wglUseFontBitmaps wglUseFontBitmapsA -# define wglUseFontOutlines wglUseFontOutlinesA -# endif /* !UNICODE */ -#endif /* _GNU_H_WINDOWS32_FUNCTIONS */ -typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR; -typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT; -typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR; -#include <GL/mesa_wgl.h> #endif |