aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/glx/reg.py
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-08-19 12:16:17 +0200
committermarha <marha@users.sourceforge.net>2013-08-19 12:16:17 +0200
commit7403278d95051a554e2cbec3fafdde8ce9c6d200 (patch)
tree0b856002c12c11744627134553ef9cdfa77faead /xorg-server/hw/xwin/glx/reg.py
parent2d042f719910c5aa1ba9f4a47b21009c729c345e (diff)
downloadvcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.tar.gz
vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.tar.bz2
vcxsrv-7403278d95051a554e2cbec3fafdde8ce9c6d200.zip
Synchronised files
Updated to latest gl specs
Diffstat (limited to 'xorg-server/hw/xwin/glx/reg.py')
-rw-r--r--xorg-server/hw/xwin/glx/reg.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/glx/reg.py b/xorg-server/hw/xwin/glx/reg.py
index 4977710e5..2aeecc8d1 100644
--- a/xorg-server/hw/xwin/glx/reg.py
+++ b/xorg-server/hw/xwin/glx/reg.py
@@ -269,8 +269,10 @@ class GeneratorOptions:
# generated around a feature interface in the header file.
# genFuncPointers - True if function pointer typedefs should be
# generated
-# protectProto - True if #ifndef..#endif protection should be
+# protectProto - True if #ifdef..#endif protection should be
# generated around prototype declarations
+# protectProtoStr - #ifdef symbol to use around prototype
+# declarations, if protected
# apicall - string to use for the function declaration prefix,
# such as APICALL on Windows.
# apientry - string to use for the calling convention macro,
@@ -294,6 +296,7 @@ class CGeneratorOptions(GeneratorOptions):
protectFile = True,
protectFeature = True,
protectProto = True,
+ protectProtoStr = True,
apicall = '',
apientry = '',
apientryp = ''):
@@ -305,6 +308,7 @@ class CGeneratorOptions(GeneratorOptions):
self.protectFile = protectFile
self.protectFeature = protectFeature
self.protectProto = protectProto
+ self.protectProtoStr = protectProtoStr
self.apicall = apicall
self.apientry = apientry
self.apientryp = apientryp
@@ -579,7 +583,7 @@ class COutputGenerator(OutputGenerator):
print(self.cmdPointerBody, end='', file=self.outFile)
if (self.cmdBody != ''):
if (self.genOpts.protectProto):
- print('#ifdef GL_GLEXT_PROTOTYPES', file=self.outFile)
+ print('#ifdef', self.genOpts.protectProtoStr, file=self.outFile)
print(self.cmdBody, end='', file=self.outFile)
if (self.genOpts.protectProto):
print('#endif', file=self.outFile)