fix merge conflicts
diff --git a/xml/gl.xml b/xml/gl.xml
index 3bf68cb..ee48d88 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -19133,7 +19133,7 @@
<param><ptype>GLuint</ptype> <name>monitor</name></param>
<param><ptype>GLenum</ptype> <name>pname</name></param>
<param><ptype>GLsizei</ptype> <name>dataSize</name></param>
- <param len="dataSize"><ptype>GLuint</ptype> *<name>data</name></param>
+ <param len="dataSize / 4"><ptype>GLuint</ptype> *<name>data</name></param>
<param len="1"><ptype>GLint</ptype> *<name>bytesWritten</name></param>
</command>
<command>
@@ -20746,7 +20746,7 @@
<param group="MapTarget"><ptype>GLenum</ptype> <name>target</name></param>
<param group="MapQuery"><ptype>GLenum</ptype> <name>query</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="COMPSIZE(bufSize)"><ptype>GLdouble</ptype> *<name>v</name></param>
+ <param len="bufSize / 8"><ptype>GLdouble</ptype> *<name>v</name></param>
</command>
<command>
<proto>void <name>glGetnMapfv</name></proto>
@@ -20804,7 +20804,7 @@
<proto>void <name>glGetnPixelMapfvARB</name></proto>
<param group="PixelMap"><ptype>GLenum</ptype> <name>map</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="COMPSIZE(bufSize)"><ptype>GLfloat</ptype> *<name>values</name></param>
+ <param len="bufSize / 4"><ptype>GLfloat</ptype> *<name>values</name></param>
</command>
<command>
<proto>void <name>glGetnPixelMapuiv</name></proto>
@@ -20885,35 +20885,35 @@
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLdouble</ptype> *<name>params</name></param>
+ <param len="bufSize / 8"><ptype>GLdouble</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformdvARB</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLdouble</ptype> *<name>params</name></param>
+ <param len="bufSize / 8"><ptype>GLdouble</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformfv</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLfloat</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformfvARB</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLfloat</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformfvEXT</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLfloat</ptype> *<name>params</name></param>
<alias name="glGetnUniformfv"/>
</command>
<command>
@@ -20921,7 +20921,7 @@
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLfloat</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLfloat</ptype> *<name>params</name></param>
<alias name="glGetnUniformfv"/>
</command>
<command>
@@ -20929,28 +20929,28 @@
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLint64</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLint64</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformiv</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLint</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformivARB</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLint</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformivEXT</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLint</ptype> *<name>params</name></param>
<alias name="glGetnUniformiv"/>
</command>
<command>
@@ -20958,7 +20958,7 @@
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLint</ptype> *<name>params</name></param>
<alias name="glGetnUniformiv"/>
</command>
<command>
@@ -20966,28 +20966,28 @@
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLuint64</ptype> *<name>params</name></param>
+ <param len="bufSize / 8"><ptype>GLuint64</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformuiv</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLuint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLuint</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformuivARB</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLuint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLuint</ptype> *<name>params</name></param>
</command>
<command>
<proto>void <name>glGetnUniformuivKHR</name></proto>
<param class="program"><ptype>GLuint</ptype> <name>program</name></param>
<param><ptype>GLint</ptype> <name>location</name></param>
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
- <param len="bufSize"><ptype>GLuint</ptype> *<name>params</name></param>
+ <param len="bufSize / 4"><ptype>GLuint</ptype> *<name>params</name></param>
<alias name="glGetnUniformuiv"/>
</command>
<command>
