diff options
| author | Ian Romanick <[email protected]> | 2005-01-28 19:00:54 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2005-01-28 19:00:54 +0000 |
| commit | 16c3c7401846bbc7c300e6a9b433584ec5b68699 (patch) | |
| tree | b34e784e5b84cf802a50fae6d1544aae4bd28b14 /src/glx | |
| parent | 8d27148bbd13fbc8192f9c5aeeb9b39b92f1045d (diff) | |
Refactor the code to emit multiple-inclusion protection to
FilterGLAPISpecBase. Since the size_h mode of glX_proto_size.py will be
used to generate multiple header files, add an option to specify the define
that is used for multiple-inclusion protection.
The changes to the header files in this commit are just a side-effect of the
changes to the Python scripts.
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/x11/indirect.h | 7 | ||||
| -rw-r--r-- | src/glx/x11/indirect_size.h | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/glx/x11/indirect.h b/src/glx/x11/indirect.h index f5ffe1c483b..cb14dbc75e8 100644 --- a/src/glx/x11/indirect.h +++ b/src/glx/x11/indirect.h @@ -26,6 +26,8 @@ * SOFTWARE. */ +#if !defined( _INDIRECT_H_ ) +# define _INDIRECT_H_ /** * \file @@ -35,10 +37,6 @@ * \author Ian Romanick <[email protected]> */ -#if !defined( _INDIRECT_H_ ) -# define _INDIRECT_H_ - - # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) # define HIDDEN __attribute__((visibility("hidden"))) # else @@ -522,4 +520,5 @@ extern HIDDEN void __indirect_glMultiDrawArraysEXT(GLenum mode, GLint * first, G extern HIDDEN void __indirect_glMultiDrawElementsEXT(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); extern HIDDEN void __indirect_glActiveStencilFaceEXT(GLenum face); # undef HIDDEN + #endif /* !defined( _INDIRECT_H_ ) */ diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h index 833e95b2413..2001c56c4ed 100644 --- a/src/glx/x11/indirect_size.h +++ b/src/glx/x11/indirect_size.h @@ -25,6 +25,8 @@ * SOFTWARE. */ +#if !defined( _INDIRECT_SIZE_H_ ) +# define _INDIRECT_SIZE_H_ /** * \file @@ -34,10 +36,6 @@ * \author Ian Romanick <[email protected]> */ -#if !defined( _GLXSIZE_H_ ) -# define _GLXSIZE_H_ - - # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) # define PURE __attribute__((pure)) # else @@ -86,4 +84,5 @@ extern INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum); # undef INTERNAL # undef PURE # undef FASTCALL -#endif /* !defined( _GLXSIZE_H_ ) */ + +#endif /* !defined( _INDIRECT_SIZE_H_ ) */ |