diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/glapi/glX_proto_size.py | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_XML.py | 2 | ||||
| -rw-r--r-- | src/mesa/main/enums.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py index 63d80dd74c7..62f32f3836a 100644 --- a/src/mesa/glapi/glX_proto_size.py +++ b/src/mesa/glapi/glX_proto_size.py @@ -320,7 +320,7 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): self.printVisibility( "INTERNAL", "internal" ) print '' print '' - print '#if defined(__CYGWIN__) || defined(__MINGW32__)' + print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)' print '# undef HAVE_ALIAS' print '#endif' print '#ifdef HAVE_ALIAS' diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py index 808a0a474e7..11b23b7a867 100644 --- a/src/mesa/glapi/gl_XML.py +++ b/src/mesa/glapi/gl_XML.py @@ -214,7 +214,7 @@ class gl_print_base: """ self.undef_list.append(S) - print """# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && !defined(__CYGWIN__) && !defined(__MINGW32__) + print """# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) # define %s __attribute__((visibility("%s"))) # else # define %s diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index c653e0c48ff..837618cd74a 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -3267,6 +3267,7 @@ static const enum_elt all_enums[1612] = static const unsigned reduced_enums[1232] = { + 26, /* GL_ALL_CLIENT_ATTRIB_BITS */ 389, /* GL_FALSE */ 561, /* GL_LINES */ 563, /* GL_LINE_LOOP */ @@ -4498,7 +4499,6 @@ static const unsigned reduced_enums[1232] = 1212, /* GL_SCISSOR_BIT */ 25, /* GL_ALL_ATTRIB_BITS */ 845, /* GL_MULTISAMPLE_BIT */ - 26, /* GL_ALL_CLIENT_ATTRIB_BITS */ }; #define Elements(x) sizeof(x)/sizeof(*x) |