diff options
| -rw-r--r-- | src/mesa/glapi/gen/glX_proto_send.py | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/gen/gl_XML.py | 4 | ||||
| -rw-r--r-- | src/mesa/glapi/gen/gl_x86-64_asm.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/glapi/gen/glX_proto_send.py b/src/mesa/glapi/gen/glX_proto_send.py index 4d484c833a8..c52b85bfb4f 100644 --- a/src/mesa/glapi/gen/glX_proto_send.py +++ b/src/mesa/glapi/gen/glX_proto_send.py @@ -182,7 +182,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): self.printFastcall() self.printNoinline() print '' - print '#if !defined __GNUC__ || __GNUC__ < 3' + print '#ifndef __GNUC__' print '# define __builtin_expect(x, y) x' print '#endif' print '' diff --git a/src/mesa/glapi/gen/gl_XML.py b/src/mesa/glapi/gen/gl_XML.py index a10a35e513c..b769ee2bb5a 100644 --- a/src/mesa/glapi/gen/gl_XML.py +++ b/src/mesa/glapi/gen/gl_XML.py @@ -184,7 +184,7 @@ class gl_print_base: The name is also added to the file's undef_list. """ self.undef_list.append("PURE") - print """# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) + print """# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) # define PURE __attribute__((pure)) # else # define PURE @@ -224,7 +224,7 @@ class gl_print_base: """ self.undef_list.append(S) - print """# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__) + print """# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__) # define %s __attribute__((visibility("%s"))) # else # define %s diff --git a/src/mesa/glapi/gen/gl_x86-64_asm.py b/src/mesa/glapi/gen/gl_x86-64_asm.py index 8ac57ab7ebb..e6e78c42f3b 100644 --- a/src/mesa/glapi/gen/gl_x86-64_asm.py +++ b/src/mesa/glapi/gen/gl_x86-64_asm.py @@ -124,7 +124,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '' print '#include "x86/assyntax.h"' print '' - print '#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303' + print '#ifdef __GNUC__' print '# pragma GCC visibility push(default)' print '# define HIDDEN(x) .hidden x' print '#else' |