summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-08-11 20:29:45 +0000
committerIan Romanick <idr@us.ibm.com>2005-08-11 20:29:45 +0000
commitf2876d1ee3b878a07b12ddcb464633a44f7c29e7 (patch)
tree9e46feeaeb58aa5484ff2a11f6632bea84bcca29 /src
parentfbcc5aedf2a06e14030a3e67d2be9fd043e3cf38 (diff)
Remove the logic that determines at compile time whether or not HAVE_ALIAS
should be defined. It was flawed on some platforms (e.g., Darwin & mingw). Instead, rely on the build system to define it on the compiler command line. This also reverts ajax's hand-edit to indirect_size.c. I'll fix that on the X.org side of things later today.
Diffstat (limited to 'src')
-rw-r--r--src/glx/x11/indirect_size.c7
-rw-r--r--src/mesa/glapi/glX_proto_size.py4
-rw-r--r--src/mesa/glapi/gl_XML.py17
3 files changed, 0 insertions, 28 deletions
diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index a37b2f806f..b8886e4859 100644
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -29,10 +29,6 @@
#include <GL/gl.h>
#include "indirect_size.h"
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define HAVE_ALIAS
-# endif
-
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
# define PURE __attribute__((pure))
# else
@@ -365,10 +361,7 @@ ALIAS( Map2f, Map2d )
ALIAS( ColorTableParameteriv, ColorTableParameterfv )
ALIAS( ConvolutionParameteriv, ConvolutionParameterfv )
ALIAS( PointParameterivNV, PointParameterfvEXT )
-ALIAS( PointParameterfvARB, PointParameterfvEXT )
-ALIAS( PointParameteriv, PointParameterfvEXT )
-# undef HAVE_ALIAS
# undef PURE
# undef FASTCALL
# undef INTERNAL
diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py
index b097fed0eb..d4c8b553e4 100644
--- a/src/mesa/glapi/glX_proto_size.py
+++ b/src/mesa/glapi/glX_proto_size.py
@@ -313,8 +313,6 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
print '#include "indirect_size.h"'
print ''
- self.printHaveAlias()
- print ''
self.printPure()
print ''
self.printFastcall()
@@ -437,8 +435,6 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common):
print ''
print '#define __GLX_PAD(x) (((x) + 3) & ~3)'
print ''
- self.printHaveAlias()
- print ''
print '#ifdef HAVE_ALIAS'
print '# define ALIAS2(from,to) \\'
print ' GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \\'
diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py
index 651bd7369b..3b87b724ab 100644
--- a/src/mesa/glapi/gl_XML.py
+++ b/src/mesa/glapi/gl_XML.py
@@ -242,23 +242,6 @@ class gl_print_base:
return
- def printHaveAlias(self):
- """Conditionally define `HAVE_ALIAS'.
-
- Conditionally defines a preprocessor macro `HAVE_ALIAS'. The
- existance of this macro can be used to determine whether or
- not GCC's alias function attribute can be used.
-
- The name is also added to the file's undef_list.
- """
-
- self.undef_list.append("HAVE_ALIAS")
- print """# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define HAVE_ALIAS
-# endif"""
- return
-
-
def real_function_name(element):
name = element.nsProp( "name", None )
alias = element.nsProp( "alias", None )