diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 17:52:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 17:52:55 +0000 |
| commit | a7f914ef9256ee2d287e77384c01181734fd3df2 (patch) | |
| tree | 720e1f49b7a2aaab8a62271860d3eb78624f4939 /xorg-server/glx/indirect_size_get.h | |
| parent | 6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (diff) | |
| download | vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.gz vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.bz2 vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.zip | |
Synchronised files between glx and mesalib
Diffstat (limited to 'xorg-server/glx/indirect_size_get.h')
| -rw-r--r-- | xorg-server/glx/indirect_size_get.h | 9 |
1 files changed, 2 insertions, 7 deletions
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 <idr@us.ibm.com>
*/
-# 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_ ) */
|