From a7f914ef9256ee2d287e77384c01181734fd3df2 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 1 Dec 2010 17:52:55 +0000 Subject: Synchronised files between glx and mesalib --- xorg-server/glx/indirect_size_get.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'xorg-server/glx/indirect_size_get.h') diff --git a/xorg-server/glx/indirect_size_get.h b/xorg-server/glx/indirect_size_get.h index 3c94bbf80..01770f221 100644 --- a/xorg-server/glx/indirect_size_get.h +++ b/xorg-server/glx/indirect_size_get.h @@ -25,9 +25,6 @@ * SOFTWARE. */ -#if !defined( _INDIRECT_SIZE_GET_H_ ) -# define _INDIRECT_SIZE_GET_H_ - /** * \file * Prototypes for functions used to determine the number of data elements in @@ -36,7 +33,7 @@ * \author Ian Romanick */ -# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) # define PURE __attribute__((pure)) # else # define PURE @@ -48,7 +45,7 @@ # define FASTCALL # endif -# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__) +# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__) # define INTERNAL __attribute__((visibility("internal"))) # else # define INTERNAL @@ -121,5 +118,3 @@ extern INTERNAL PURE FASTCALL GLint __glGetFramebufferAttachmentParameterivEXT_s # undef PURE # undef FASTCALL # undef INTERNAL - -#endif /* !defined( _INDIRECT_SIZE_GET_H_ ) */ -- cgit v1.2.3