summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-01-14 14:03:52 -0800
committerEric Anholt <[email protected]>2011-01-14 15:28:01 -0800
commit841ad6bfad27b2d8a196169b81235312a5e5f36a (patch)
tree9c371d708f2a265cf8586c5e88af5fad3351451a /src/glx
parent8560cb939bda27b75baca33294754d6bf7b7bc91 (diff)
glapi: Regenerate for GL_ARB_ES2_compatibility.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/indirect.c26
-rw-r--r--src/glx/indirect_size.c44
-rw-r--r--src/glx/indirect_size.h38
3 files changed, 54 insertions, 54 deletions
diff --git a/src/glx/indirect.c b/src/glx/indirect.c
index 49938a167a5..6d3c42c5f3b 100644
--- a/src/glx/indirect.c
+++ b/src/glx/indirect.c
@@ -41,19 +41,19 @@
#define __GLX_PAD(n) (((n) + 3) & ~3)
-# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# define FASTCALL __attribute__((fastcall))
-# else
-# define FASTCALL
-# endif
-# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define NOINLINE __attribute__((noinline))
-# else
-# define NOINLINE
-# endif
+#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#define FASTCALL __attribute__((fastcall))
+#else
+#define FASTCALL
+#endif
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#define NOINLINE __attribute__((noinline))
+#else
+#define NOINLINE
+#endif
#ifndef __GNUC__
-# define __builtin_expect(x, y) x
+#define __builtin_expect(x, y) x
#endif
/* If the size and opcode values are known at compile-time, this will, on
@@ -10657,5 +10657,5 @@ __indirect_glFramebufferTextureLayerEXT(GLenum target, GLenum attachment,
}
-# undef FASTCALL
-# undef NOINLINE
+#undef FASTCALL
+#undef NOINLINE
diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c
index 411a0e42c55..137e69cb044 100644
--- a/src/glx/indirect_size.c
+++ b/src/glx/indirect_size.c
@@ -29,35 +29,35 @@
#include <GL/gl.h>
#include "indirect_size.h"
-# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define PURE __attribute__((pure))
-# else
-# define PURE
-# endif
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#define PURE __attribute__((pure))
+#else
+#define PURE
+#endif
-# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# define FASTCALL __attribute__((fastcall))
-# else
-# define FASTCALL
-# endif
+#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#define FASTCALL __attribute__((fastcall))
+#else
+#define FASTCALL
+#endif
-# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
-# define INTERNAL __attribute__((visibility("internal")))
-# else
-# define INTERNAL
-# endif
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
+#define INTERNAL __attribute__((visibility("internal")))
+#else
+#define INTERNAL
+#endif
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
-# undef HAVE_ALIAS
+#undef HAVE_ALIAS
#endif
#ifdef HAVE_ALIAS
-# define ALIAS2(from,to) \
+#define ALIAS2(from,to) \
INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
__attribute__ ((alias( # to )));
-# define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
+#define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
#else
-# define ALIAS(from,to) \
+#define ALIAS(from,to) \
INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
{ return __gl ## to ## _size( e ); }
#endif
@@ -383,6 +383,6 @@ ALIAS(Fogiv, Fogfv)
ALIAS(ColorTableParameteriv, ColorTableParameterfv)
ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
ALIAS(PointParameterivNV, PointParameterfvEXT)
-# undef PURE
-# undef FASTCALL
-# undef INTERNAL
+#undef PURE
+#undef FASTCALL
+#undef INTERNAL
diff --git a/src/glx/indirect_size.h b/src/glx/indirect_size.h
index 79b849b6839..9857b6c75e6 100644
--- a/src/glx/indirect_size.h
+++ b/src/glx/indirect_size.h
@@ -26,7 +26,7 @@
*/
#if !defined( _INDIRECT_SIZE_H_ )
-# define _INDIRECT_SIZE_H_
+#define _INDIRECT_SIZE_H_
/**
* \file
@@ -36,23 +36,23 @@
* \author Ian Romanick <[email protected]>
*/
-# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-# define PURE __attribute__((pure))
-# else
-# define PURE
-# endif
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#define PURE __attribute__((pure))
+#else
+#define PURE
+#endif
-# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# define FASTCALL __attribute__((fastcall))
-# else
-# define FASTCALL
-# endif
+#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#define FASTCALL __attribute__((fastcall))
+#else
+#define FASTCALL
+#endif
-# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
-# define INTERNAL __attribute__((visibility("internal")))
-# else
-# define INTERNAL
-# endif
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
+#define INTERNAL __attribute__((visibility("internal")))
+#else
+#define INTERNAL
+#endif
extern INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
@@ -81,8 +81,8 @@ extern INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
-# undef PURE
-# undef FASTCALL
-# undef INTERNAL
+#undef PURE
+#undef FASTCALL
+#undef INTERNAL
#endif /* !defined( _INDIRECT_SIZE_H_ ) */