diff options
| -rw-r--r-- | src/mesa/main/enums.c | 12 | ||||
| -rw-r--r-- | src/mesa/main/glheader.h | 14 |
2 files changed, 7 insertions, 19 deletions
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index 20009d66dd3..3f9d91dfe74 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.3 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -37,7 +36,10 @@ typedef struct { int n; } enum_elt; -enum_elt all_enums[] = +/** + * XXX We should auto-generate this with a Python script someday. + */ +static enum_elt all_enums[] = { /* Boolean values */ { "GL_FALSE", 0 }, @@ -889,7 +891,7 @@ enum_elt all_enums[] = #define Elements(x) sizeof(x)/sizeof(*x) -typedef int (GLWINAPIV *cfunc)(const void *, const void *); +typedef int (*cfunc)(const void *, const void *); static enum_elt **index1 = 0; static int sorted = 0; diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 0266b77f1b0..65901c7b818 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -113,15 +113,6 @@ # endif /* _STATIC_MESA support */ # define GLAPIENTRY __stdcall # define GLAPIENTRYP GLAPIENTRY * -# define GLCALLBACK __stdcall -# define GLCALLBACKP GLCALLBACK * -# if defined(__CYGWIN__) -# define GLCALLBACKPCAST * -# else -# define GLCALLBACKPCAST __stdcall * -# endif -# define GLWINAPI __stdcall -# define GLWINAPIV __cdecl #elif !defined(BUILD_FOR_SNAP) /* non-Windows compilation */ # define GLAPI extern @@ -129,11 +120,6 @@ # ifndef GLAPIENTRYP # define GLAPIENTRYP * # endif -# define GLCALLBACK -# define GLCALLBACKP * -# define GLCALLBACKPCAST * -# define GLWINAPI -# define GLWINAPIV #endif /* WIN32 / CYGWIN bracket */ |