summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:16:09 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:16:09 +0200
commit3ad9a2b5f396aad97e4af3d6979c832fd32459bb (patch)
tree164de61066fa40f364510b725b26a10748d9fba9
parent84a77492a26976c84c15d0c6ba558d30b87f0b51 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 50c9598ba64212a30b93ff818b01e6edb2d79ece (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:44 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 48d68cb55dece21703b2fd24822905ebf024a7c8 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:27 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 42a8568ffba726cd03054933b6af60288cab8bdd Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Sun Jan 23 22:49:57 2011 +0100 upgrade libwpd to 0.9.1 libwpd/libwpd-0.8.8.diff | 908 ---------------------------------------------- libwpd/makefile.mk | 4 +- 2 files changed, 2 insertions(+), 910 deletions(-) commit 89d2254ecf768981e1dd5562b895aee756125478 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:57 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 156a4b779e5510f4aacdfec906f171175a23b492 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:08 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: libs-extern_libreoffice-3.3.1.1 split repo tag: libs-extern_libreoffice-3.3.1.2
-rw-r--r--Mesa/inc/gl.h1602
-rw-r--r--Mesa/inc/gl_mangle.h3074
-rw-r--r--Mesa/inc/glext.h6
-rw-r--r--Mesa/inc/glx.h188
-rw-r--r--Mesa/inc/glxext.h16
-rw-r--r--apple_remote/inc/AppleRemote.h12
-rw-r--r--apple_remote/inc/GlobalKeyboardDevice.h12
-rw-r--r--apple_remote/inc/HIDRemoteControlDevice.h18
-rw-r--r--apple_remote/inc/KeyspanFrontRowControl.h10
-rw-r--r--apple_remote/inc/MultiClickRemoteBehavior.h22
-rw-r--r--apple_remote/inc/RemoteControl.h46
-rw-r--r--apple_remote/inc/RemoteControlContainer.h8
-rw-r--r--apple_remote/inc/RemoteMainController.h8
-rw-r--r--icc/source/create_sRGB_profile/create_sRGB_profile.cpp52
-rw-r--r--libegg/source/eggtrayicon-impl.h18
-rw-r--r--libegg/source/eggtrayicon.c44
-rw-r--r--libwpd/libwpd-0.8.8.diff908
-rw-r--r--libwpd/makefile.mk4
-rw-r--r--np_sdk/mozsrc/jri.h532
-rw-r--r--np_sdk/mozsrc/jri_md.h316
-rw-r--r--np_sdk/mozsrc/jritypes.h122
-rw-r--r--np_sdk/mozsrc/npapi.h80
-rw-r--r--np_sdk/mozsrc/npunix.c20
-rw-r--r--np_sdk/mozsrc/npupp.h368
-rw-r--r--np_sdk/mozsrc/npwin.cpp48
-rw-r--r--sane/inc/sane.h132
-rw-r--r--twain/inc/twain.h128
-rw-r--r--unixODBC/inc/sql.h122
-rw-r--r--unixODBC/inc/sqlext.h1474
-rw-r--r--unixODBC/inc/sqltypes.h156
-rw-r--r--unixODBC/inc/sqlucode.h190
-rw-r--r--x11_extensions/inc/Xrandr.h50
-rw-r--r--x11_extensions/inc/Xrender.h480
-rw-r--r--x11_extensions/inc/randr.h58
-rw-r--r--x11_extensions/inc/randrproto.h32
-rw-r--r--x11_extensions/inc/render.h266
-rw-r--r--x11_extensions/inc/renderproto.h450
-rw-r--r--x11_extensions/inc/shape.h144
-rw-r--r--x11_extensions/inc/shapeconst.h26
39 files changed, 5167 insertions, 6075 deletions
diff --git a/Mesa/inc/gl.h b/Mesa/inc/gl.h
index b427637e6ece..4380a1560386 100644
--- a/Mesa/inc/gl.h
+++ b/Mesa/inc/gl.h
@@ -68,7 +68,7 @@
#endif /* WIN32 && !CYGWIN */
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
-# define PRAGMA_EXPORT_SUPPORTED 1
+# define PRAGMA_EXPORT_SUPPORTED 1
#endif
/*
@@ -144,21 +144,21 @@ extern "C" {
/*
* Datatypes
*/
-typedef unsigned int GLenum;
-typedef unsigned char GLboolean;
-typedef unsigned int GLbitfield;
-typedef void GLvoid;
-typedef signed char GLbyte; /* 1-byte signed */
-typedef short GLshort; /* 2-byte signed */
-typedef int GLint; /* 4-byte signed */
-typedef unsigned char GLubyte; /* 1-byte unsigned */
-typedef unsigned short GLushort; /* 2-byte unsigned */
-typedef unsigned int GLuint; /* 4-byte unsigned */
-typedef int GLsizei; /* 4-byte signed */
-typedef float GLfloat; /* single precision float */
-typedef float GLclampf; /* single precision float in [0,1] */
-typedef double GLdouble; /* double precision float */
-typedef double GLclampd; /* double precision float in [0,1] */
+typedef unsigned int GLenum;
+typedef unsigned char GLboolean;
+typedef unsigned int GLbitfield;
+typedef void GLvoid;
+typedef signed char GLbyte; /* 1-byte signed */
+typedef short GLshort; /* 2-byte signed */
+typedef int GLint; /* 4-byte signed */
+typedef unsigned char GLubyte; /* 1-byte unsigned */
+typedef unsigned short GLushort; /* 2-byte unsigned */
+typedef unsigned int GLuint; /* 4-byte unsigned */
+typedef int GLsizei; /* 4-byte signed */
+typedef float GLfloat; /* single precision float */
+typedef float GLclampf; /* single precision float in [0,1] */
+typedef double GLdouble; /* double precision float */
+typedef double GLclampd; /* double precision float in [0,1] */
@@ -167,603 +167,603 @@ typedef double GLclampd; /* double precision float in [0,1] */
*/
/* Boolean values */
-#define GL_FALSE 0x0
-#define GL_TRUE 0x1
+#define GL_FALSE 0x0
+#define GL_TRUE 0x1
/* Data types */
-#define GL_BYTE 0x1400
-#define GL_UNSIGNED_BYTE 0x1401
-#define GL_SHORT 0x1402
-#define GL_UNSIGNED_SHORT 0x1403
-#define GL_INT 0x1404
-#define GL_UNSIGNED_INT 0x1405
-#define GL_FLOAT 0x1406
-#define GL_2_BYTES 0x1407
-#define GL_3_BYTES 0x1408
-#define GL_4_BYTES 0x1409
-#define GL_DOUBLE 0x140A
+#define GL_BYTE 0x1400
+#define GL_UNSIGNED_BYTE 0x1401
+#define GL_SHORT 0x1402
+#define GL_UNSIGNED_SHORT 0x1403
+#define GL_INT 0x1404
+#define GL_UNSIGNED_INT 0x1405
+#define GL_FLOAT 0x1406
+#define GL_2_BYTES 0x1407
+#define GL_3_BYTES 0x1408
+#define GL_4_BYTES 0x1409
+#define GL_DOUBLE 0x140A
/* Primitives */
-#define GL_POINTS 0x0000
-#define GL_LINES 0x0001
-#define GL_LINE_LOOP 0x0002
-#define GL_LINE_STRIP 0x0003
-#define GL_TRIANGLES 0x0004
-#define GL_TRIANGLE_STRIP 0x0005
-#define GL_TRIANGLE_FAN 0x0006
-#define GL_QUADS 0x0007
-#define GL_QUAD_STRIP 0x0008
-#define GL_POLYGON 0x0009
+#define GL_POINTS 0x0000
+#define GL_LINES 0x0001
+#define GL_LINE_LOOP 0x0002
+#define GL_LINE_STRIP 0x0003
+#define GL_TRIANGLES 0x0004
+#define GL_TRIANGLE_STRIP 0x0005
+#define GL_TRIANGLE_FAN 0x0006
+#define GL_QUADS 0x0007
+#define GL_QUAD_STRIP 0x0008
+#define GL_POLYGON 0x0009
/* Vertex Arrays */
-#define GL_VERTEX_ARRAY 0x8074
-#define GL_NORMAL_ARRAY 0x8075
-#define GL_COLOR_ARRAY 0x8076
-#define GL_INDEX_ARRAY 0x8077
-#define GL_TEXTURE_COORD_ARRAY 0x8078
-#define GL_EDGE_FLAG_ARRAY 0x8079
-#define GL_VERTEX_ARRAY_SIZE 0x807A
-#define GL_VERTEX_ARRAY_TYPE 0x807B
-#define GL_VERTEX_ARRAY_STRIDE 0x807C
-#define GL_NORMAL_ARRAY_TYPE 0x807E
-#define GL_NORMAL_ARRAY_STRIDE 0x807F
-#define GL_COLOR_ARRAY_SIZE 0x8081
-#define GL_COLOR_ARRAY_TYPE 0x8082
-#define GL_COLOR_ARRAY_STRIDE 0x8083
-#define GL_INDEX_ARRAY_TYPE 0x8085
-#define GL_INDEX_ARRAY_STRIDE 0x8086
-#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
-#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
-#define GL_VERTEX_ARRAY_POINTER 0x808E
-#define GL_NORMAL_ARRAY_POINTER 0x808F
-#define GL_COLOR_ARRAY_POINTER 0x8090
-#define GL_INDEX_ARRAY_POINTER 0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
-#define GL_V2F 0x2A20
-#define GL_V3F 0x2A21
-#define GL_C4UB_V2F 0x2A22
-#define GL_C4UB_V3F 0x2A23
-#define GL_C3F_V3F 0x2A24
-#define GL_N3F_V3F 0x2A25
-#define GL_C4F_N3F_V3F 0x2A26
-#define GL_T2F_V3F 0x2A27
-#define GL_T4F_V4F 0x2A28
-#define GL_T2F_C4UB_V3F 0x2A29
-#define GL_T2F_C3F_V3F 0x2A2A
-#define GL_T2F_N3F_V3F 0x2A2B
-#define GL_T2F_C4F_N3F_V3F 0x2A2C
-#define GL_T4F_C4F_N3F_V4F 0x2A2D
+#define GL_VERTEX_ARRAY 0x8074
+#define GL_NORMAL_ARRAY 0x8075
+#define GL_COLOR_ARRAY 0x8076
+#define GL_INDEX_ARRAY 0x8077
+#define GL_TEXTURE_COORD_ARRAY 0x8078
+#define GL_EDGE_FLAG_ARRAY 0x8079
+#define GL_VERTEX_ARRAY_SIZE 0x807A
+#define GL_VERTEX_ARRAY_TYPE 0x807B
+#define GL_VERTEX_ARRAY_STRIDE 0x807C
+#define GL_NORMAL_ARRAY_TYPE 0x807E
+#define GL_NORMAL_ARRAY_STRIDE 0x807F
+#define GL_COLOR_ARRAY_SIZE 0x8081
+#define GL_COLOR_ARRAY_TYPE 0x8082
+#define GL_COLOR_ARRAY_STRIDE 0x8083
+#define GL_INDEX_ARRAY_TYPE 0x8085
+#define GL_INDEX_ARRAY_STRIDE 0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
+#define GL_VERTEX_ARRAY_POINTER 0x808E
+#define GL_NORMAL_ARRAY_POINTER 0x808F
+#define GL_COLOR_ARRAY_POINTER 0x8090
+#define GL_INDEX_ARRAY_POINTER 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
+#define GL_V2F 0x2A20
+#define GL_V3F 0x2A21
+#define GL_C4UB_V2F 0x2A22
+#define GL_C4UB_V3F 0x2A23
+#define GL_C3F_V3F 0x2A24
+#define GL_N3F_V3F 0x2A25
+#define GL_C4F_N3F_V3F 0x2A26
+#define GL_T2F_V3F 0x2A27
+#define GL_T4F_V4F 0x2A28
+#define GL_T2F_C4UB_V3F 0x2A29
+#define GL_T2F_C3F_V3F 0x2A2A
+#define GL_T2F_N3F_V3F 0x2A2B
+#define GL_T2F_C4F_N3F_V3F 0x2A2C
+#define GL_T4F_C4F_N3F_V4F 0x2A2D
/* Matrix Mode */
-#define GL_MATRIX_MODE 0x0BA0
-#define GL_MODELVIEW 0x1700
-#define GL_PROJECTION 0x1701
-#define GL_TEXTURE 0x1702
+#define GL_MATRIX_MODE 0x0BA0
+#define GL_MODELVIEW 0x1700
+#define GL_PROJECTION 0x1701
+#define GL_TEXTURE 0x1702
/* Points */
-#define GL_POINT_SMOOTH 0x0B10
-#define GL_POINT_SIZE 0x0B11
-#define GL_POINT_SIZE_GRANULARITY 0x0B13
-#define GL_POINT_SIZE_RANGE 0x0B12
+#define GL_POINT_SMOOTH 0x0B10
+#define GL_POINT_SIZE 0x0B11
+#define GL_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_POINT_SIZE_RANGE 0x0B12
/* Lines */
-#define GL_LINE_SMOOTH 0x0B20
-#define GL_LINE_STIPPLE 0x0B24
-#define GL_LINE_STIPPLE_PATTERN 0x0B25
-#define GL_LINE_STIPPLE_REPEAT 0x0B26
-#define GL_LINE_WIDTH 0x0B21
-#define GL_LINE_WIDTH_GRANULARITY 0x0B23
-#define GL_LINE_WIDTH_RANGE 0x0B22
+#define GL_LINE_SMOOTH 0x0B20
+#define GL_LINE_STIPPLE 0x0B24
+#define GL_LINE_STIPPLE_PATTERN 0x0B25
+#define GL_LINE_STIPPLE_REPEAT 0x0B26
+#define GL_LINE_WIDTH 0x0B21
+#define GL_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_LINE_WIDTH_RANGE 0x0B22
/* Polygons */
-#define GL_POINT 0x1B00
-#define GL_LINE 0x1B01
-#define GL_FILL 0x1B02
-#define GL_CW 0x0900
-#define GL_CCW 0x0901
-#define GL_FRONT 0x0404
-#define GL_BACK 0x0405
-#define GL_POLYGON_MODE 0x0B40
-#define GL_POLYGON_SMOOTH 0x0B41
-#define GL_POLYGON_STIPPLE 0x0B42
-#define GL_EDGE_FLAG 0x0B43
-#define GL_CULL_FACE 0x0B44
-#define GL_CULL_FACE_MODE 0x0B45
-#define GL_FRONT_FACE 0x0B46
-#define GL_POLYGON_OFFSET_FACTOR 0x8038
-#define GL_POLYGON_OFFSET_UNITS 0x2A00
-#define GL_POLYGON_OFFSET_POINT 0x2A01
-#define GL_POLYGON_OFFSET_LINE 0x2A02
-#define GL_POLYGON_OFFSET_FILL 0x8037
+#define GL_POINT 0x1B00
+#define GL_LINE 0x1B01
+#define GL_FILL 0x1B02
+#define GL_CW 0x0900
+#define GL_CCW 0x0901
+#define GL_FRONT 0x0404
+#define GL_BACK 0x0405
+#define GL_POLYGON_MODE 0x0B40
+#define GL_POLYGON_SMOOTH 0x0B41
+#define GL_POLYGON_STIPPLE 0x0B42
+#define GL_EDGE_FLAG 0x0B43
+#define GL_CULL_FACE 0x0B44
+#define GL_CULL_FACE_MODE 0x0B45
+#define GL_FRONT_FACE 0x0B46
+#define GL_POLYGON_OFFSET_FACTOR 0x8038
+#define GL_POLYGON_OFFSET_UNITS 0x2A00
+#define GL_POLYGON_OFFSET_POINT 0x2A01
+#define GL_POLYGON_OFFSET_LINE 0x2A02
+#define GL_POLYGON_OFFSET_FILL 0x8037
/* Display Lists */
-#define GL_COMPILE 0x1300
-#define GL_COMPILE_AND_EXECUTE 0x1301
-#define GL_LIST_BASE 0x0B32
-#define GL_LIST_INDEX 0x0B33
-#define GL_LIST_MODE 0x0B30
+#define GL_COMPILE 0x1300
+#define GL_COMPILE_AND_EXECUTE 0x1301
+#define GL_LIST_BASE 0x0B32
+#define GL_LIST_INDEX 0x0B33
+#define GL_LIST_MODE 0x0B30
/* Depth buffer */
-#define GL_NEVER 0x0200
-#define GL_LESS 0x0201
-#define GL_EQUAL 0x0202
-#define GL_LEQUAL 0x0203
-#define GL_GREATER 0x0204
-#define GL_NOTEQUAL 0x0205
-#define GL_GEQUAL 0x0206
-#define GL_ALWAYS 0x0207
-#define GL_DEPTH_TEST 0x0B71
-#define GL_DEPTH_BITS 0x0D56
-#define GL_DEPTH_CLEAR_VALUE 0x0B73
-#define GL_DEPTH_FUNC 0x0B74
-#define GL_DEPTH_RANGE 0x0B70
-#define GL_DEPTH_WRITEMASK 0x0B72
-#define GL_DEPTH_COMPONENT 0x1902
+#define GL_NEVER 0x0200
+#define GL_LESS 0x0201
+#define GL_EQUAL 0x0202
+#define GL_LEQUAL 0x0203
+#define GL_GREATER 0x0204
+#define GL_NOTEQUAL 0x0205
+#define GL_GEQUAL 0x0206
+#define GL_ALWAYS 0x0207
+#define GL_DEPTH_TEST 0x0B71
+#define GL_DEPTH_BITS 0x0D56
+#define GL_DEPTH_CLEAR_VALUE 0x0B73
+#define GL_DEPTH_FUNC 0x0B74
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_DEPTH_WRITEMASK 0x0B72
+#define GL_DEPTH_COMPONENT 0x1902
/* Lighting */
-#define GL_LIGHTING 0x0B50
-#define GL_LIGHT0 0x4000
-#define GL_LIGHT1 0x4001
-#define GL_LIGHT2 0x4002
-#define GL_LIGHT3 0x4003
-#define GL_LIGHT4 0x4004
-#define GL_LIGHT5 0x4005
-#define GL_LIGHT6 0x4006
-#define GL_LIGHT7 0x4007
-#define GL_SPOT_EXPONENT 0x1205
-#define GL_SPOT_CUTOFF 0x1206
-#define GL_CONSTANT_ATTENUATION 0x1207
-#define GL_LINEAR_ATTENUATION 0x1208
-#define GL_QUADRATIC_ATTENUATION 0x1209
-#define GL_AMBIENT 0x1200
-#define GL_DIFFUSE 0x1201
-#define GL_SPECULAR 0x1202
-#define GL_SHININESS 0x1601
-#define GL_EMISSION 0x1600
-#define GL_POSITION 0x1203
-#define GL_SPOT_DIRECTION 0x1204
-#define GL_AMBIENT_AND_DIFFUSE 0x1602
-#define GL_COLOR_INDEXES 0x1603
-#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
-#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
-#define GL_LIGHT_MODEL_AMBIENT 0x0B53
-#define GL_FRONT_AND_BACK 0x0408
-#define GL_SHADE_MODEL 0x0B54
-#define GL_FLAT 0x1D00
-#define GL_SMOOTH 0x1D01
-#define GL_COLOR_MATERIAL 0x0B57
-#define GL_COLOR_MATERIAL_FACE 0x0B55
-#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
-#define GL_NORMALIZE 0x0BA1
+#define GL_LIGHTING 0x0B50
+#define GL_LIGHT0 0x4000
+#define GL_LIGHT1 0x4001
+#define GL_LIGHT2 0x4002
+#define GL_LIGHT3 0x4003
+#define GL_LIGHT4 0x4004
+#define GL_LIGHT5 0x4005
+#define GL_LIGHT6 0x4006
+#define GL_LIGHT7 0x4007
+#define GL_SPOT_EXPONENT 0x1205
+#define GL_SPOT_CUTOFF 0x1206
+#define GL_CONSTANT_ATTENUATION 0x1207
+#define GL_LINEAR_ATTENUATION 0x1208
+#define GL_QUADRATIC_ATTENUATION 0x1209
+#define GL_AMBIENT 0x1200
+#define GL_DIFFUSE 0x1201
+#define GL_SPECULAR 0x1202
+#define GL_SHININESS 0x1601
+#define GL_EMISSION 0x1600
+#define GL_POSITION 0x1203
+#define GL_SPOT_DIRECTION 0x1204
+#define GL_AMBIENT_AND_DIFFUSE 0x1602
+#define GL_COLOR_INDEXES 0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
+#define GL_LIGHT_MODEL_AMBIENT 0x0B53
+#define GL_FRONT_AND_BACK 0x0408
+#define GL_SHADE_MODEL 0x0B54
+#define GL_FLAT 0x1D00
+#define GL_SMOOTH 0x1D01
+#define GL_COLOR_MATERIAL 0x0B57
+#define GL_COLOR_MATERIAL_FACE 0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
+#define GL_NORMALIZE 0x0BA1
/* User clipping planes */
-#define GL_CLIP_PLANE0 0x3000
-#define GL_CLIP_PLANE1 0x3001
-#define GL_CLIP_PLANE2 0x3002
-#define GL_CLIP_PLANE3 0x3003
-#define GL_CLIP_PLANE4 0x3004
-#define GL_CLIP_PLANE5 0x3005
+#define GL_CLIP_PLANE0 0x3000
+#define GL_CLIP_PLANE1 0x3001
+#define GL_CLIP_PLANE2 0x3002
+#define GL_CLIP_PLANE3 0x3003
+#define GL_CLIP_PLANE4 0x3004
+#define GL_CLIP_PLANE5 0x3005
/* Accumulation buffer */
-#define GL_ACCUM_RED_BITS 0x0D58
-#define GL_ACCUM_GREEN_BITS 0x0D59
-#define GL_ACCUM_BLUE_BITS 0x0D5A
-#define GL_ACCUM_ALPHA_BITS 0x0D5B
-#define GL_ACCUM_CLEAR_VALUE 0x0B80
-#define GL_ACCUM 0x0100
-#define GL_ADD 0x0104
-#define GL_LOAD 0x0101
-#define GL_MULT 0x0103
-#define GL_RETURN 0x0102
+#define GL_ACCUM_RED_BITS 0x0D58
+#define GL_ACCUM_GREEN_BITS 0x0D59
+#define GL_ACCUM_BLUE_BITS 0x0D5A
+#define GL_ACCUM_ALPHA_BITS 0x0D5B
+#define GL_ACCUM_CLEAR_VALUE 0x0B80
+#define GL_ACCUM 0x0100
+#define GL_ADD 0x0104
+#define GL_LOAD 0x0101
+#define GL_MULT 0x0103
+#define GL_RETURN 0x0102
/* Alpha testing */
-#define GL_ALPHA_TEST 0x0BC0
-#define GL_ALPHA_TEST_REF 0x0BC2
-#define GL_ALPHA_TEST_FUNC 0x0BC1
+#define GL_ALPHA_TEST 0x0BC0
+#define GL_ALPHA_TEST_REF 0x0BC2
+#define GL_ALPHA_TEST_FUNC 0x0BC1
/* Blending */
-#define GL_BLEND 0x0BE2
-#define GL_BLEND_SRC 0x0BE1
-#define GL_BLEND_DST 0x0BE0
-#define GL_ZERO 0x0
-#define GL_ONE 0x1
-#define GL_SRC_COLOR 0x0300
-#define GL_ONE_MINUS_SRC_COLOR 0x0301
-#define GL_SRC_ALPHA 0x0302
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#define GL_DST_ALPHA 0x0304
-#define GL_ONE_MINUS_DST_ALPHA 0x0305
-#define GL_DST_COLOR 0x0306
-#define GL_ONE_MINUS_DST_COLOR 0x0307
-#define GL_SRC_ALPHA_SATURATE 0x0308
+#define GL_BLEND 0x0BE2
+#define GL_BLEND_SRC 0x0BE1
+#define GL_BLEND_DST 0x0BE0
+#define GL_ZERO 0x0
+#define GL_ONE 0x1
+#define GL_SRC_COLOR 0x0300
+#define GL_ONE_MINUS_SRC_COLOR 0x0301
+#define GL_SRC_ALPHA 0x0302
+#define GL_ONE_MINUS_SRC_ALPHA 0x0303
+#define GL_DST_ALPHA 0x0304
+#define GL_ONE_MINUS_DST_ALPHA 0x0305
+#define GL_DST_COLOR 0x0306
+#define GL_ONE_MINUS_DST_COLOR 0x0307
+#define GL_SRC_ALPHA_SATURATE 0x0308
/* Render Mode */
-#define GL_FEEDBACK 0x1C01
-#define GL_RENDER 0x1C00
-#define GL_SELECT 0x1C02
+#define GL_FEEDBACK 0x1C01
+#define GL_RENDER 0x1C00
+#define GL_SELECT 0x1C02
/* Feedback */
-#define GL_2D 0x0600
-#define GL_3D 0x0601
-#define GL_3D_COLOR 0x0602
-#define GL_3D_COLOR_TEXTURE 0x0603
-#define GL_4D_COLOR_TEXTURE 0x0604
-#define GL_POINT_TOKEN 0x0701
-#define GL_LINE_TOKEN 0x0702
-#define GL_LINE_RESET_TOKEN 0x0707
-#define GL_POLYGON_TOKEN 0x0703
-#define GL_BITMAP_TOKEN 0x0704
-#define GL_DRAW_PIXEL_TOKEN 0x0705
-#define GL_COPY_PIXEL_TOKEN 0x0706
-#define GL_PASS_THROUGH_TOKEN 0x0700
-#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
-#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
-#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
+#define GL_2D 0x0600
+#define GL_3D 0x0601
+#define GL_3D_COLOR 0x0602
+#define GL_3D_COLOR_TEXTURE 0x0603
+#define GL_4D_COLOR_TEXTURE 0x0604
+#define GL_POINT_TOKEN 0x0701
+#define GL_LINE_TOKEN 0x0702
+#define GL_LINE_RESET_TOKEN 0x0707
+#define GL_POLYGON_TOKEN 0x0703
+#define GL_BITMAP_TOKEN 0x0704
+#define GL_DRAW_PIXEL_TOKEN 0x0705
+#define GL_COPY_PIXEL_TOKEN 0x0706
+#define GL_PASS_THROUGH_TOKEN 0x0700
+#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
/* Selection */
-#define GL_SELECTION_BUFFER_POINTER 0x0DF3
-#define GL_SELECTION_BUFFER_SIZE 0x0DF4
+#define GL_SELECTION_BUFFER_POINTER 0x0DF3
+#define GL_SELECTION_BUFFER_SIZE 0x0DF4
/* Fog */
-#define GL_FOG 0x0B60
-#define GL_FOG_MODE 0x0B65
-#define GL_FOG_DENSITY 0x0B62
-#define GL_FOG_COLOR 0x0B66
-#define GL_FOG_INDEX 0x0B61
-#define GL_FOG_START 0x0B63
-#define GL_FOG_END 0x0B64
-#define GL_LINEAR 0x2601
-#define GL_EXP 0x0800
-#define GL_EXP2 0x0801
+#define GL_FOG 0x0B60
+#define GL_FOG_MODE 0x0B65
+#define GL_FOG_DENSITY 0x0B62
+#define GL_FOG_COLOR 0x0B66
+#define GL_FOG_INDEX 0x0B61
+#define GL_FOG_START 0x0B63
+#define GL_FOG_END 0x0B64
+#define GL_LINEAR 0x2601
+#define GL_EXP 0x0800
+#define GL_EXP2 0x0801
/* Logic Ops */
-#define GL_LOGIC_OP 0x0BF1
-#define GL_INDEX_LOGIC_OP 0x0BF1
-#define GL_COLOR_LOGIC_OP 0x0BF2
-#define GL_LOGIC_OP_MODE 0x0BF0
-#define GL_CLEAR 0x1500
-#define GL_SET 0x150F
-#define GL_COPY 0x1503
-#define GL_COPY_INVERTED 0x150C
-#define GL_NOOP 0x1505
-#define GL_INVERT 0x150A
-#define GL_AND 0x1501
-#define GL_NAND 0x150E
-#define GL_OR 0x1507
-#define GL_NOR 0x1508
-#define GL_XOR 0x1506
-#define GL_EQUIV 0x1509
-#define GL_AND_REVERSE 0x1502
-#define GL_AND_INVERTED 0x1504
-#define GL_OR_REVERSE 0x150B
-#define GL_OR_INVERTED 0x150D
+#define GL_LOGIC_OP 0x0BF1
+#define GL_INDEX_LOGIC_OP 0x0BF1
+#define GL_COLOR_LOGIC_OP 0x0BF2
+#define GL_LOGIC_OP_MODE 0x0BF0
+#define GL_CLEAR 0x1500
+#define GL_SET 0x150F
+#define GL_COPY 0x1503
+#define GL_COPY_INVERTED 0x150C
+#define GL_NOOP 0x1505
+#define GL_INVERT 0x150A
+#define GL_AND 0x1501
+#define GL_NAND 0x150E
+#define GL_OR 0x1507
+#define GL_NOR 0x1508
+#define GL_XOR 0x1506
+#define GL_EQUIV 0x1509
+#define GL_AND_REVERSE 0x1502
+#define GL_AND_INVERTED 0x1504
+#define GL_OR_REVERSE 0x150B
+#define GL_OR_INVERTED 0x150D
/* Stencil */
-#define GL_STENCIL_BITS 0x0D57
-#define GL_STENCIL_TEST 0x0B90
-#define GL_STENCIL_CLEAR_VALUE 0x0B91
-#define GL_STENCIL_FUNC 0x0B92
-#define GL_STENCIL_VALUE_MASK 0x0B93
-#define GL_STENCIL_FAIL 0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
-#define GL_STENCIL_REF 0x0B97
-#define GL_STENCIL_WRITEMASK 0x0B98
-#define GL_STENCIL_INDEX 0x1901
-#define GL_KEEP 0x1E00
-#define GL_REPLACE 0x1E01
-#define GL_INCR 0x1E02
-#define GL_DECR 0x1E03
+#define GL_STENCIL_BITS 0x0D57
+#define GL_STENCIL_TEST 0x0B90
+#define GL_STENCIL_CLEAR_VALUE 0x0B91
+#define GL_STENCIL_FUNC 0x0B92
+#define GL_STENCIL_VALUE_MASK 0x0B93
+#define GL_STENCIL_FAIL 0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
+#define GL_STENCIL_REF 0x0B97
+#define GL_STENCIL_WRITEMASK 0x0B98
+#define GL_STENCIL_INDEX 0x1901
+#define GL_KEEP 0x1E00
+#define GL_REPLACE 0x1E01
+#define GL_INCR 0x1E02
+#define GL_DECR 0x1E03
/* Buffers, Pixel Drawing/Reading */
-#define GL_NONE 0x0
-#define GL_LEFT 0x0406
-#define GL_RIGHT 0x0407
-/*GL_FRONT 0x0404 */
-/*GL_BACK 0x0405 */
-/*GL_FRONT_AND_BACK 0x0408 */
-#define GL_FRONT_LEFT 0x0400
-#define GL_FRONT_RIGHT 0x0401
-#define GL_BACK_LEFT 0x0402
-#define GL_BACK_RIGHT 0x0403
-#define GL_AUX0 0x0409
-#define GL_AUX1 0x040A
-#define GL_AUX2 0x040B
-#define GL_AUX3 0x040C
-#define GL_COLOR_INDEX 0x1900
-#define GL_RED 0x1903
-#define GL_GREEN 0x1904
-#define GL_BLUE 0x1905
-#define GL_ALPHA 0x1906
-#define GL_LUMINANCE 0x1909
-#define GL_LUMINANCE_ALPHA 0x190A
-#define GL_ALPHA_BITS 0x0D55
-#define GL_RED_BITS 0x0D52
-#define GL_GREEN_BITS 0x0D53
-#define GL_BLUE_BITS 0x0D54
-#define GL_INDEX_BITS 0x0D51
-#define GL_SUBPIXEL_BITS 0x0D50
-#define GL_AUX_BUFFERS 0x0C00
-#define GL_READ_BUFFER 0x0C02
-#define GL_DRAW_BUFFER 0x0C01
-#define GL_DOUBLEBUFFER 0x0C32
-#define GL_STEREO 0x0C33
-#define GL_BITMAP 0x1A00
-#define GL_COLOR 0x1800
-#define GL_DEPTH 0x1801
-#define GL_STENCIL 0x1802
-#define GL_DITHER 0x0BD0
-#define GL_RGB 0x1907
-#define GL_RGBA 0x1908
+#define GL_NONE 0x0
+#define GL_LEFT 0x0406
+#define GL_RIGHT 0x0407
+/*GL_FRONT 0x0404 */
+/*GL_BACK 0x0405 */
+/*GL_FRONT_AND_BACK 0x0408 */
+#define GL_FRONT_LEFT 0x0400
+#define GL_FRONT_RIGHT 0x0401
+#define GL_BACK_LEFT 0x0402
+#define GL_BACK_RIGHT 0x0403
+#define GL_AUX0 0x0409
+#define GL_AUX1 0x040A
+#define GL_AUX2 0x040B
+#define GL_AUX3 0x040C
+#define GL_COLOR_INDEX 0x1900
+#define GL_RED 0x1903
+#define GL_GREEN 0x1904
+#define GL_BLUE 0x1905
+#define GL_ALPHA 0x1906
+#define GL_LUMINANCE 0x1909
+#define GL_LUMINANCE_ALPHA 0x190A
+#define GL_ALPHA_BITS 0x0D55
+#define GL_RED_BITS 0x0D52
+#define GL_GREEN_BITS 0x0D53
+#define GL_BLUE_BITS 0x0D54
+#define GL_INDEX_BITS 0x0D51
+#define GL_SUBPIXEL_BITS 0x0D50
+#define GL_AUX_BUFFERS 0x0C00
+#define GL_READ_BUFFER 0x0C02
+#define GL_DRAW_BUFFER 0x0C01
+#define GL_DOUBLEBUFFER 0x0C32
+#define GL_STEREO 0x0C33
+#define GL_BITMAP 0x1A00
+#define GL_COLOR 0x1800
+#define GL_DEPTH 0x1801
+#define GL_STENCIL 0x1802
+#define GL_DITHER 0x0BD0
+#define GL_RGB 0x1907
+#define GL_RGBA 0x1908
/* Implementation limits */
-#define GL_MAX_LIST_NESTING 0x0B31
-#define GL_MAX_EVAL_ORDER 0x0D30
-#define GL_MAX_LIGHTS 0x0D31
-#define GL_MAX_CLIP_PLANES 0x0D32
-#define GL_MAX_TEXTURE_SIZE 0x0D33
-#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
-#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
-#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
-#define GL_MAX_NAME_STACK_DEPTH 0x0D37
-#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
-#define GL_MAX_VIEWPORT_DIMS 0x0D3A
-#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
+#define GL_MAX_LIST_NESTING 0x0B31
+#define GL_MAX_EVAL_ORDER 0x0D30
+#define GL_MAX_LIGHTS 0x0D31
+#define GL_MAX_CLIP_PLANES 0x0D32
+#define GL_MAX_TEXTURE_SIZE 0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
+#define GL_MAX_NAME_STACK_DEPTH 0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
+#define GL_MAX_VIEWPORT_DIMS 0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
/* Gets */
-#define GL_ATTRIB_STACK_DEPTH 0x0BB0
-#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
-#define GL_COLOR_CLEAR_VALUE 0x0C22
-#define GL_COLOR_WRITEMASK 0x0C23
-#define GL_CURRENT_INDEX 0x0B01
-#define GL_CURRENT_COLOR 0x0B00
-#define GL_CURRENT_NORMAL 0x0B02
-#define GL_CURRENT_RASTER_COLOR 0x0B04
-#define GL_CURRENT_RASTER_DISTANCE 0x0B09
-#define GL_CURRENT_RASTER_INDEX 0x0B05
-#define GL_CURRENT_RASTER_POSITION 0x0B07
-#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
-#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
-#define GL_CURRENT_TEXTURE_COORDS 0x0B03
-#define GL_INDEX_CLEAR_VALUE 0x0C20
-#define GL_INDEX_MODE 0x0C30
-#define GL_INDEX_WRITEMASK 0x0C21
-#define GL_MODELVIEW_MATRIX 0x0BA6
-#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
-#define GL_NAME_STACK_DEPTH 0x0D70
-#define GL_PROJECTION_MATRIX 0x0BA7
-#define GL_PROJECTION_STACK_DEPTH 0x0BA4
-#define GL_RENDER_MODE 0x0C40
-#define GL_RGBA_MODE 0x0C31
-#define GL_TEXTURE_MATRIX 0x0BA8
-#define GL_TEXTURE_STACK_DEPTH 0x0BA5
-#define GL_VIEWPORT 0x0BA2
+#define GL_ATTRIB_STACK_DEPTH 0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
+#define GL_COLOR_CLEAR_VALUE 0x0C22
+#define GL_COLOR_WRITEMASK 0x0C23
+#define GL_CURRENT_INDEX 0x0B01
+#define GL_CURRENT_COLOR 0x0B00
+#define GL_CURRENT_NORMAL 0x0B02
+#define GL_CURRENT_RASTER_COLOR 0x0B04
+#define GL_CURRENT_RASTER_DISTANCE 0x0B09
+#define GL_CURRENT_RASTER_INDEX 0x0B05
+#define GL_CURRENT_RASTER_POSITION 0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
+#define GL_CURRENT_TEXTURE_COORDS 0x0B03
+#define GL_INDEX_CLEAR_VALUE 0x0C20
+#define GL_INDEX_MODE 0x0C30
+#define GL_INDEX_WRITEMASK 0x0C21
+#define GL_MODELVIEW_MATRIX 0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
+#define GL_NAME_STACK_DEPTH 0x0D70
+#define GL_PROJECTION_MATRIX 0x0BA7
+#define GL_PROJECTION_STACK_DEPTH 0x0BA4
+#define GL_RENDER_MODE 0x0C40
+#define GL_RGBA_MODE 0x0C31
+#define GL_TEXTURE_MATRIX 0x0BA8
+#define GL_TEXTURE_STACK_DEPTH 0x0BA5
+#define GL_VIEWPORT 0x0BA2
/* Evaluators */
-#define GL_AUTO_NORMAL 0x0D80
-#define GL_MAP1_COLOR_4 0x0D90
-#define GL_MAP1_INDEX 0x0D91
-#define GL_MAP1_NORMAL 0x0D92
-#define GL_MAP1_TEXTURE_COORD_1 0x0D93
-#define GL_MAP1_TEXTURE_COORD_2 0x0D94
-#define GL_MAP1_TEXTURE_COORD_3 0x0D95
-#define GL_MAP1_TEXTURE_COORD_4 0x0D96
-#define GL_MAP1_VERTEX_3 0x0D97
-#define GL_MAP1_VERTEX_4 0x0D98
-#define GL_MAP2_COLOR_4 0x0DB0
-#define GL_MAP2_INDEX 0x0DB1
-#define GL_MAP2_NORMAL 0x0DB2
-#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
-#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
-#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
-#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
-#define GL_MAP2_VERTEX_3 0x0DB7
-#define GL_MAP2_VERTEX_4 0x0DB8
-#define GL_MAP1_GRID_DOMAIN 0x0DD0
-#define GL_MAP1_GRID_SEGMENTS 0x0DD1
-#define GL_MAP2_GRID_DOMAIN 0x0DD2
-#define GL_MAP2_GRID_SEGMENTS 0x0DD3
-#define GL_COEFF 0x0A00
-#define GL_ORDER 0x0A01
-#define GL_DOMAIN 0x0A02
+#define GL_AUTO_NORMAL 0x0D80
+#define GL_MAP1_COLOR_4 0x0D90
+#define GL_MAP1_INDEX 0x0D91
+#define GL_MAP1_NORMAL 0x0D92
+#define GL_MAP1_TEXTURE_COORD_1 0x0D93
+#define GL_MAP1_TEXTURE_COORD_2 0x0D94
+#define GL_MAP1_TEXTURE_COORD_3 0x0D95
+#define GL_MAP1_TEXTURE_COORD_4 0x0D96
+#define GL_MAP1_VERTEX_3 0x0D97
+#define GL_MAP1_VERTEX_4 0x0D98
+#define GL_MAP2_COLOR_4 0x0DB0
+#define GL_MAP2_INDEX 0x0DB1
+#define GL_MAP2_NORMAL 0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
+#define GL_MAP2_VERTEX_3 0x0DB7
+#define GL_MAP2_VERTEX_4 0x0DB8
+#define GL_MAP1_GRID_DOMAIN 0x0DD0
+#define GL_MAP1_GRID_SEGMENTS 0x0DD1
+#define GL_MAP2_GRID_DOMAIN 0x0DD2
+#define GL_MAP2_GRID_SEGMENTS 0x0DD3
+#define GL_COEFF 0x0A00
+#define GL_ORDER 0x0A01
+#define GL_DOMAIN 0x0A02
/* Hints */
-#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
-#define GL_POINT_SMOOTH_HINT 0x0C51
-#define GL_LINE_SMOOTH_HINT 0x0C52
-#define GL_POLYGON_SMOOTH_HINT 0x0C53
-#define GL_FOG_HINT 0x0C54
-#define GL_DONT_CARE 0x1100
-#define GL_FASTEST 0x1101
-#define GL_NICEST 0x1102
+#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
+#define GL_POINT_SMOOTH_HINT 0x0C51
+#define GL_LINE_SMOOTH_HINT 0x0C52
+#define GL_POLYGON_SMOOTH_HINT 0x0C53
+#define GL_FOG_HINT 0x0C54
+#define GL_DONT_CARE 0x1100
+#define GL_FASTEST 0x1101
+#define GL_NICEST 0x1102
/* Scissor box */
-#define GL_SCISSOR_BOX 0x0C10
-#define GL_SCISSOR_TEST 0x0C11
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
/* Pixel Mode / Transfer */
-#define GL_MAP_COLOR 0x0D10
-#define GL_MAP_STENCIL 0x0D11
-#define GL_INDEX_SHIFT 0x0D12
-#define GL_INDEX_OFFSET 0x0D13
-#define GL_RED_SCALE 0x0D14
-#define GL_RED_BIAS 0x0D15
-#define GL_GREEN_SCALE 0x0D18
-#define GL_GREEN_BIAS 0x0D19
-#define GL_BLUE_SCALE 0x0D1A
-#define GL_BLUE_BIAS 0x0D1B
-#define GL_ALPHA_SCALE 0x0D1C
-#define GL_ALPHA_BIAS 0x0D1D
-#define GL_DEPTH_SCALE 0x0D1E
-#define GL_DEPTH_BIAS 0x0D1F
-#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
-#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
-#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
-#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
-#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
-#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
-#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
-#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
-#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
-#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
-#define GL_PIXEL_MAP_S_TO_S 0x0C71
-#define GL_PIXEL_MAP_I_TO_I 0x0C70
-#define GL_PIXEL_MAP_I_TO_R 0x0C72
-#define GL_PIXEL_MAP_I_TO_G 0x0C73
-#define GL_PIXEL_MAP_I_TO_B 0x0C74
-#define GL_PIXEL_MAP_I_TO_A 0x0C75
-#define GL_PIXEL_MAP_R_TO_R 0x0C76
-#define GL_PIXEL_MAP_G_TO_G 0x0C77
-#define GL_PIXEL_MAP_B_TO_B 0x0C78
-#define GL_PIXEL_MAP_A_TO_A 0x0C79
-#define GL_PACK_ALIGNMENT 0x0D05
-#define GL_PACK_LSB_FIRST 0x0D01
-#define GL_PACK_ROW_LENGTH 0x0D02
-#define GL_PACK_SKIP_PIXELS 0x0D04
-#define GL_PACK_SKIP_ROWS 0x0D03
-#define GL_PACK_SWAP_BYTES 0x0D00
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#define GL_UNPACK_LSB_FIRST 0x0CF1
-#define GL_UNPACK_ROW_LENGTH 0x0CF2
-#define GL_UNPACK_SKIP_PIXELS 0x0CF4
-#define GL_UNPACK_SKIP_ROWS 0x0CF3
-#define GL_UNPACK_SWAP_BYTES 0x0CF0
-#define GL_ZOOM_X 0x0D16
-#define GL_ZOOM_Y 0x0D17
+#define GL_MAP_COLOR 0x0D10
+#define GL_MAP_STENCIL 0x0D11
+#define GL_INDEX_SHIFT 0x0D12
+#define GL_INDEX_OFFSET 0x0D13
+#define GL_RED_SCALE 0x0D14
+#define GL_RED_BIAS 0x0D15
+#define GL_GREEN_SCALE 0x0D18
+#define GL_GREEN_BIAS 0x0D19
+#define GL_BLUE_SCALE 0x0D1A
+#define GL_BLUE_BIAS 0x0D1B
+#define GL_ALPHA_SCALE 0x0D1C
+#define GL_ALPHA_BIAS 0x0D1D
+#define GL_DEPTH_SCALE 0x0D1E
+#define GL_DEPTH_BIAS 0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
+#define GL_PIXEL_MAP_S_TO_S 0x0C71
+#define GL_PIXEL_MAP_I_TO_I 0x0C70
+#define GL_PIXEL_MAP_I_TO_R 0x0C72
+#define GL_PIXEL_MAP_I_TO_G 0x0C73
+#define GL_PIXEL_MAP_I_TO_B 0x0C74
+#define GL_PIXEL_MAP_I_TO_A 0x0C75
+#define GL_PIXEL_MAP_R_TO_R 0x0C76
+#define GL_PIXEL_MAP_G_TO_G 0x0C77
+#define GL_PIXEL_MAP_B_TO_B 0x0C78
+#define GL_PIXEL_MAP_A_TO_A 0x0C79
+#define GL_PACK_ALIGNMENT 0x0D05
+#define GL_PACK_LSB_FIRST 0x0D01
+#define GL_PACK_ROW_LENGTH 0x0D02
+#define GL_PACK_SKIP_PIXELS 0x0D04
+#define GL_PACK_SKIP_ROWS 0x0D03
+#define GL_PACK_SWAP_BYTES 0x0D00
+#define GL_UNPACK_ALIGNMENT 0x0CF5
+#define GL_UNPACK_LSB_FIRST 0x0CF1
+#define GL_UNPACK_ROW_LENGTH 0x0CF2
+#define GL_UNPACK_SKIP_PIXELS 0x0CF4
+#define GL_UNPACK_SKIP_ROWS 0x0CF3
+#define GL_UNPACK_SWAP_BYTES 0x0CF0
+#define GL_ZOOM_X 0x0D16
+#define GL_ZOOM_Y 0x0D17
/* Texture mapping */
-#define GL_TEXTURE_ENV 0x2300
-#define GL_TEXTURE_ENV_MODE 0x2200
-#define GL_TEXTURE_1D 0x0DE0
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_TEXTURE_WRAP_S 0x2802
-#define GL_TEXTURE_WRAP_T 0x2803
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#define GL_TEXTURE_ENV_COLOR 0x2201
-#define GL_TEXTURE_GEN_S 0x0C60
-#define GL_TEXTURE_GEN_T 0x0C61
-#define GL_TEXTURE_GEN_MODE 0x2500
-#define GL_TEXTURE_BORDER_COLOR 0x1004
-#define GL_TEXTURE_WIDTH 0x1000
-#define GL_TEXTURE_HEIGHT 0x1001
-#define GL_TEXTURE_BORDER 0x1005
-#define GL_TEXTURE_COMPONENTS 0x1003
-#define GL_TEXTURE_RED_SIZE 0x805C
-#define GL_TEXTURE_GREEN_SIZE 0x805D
-#define GL_TEXTURE_BLUE_SIZE 0x805E
-#define GL_TEXTURE_ALPHA_SIZE 0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
-#define GL_TEXTURE_INTENSITY_SIZE 0x8061
-#define GL_NEAREST_MIPMAP_NEAREST 0x2700
-#define GL_NEAREST_MIPMAP_LINEAR 0x2702
-#define GL_LINEAR_MIPMAP_NEAREST 0x2701
-#define GL_LINEAR_MIPMAP_LINEAR 0x2703
-#define GL_OBJECT_LINEAR 0x2401
-#define GL_OBJECT_PLANE 0x2501
-#define GL_EYE_LINEAR 0x2400
-#define GL_EYE_PLANE 0x2502
-#define GL_SPHERE_MAP 0x2402
-#define GL_DECAL 0x2101
-#define GL_MODULATE 0x2100
-#define GL_NEAREST 0x2600
-#define GL_REPEAT 0x2901
-#define GL_CLAMP 0x2900
-#define GL_S 0x2000
-#define GL_T 0x2001
-#define GL_R 0x2002
-#define GL_Q 0x2003
-#define GL_TEXTURE_GEN_R 0x0C62
-#define GL_TEXTURE_GEN_Q 0x0C63
+#define GL_TEXTURE_ENV 0x2300
+#define GL_TEXTURE_ENV_MODE 0x2200
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_TEXTURE_WRAP_S 0x2802
+#define GL_TEXTURE_WRAP_T 0x2803
+#define GL_TEXTURE_MAG_FILTER 0x2800
+#define GL_TEXTURE_MIN_FILTER 0x2801
+#define GL_TEXTURE_ENV_COLOR 0x2201
+#define GL_TEXTURE_GEN_S 0x0C60
+#define GL_TEXTURE_GEN_T 0x0C61
+#define GL_TEXTURE_GEN_MODE 0x2500
+#define GL_TEXTURE_BORDER_COLOR 0x1004
+#define GL_TEXTURE_WIDTH 0x1000
+#define GL_TEXTURE_HEIGHT 0x1001
+#define GL_TEXTURE_BORDER 0x1005
+#define GL_TEXTURE_COMPONENTS 0x1003
+#define GL_TEXTURE_RED_SIZE 0x805C
+#define GL_TEXTURE_GREEN_SIZE 0x805D
+#define GL_TEXTURE_BLUE_SIZE 0x805E
+#define GL_TEXTURE_ALPHA_SIZE 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE 0x8061
+#define GL_NEAREST_MIPMAP_NEAREST 0x2700
+#define GL_NEAREST_MIPMAP_LINEAR 0x2702
+#define GL_LINEAR_MIPMAP_NEAREST 0x2701
+#define GL_LINEAR_MIPMAP_LINEAR 0x2703
+#define GL_OBJECT_LINEAR 0x2401
+#define GL_OBJECT_PLANE 0x2501
+#define GL_EYE_LINEAR 0x2400
+#define GL_EYE_PLANE 0x2502
+#define GL_SPHERE_MAP 0x2402
+#define GL_DECAL 0x2101
+#define GL_MODULATE 0x2100
+#define GL_NEAREST 0x2600
+#define GL_REPEAT 0x2901
+#define GL_CLAMP 0x2900
+#define GL_S 0x2000
+#define GL_T 0x2001
+#define GL_R 0x2002
+#define GL_Q 0x2003
+#define GL_TEXTURE_GEN_R 0x0C62
+#define GL_TEXTURE_GEN_Q 0x0C63
/* Utility */
-#define GL_VENDOR 0x1F00
-#define GL_RENDERER 0x1F01
-#define GL_VERSION 0x1F02
-#define GL_EXTENSIONS 0x1F03
+#define GL_VENDOR 0x1F00
+#define GL_RENDERER 0x1F01
+#define GL_VERSION 0x1F02
+#define GL_EXTENSIONS 0x1F03
/* Errors */
-#define GL_NO_ERROR 0x0
-#define GL_INVALID_ENUM 0x0500
-#define GL_INVALID_VALUE 0x0501
-#define GL_INVALID_OPERATION 0x0502
-#define GL_STACK_OVERFLOW 0x0503
-#define GL_STACK_UNDERFLOW 0x0504
-#define GL_OUT_OF_MEMORY 0x0505
+#define GL_NO_ERROR 0x0
+#define GL_INVALID_ENUM 0x0500
+#define GL_INVALID_VALUE 0x0501
+#define GL_INVALID_OPERATION 0x0502
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_OUT_OF_MEMORY 0x0505
/* glPush/PopAttrib bits */
-#define GL_CURRENT_BIT 0x00000001
-#define GL_POINT_BIT 0x00000002
-#define GL_LINE_BIT 0x00000004
-#define GL_POLYGON_BIT 0x00000008
-#define GL_POLYGON_STIPPLE_BIT 0x00000010
-#define GL_PIXEL_MODE_BIT 0x00000020
-#define GL_LIGHTING_BIT 0x00000040
-#define GL_FOG_BIT 0x00000080
-#define GL_DEPTH_BUFFER_BIT 0x00000100
-#define GL_ACCUM_BUFFER_BIT 0x00000200
-#define GL_STENCIL_BUFFER_BIT 0x00000400
-#define GL_VIEWPORT_BIT 0x00000800
-#define GL_TRANSFORM_BIT 0x00001000
-#define GL_ENABLE_BIT 0x00002000
-#define GL_COLOR_BUFFER_BIT 0x00004000
-#define GL_HINT_BIT 0x00008000
-#define GL_EVAL_BIT 0x00010000
-#define GL_LIST_BIT 0x00020000
-#define GL_TEXTURE_BIT 0x00040000
-#define GL_SCISSOR_BIT 0x00080000
-#define GL_ALL_ATTRIB_BITS 0x000FFFFF
+#define GL_CURRENT_BIT 0x00000001
+#define GL_POINT_BIT 0x00000002
+#define GL_LINE_BIT 0x00000004
+#define GL_POLYGON_BIT 0x00000008
+#define GL_POLYGON_STIPPLE_BIT 0x00000010
+#define GL_PIXEL_MODE_BIT 0x00000020
+#define GL_LIGHTING_BIT 0x00000040
+#define GL_FOG_BIT 0x00000080
+#define GL_DEPTH_BUFFER_BIT 0x00000100
+#define GL_ACCUM_BUFFER_BIT 0x00000200
+#define GL_STENCIL_BUFFER_BIT 0x00000400
+#define GL_VIEWPORT_BIT 0x00000800
+#define GL_TRANSFORM_BIT 0x00001000
+#define GL_ENABLE_BIT 0x00002000
+#define GL_COLOR_BUFFER_BIT 0x00004000
+#define GL_HINT_BIT 0x00008000
+#define GL_EVAL_BIT 0x00010000
+#define GL_LIST_BIT 0x00020000
+#define GL_TEXTURE_BIT 0x00040000
+#define GL_SCISSOR_BIT 0x00080000
+#define GL_ALL_ATTRIB_BITS 0x000FFFFF
/* OpenGL 1.1 */
-#define GL_PROXY_TEXTURE_1D 0x8063
-#define GL_PROXY_TEXTURE_2D 0x8064
-#define GL_TEXTURE_PRIORITY 0x8066
-#define GL_TEXTURE_RESIDENT 0x8067
-#define GL_TEXTURE_BINDING_1D 0x8068
-#define GL_TEXTURE_BINDING_2D 0x8069
-#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
-#define GL_ALPHA4 0x803B
-#define GL_ALPHA8 0x803C
-#define GL_ALPHA12 0x803D
-#define GL_ALPHA16 0x803E
-#define GL_LUMINANCE4 0x803F
-#define GL_LUMINANCE8 0x8040
-#define GL_LUMINANCE12 0x8041
-#define GL_LUMINANCE16 0x8042
-#define GL_LUMINANCE4_ALPHA4 0x8043
-#define GL_LUMINANCE6_ALPHA2 0x8044
-#define GL_LUMINANCE8_ALPHA8 0x8045
-#define GL_LUMINANCE12_ALPHA4 0x8046
-#define GL_LUMINANCE12_ALPHA12 0x8047
-#define GL_LUMINANCE16_ALPHA16 0x8048
-#define GL_INTENSITY 0x8049
-#define GL_INTENSITY4 0x804A
-#define GL_INTENSITY8 0x804B
-#define GL_INTENSITY12 0x804C
-#define GL_INTENSITY16 0x804D
-#define GL_R3_G3_B2 0x2A10
-#define GL_RGB4 0x804F
-#define GL_RGB5 0x8050
-#define GL_RGB8 0x8051
-#define GL_RGB10 0x8052
-#define GL_RGB12 0x8053
-#define GL_RGB16 0x8054
-#define GL_RGBA2 0x8055
-#define GL_RGBA4 0x8056
-#define GL_RGB5_A1 0x8057
-#define GL_RGBA8 0x8058
-#define GL_RGB10_A2 0x8059
-#define GL_RGBA12 0x805A
-#define GL_RGBA16 0x805B
-#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
-#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
-#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF
-#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_TEXTURE_PRIORITY 0x8066
+#define GL_TEXTURE_RESIDENT 0x8067
+#define GL_TEXTURE_BINDING_1D 0x8068
+#define GL_TEXTURE_BINDING_2D 0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
+#define GL_ALPHA4 0x803B
+#define GL_ALPHA8 0x803C
+#define GL_ALPHA12 0x803D
+#define GL_ALPHA16 0x803E
+#define GL_LUMINANCE4 0x803F
+#define GL_LUMINANCE8 0x8040
+#define GL_LUMINANCE12 0x8041
+#define GL_LUMINANCE16 0x8042
+#define GL_LUMINANCE4_ALPHA4 0x8043
+#define GL_LUMINANCE6_ALPHA2 0x8044
+#define GL_LUMINANCE8_ALPHA8 0x8045
+#define GL_LUMINANCE12_ALPHA4 0x8046
+#define GL_LUMINANCE12_ALPHA12 0x8047
+#define GL_LUMINANCE16_ALPHA16 0x8048
+#define GL_INTENSITY 0x8049
+#define GL_INTENSITY4 0x804A
+#define GL_INTENSITY8 0x804B
+#define GL_INTENSITY12 0x804C
+#define GL_INTENSITY16 0x804D
+#define GL_R3_G3_B2 0x2A10
+#define GL_RGB4 0x804F
+#define GL_RGB5 0x8050
+#define GL_RGB8 0x8051
+#define GL_RGB10 0x8052
+#define GL_RGB12 0x8053
+#define GL_RGB16 0x8054
+#define GL_RGBA2 0x8055
+#define GL_RGBA4 0x8056
+#define GL_RGB5_A1 0x8057
+#define GL_RGBA8 0x8058
+#define GL_RGB10_A2 0x8059
+#define GL_RGBA12 0x805A
+#define GL_RGBA16 0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF
@@ -1474,47 +1474,47 @@ GLAPI void GLAPIENTRY glPopName( void );
* OpenGL 1.2
*/
-#define GL_RESCALE_NORMAL 0x803A
-#define GL_CLAMP_TO_EDGE 0x812F
-#define GL_MAX_ELEMENTS_VERTICES 0x80E8
-#define GL_MAX_ELEMENTS_INDICES 0x80E9
-#define GL_BGR 0x80E0
-#define GL_BGRA 0x80E1
-#define GL_UNSIGNED_BYTE_3_3_2 0x8032
-#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
-#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
-#define GL_UNSIGNED_INT_8_8_8_8 0x8035
-#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
-#define GL_UNSIGNED_INT_10_10_10_2 0x8036
-#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
-#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
-#define GL_SINGLE_COLOR 0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
-#define GL_TEXTURE_MIN_LOD 0x813A
-#define GL_TEXTURE_MAX_LOD 0x813B
-#define GL_TEXTURE_BASE_LEVEL 0x813C
-#define GL_TEXTURE_MAX_LEVEL 0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
-#define GL_PACK_SKIP_IMAGES 0x806B
-#define GL_PACK_IMAGE_HEIGHT 0x806C
-#define GL_UNPACK_SKIP_IMAGES 0x806D
-#define GL_UNPACK_IMAGE_HEIGHT 0x806E
-#define GL_TEXTURE_3D 0x806F
-#define GL_PROXY_TEXTURE_3D 0x8070
-#define GL_TEXTURE_DEPTH 0x8071
-#define GL_TEXTURE_WRAP_R 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE 0x8073
-#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_TEXTURE_BINDING_3D 0x806A
GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
@@ -1549,81 +1549,81 @@ typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level,
* GL_ARB_imaging
*/
-#define GL_CONSTANT_COLOR 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#define GL_CONSTANT_ALPHA 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#define GL_COLOR_TABLE 0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
-#define GL_PROXY_COLOR_TABLE 0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE 0x80D6
-#define GL_COLOR_TABLE_BIAS 0x80D7
-#define GL_COLOR_TABLE_FORMAT 0x80D8
-#define GL_COLOR_TABLE_WIDTH 0x80D9
-#define GL_COLOR_TABLE_RED_SIZE 0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
-#define GL_CONVOLUTION_1D 0x8010
-#define GL_CONVOLUTION_2D 0x8011
-#define GL_SEPARABLE_2D 0x8012
-#define GL_CONVOLUTION_BORDER_MODE 0x8013
-#define GL_CONVOLUTION_FILTER_SCALE 0x8014
-#define GL_CONVOLUTION_FILTER_BIAS 0x8015
-#define GL_REDUCE 0x8016
-#define GL_CONVOLUTION_FORMAT 0x8017
-#define GL_CONVOLUTION_WIDTH 0x8018
-#define GL_CONVOLUTION_HEIGHT 0x8019
-#define GL_MAX_CONVOLUTION_WIDTH 0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
-#define GL_CONSTANT_BORDER 0x8151
-#define GL_REPLICATE_BORDER 0x8153
-#define GL_CONVOLUTION_BORDER_COLOR 0x8154
-#define GL_COLOR_MATRIX 0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
-#define GL_HISTOGRAM 0x8024
-#define GL_PROXY_HISTOGRAM 0x8025
-#define GL_HISTOGRAM_WIDTH 0x8026
-#define GL_HISTOGRAM_FORMAT 0x8027
-#define GL_HISTOGRAM_RED_SIZE 0x8028
-#define GL_HISTOGRAM_GREEN_SIZE 0x8029
-#define GL_HISTOGRAM_BLUE_SIZE 0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
-#define GL_HISTOGRAM_SINK 0x802D
-#define GL_MINMAX 0x802E
-#define GL_MINMAX_FORMAT 0x802F
-#define GL_MINMAX_SINK 0x8030
-#define GL_TABLE_TOO_LARGE 0x8031
-#define GL_BLEND_EQUATION 0x8009
-#define GL_MIN 0x8007
-#define GL_MAX 0x8008
-#define GL_FUNC_ADD 0x8006
-#define GL_FUNC_SUBTRACT 0x800A
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#define GL_BLEND_COLOR 0x8005
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_BLEND_EQUATION 0x8009
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_FUNC_ADD 0x8006
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_BLEND_COLOR 0x8005
GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
@@ -1776,109 +1776,109 @@ typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
*/
/* multitexture */
-#define GL_TEXTURE0 0x84C0
-#define GL_TEXTURE1 0x84C1
-#define GL_TEXTURE2 0x84C2
-#define GL_TEXTURE3 0x84C3
-#define GL_TEXTURE4 0x84C4
-#define GL_TEXTURE5 0x84C5
-#define GL_TEXTURE6 0x84C6
-#define GL_TEXTURE7 0x84C7
-#define GL_TEXTURE8 0x84C8
-#define GL_TEXTURE9 0x84C9
-#define GL_TEXTURE10 0x84CA
-#define GL_TEXTURE11 0x84CB
-#define GL_TEXTURE12 0x84CC
-#define GL_TEXTURE13 0x84CD
-#define GL_TEXTURE14 0x84CE
-#define GL_TEXTURE15 0x84CF
-#define GL_TEXTURE16 0x84D0
-#define GL_TEXTURE17 0x84D1
-#define GL_TEXTURE18 0x84D2
-#define GL_TEXTURE19 0x84D3
-#define GL_TEXTURE20 0x84D4
-#define GL_TEXTURE21 0x84D5
-#define GL_TEXTURE22 0x84D6
-#define GL_TEXTURE23 0x84D7
-#define GL_TEXTURE24 0x84D8
-#define GL_TEXTURE25 0x84D9
-#define GL_TEXTURE26 0x84DA
-#define GL_TEXTURE27 0x84DB
-#define GL_TEXTURE28 0x84DC
-#define GL_TEXTURE29 0x84DD
-#define GL_TEXTURE30 0x84DE
-#define GL_TEXTURE31 0x84DF
-#define GL_ACTIVE_TEXTURE 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
-#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
/* texture_cube_map */
-#define GL_NORMAL_MAP 0x8511
-#define GL_REFLECTION_MAP 0x8512
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
/* texture_compression */
-#define GL_COMPRESSED_ALPHA 0x84E9
-#define GL_COMPRESSED_LUMINANCE 0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
-#define GL_COMPRESSED_INTENSITY 0x84EC
-#define GL_COMPRESSED_RGB 0x84ED
-#define GL_COMPRESSED_RGBA 0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
-#define GL_TEXTURE_COMPRESSED 0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
/* multisample */
-#define GL_MULTISAMPLE 0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
-#define GL_SAMPLE_COVERAGE 0x80A0
-#define GL_SAMPLE_BUFFERS 0x80A8
-#define GL_SAMPLES 0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
-#define GL_MULTISAMPLE_BIT 0x20000000
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_MULTISAMPLE_BIT 0x20000000
/* transpose_matrix */
-#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
/* texture_env_combine */
-#define GL_COMBINE 0x8570
-#define GL_COMBINE_RGB 0x8571
-#define GL_COMBINE_ALPHA 0x8572
-#define GL_SOURCE0_RGB 0x8580
-#define GL_SOURCE1_RGB 0x8581
-#define GL_SOURCE2_RGB 0x8582
-#define GL_SOURCE0_ALPHA 0x8588
-#define GL_SOURCE1_ALPHA 0x8589
-#define GL_SOURCE2_ALPHA 0x858A
-#define GL_OPERAND0_RGB 0x8590
-#define GL_OPERAND1_RGB 0x8591
-#define GL_OPERAND2_RGB 0x8592
-#define GL_OPERAND0_ALPHA 0x8598
-#define GL_OPERAND1_ALPHA 0x8599
-#define GL_OPERAND2_ALPHA 0x859A
-#define GL_RGB_SCALE 0x8573
-#define GL_ADD_SIGNED 0x8574
-#define GL_INTERPOLATE 0x8575
-#define GL_SUBTRACT 0x84E7
-#define GL_CONSTANT 0x8576
-#define GL_PRIMARY_COLOR 0x8577
-#define GL_PREVIOUS 0x8578
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_SUBTRACT 0x84E7
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
/* texture_env_dot3 */
-#define GL_DOT3_RGB 0x86AE
-#define GL_DOT3_RGBA 0x86AF
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
/* texture_border_clamp */
-#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_CLAMP_TO_BORDER 0x812D
GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
@@ -2027,41 +2027,41 @@ typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint le
#ifndef GL_ARB_multitexture
#define GL_ARB_multitexture 1
-#define GL_TEXTURE0_ARB 0x84C0
-#define GL_TEXTURE1_ARB 0x84C1
-#define GL_TEXTURE2_ARB 0x84C2
-#define GL_TEXTURE3_ARB 0x84C3
-#define GL_TEXTURE4_ARB 0x84C4
-#define GL_TEXTURE5_ARB 0x84C5
-#define GL_TEXTURE6_ARB 0x84C6
-#define GL_TEXTURE7_ARB 0x84C7
-#define GL_TEXTURE8_ARB 0x84C8
-#define GL_TEXTURE9_ARB 0x84C9
-#define GL_TEXTURE10_ARB 0x84CA
-#define GL_TEXTURE11_ARB 0x84CB
-#define GL_TEXTURE12_ARB 0x84CC
-#define GL_TEXTURE13_ARB 0x84CD
-#define GL_TEXTURE14_ARB 0x84CE
-#define GL_TEXTURE15_ARB 0x84CF
-#define GL_TEXTURE16_ARB 0x84D0
-#define GL_TEXTURE17_ARB 0x84D1
-#define GL_TEXTURE18_ARB 0x84D2
-#define GL_TEXTURE19_ARB 0x84D3
-#define GL_TEXTURE20_ARB 0x84D4
-#define GL_TEXTURE21_ARB 0x84D5
-#define GL_TEXTURE22_ARB 0x84D6
-#define GL_TEXTURE23_ARB 0x84D7
-#define GL_TEXTURE24_ARB 0x84D8
-#define GL_TEXTURE25_ARB 0x84D9
-#define GL_TEXTURE26_ARB 0x84DA
-#define GL_TEXTURE27_ARB 0x84DB
-#define GL_TEXTURE28_ARB 0x84DC
-#define GL_TEXTURE29_ARB 0x84DD
-#define GL_TEXTURE30_ARB 0x84DE
-#define GL_TEXTURE31_ARB 0x84DF
-#define GL_ACTIVE_TEXTURE_ARB 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
@@ -2180,11 +2180,11 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp
#ifndef GL_MESA_packed_depth_stencil
#define GL_MESA_packed_depth_stencil 1
-#define GL_DEPTH_STENCIL_MESA 0x8750
-#define GL_UNSIGNED_INT_24_8_MESA 0x8751
-#define GL_UNSIGNED_INT_8_24_REV_MESA 0x8752
-#define GL_UNSIGNED_SHORT_15_1_MESA 0x8753
-#define GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754
+#define GL_DEPTH_STENCIL_MESA 0x8750
+#define GL_UNSIGNED_INT_24_8_MESA 0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA 0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA 0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754
#endif /* GL_MESA_packed_depth_stencil */
@@ -2213,7 +2213,7 @@ GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, con
#ifndef GL_ATI_blend_equation_separate
#define GL_ATI_blend_equation_separate 1
-#define GL_ALPHA_BLEND_EQUATION_ATI 0x883D
+#define GL_ALPHA_BLEND_EQUATION_ATI 0x883D
GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA );
typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA);
diff --git a/Mesa/inc/gl_mangle.h b/Mesa/inc/gl_mangle.h
index 369b8a0fc6d5..863a2c91f71a 100644
--- a/Mesa/inc/gl_mangle.h
+++ b/Mesa/inc/gl_mangle.h
@@ -3,10 +3,10 @@
#define GL_MANGLE_C2 "This file is used to create GL function protypes and aliases for the function names"
files="gl.h glext.h"
#define GL_MANGLE_C3 "get regeneration header - copy everything in this file above the 'REGENERATE_TO_END' line"
- awk '!done; /^\/\*REGENERATE_TO_END/ {done=1}' $0
+ awk '!done; /^\/\*REGENERATE_TO_END/ {done=1}' $0
echo ""
#define GL_MANGLE_C4 get aliases
- grep '^GLAPI' $files | sed -e 's/.*ENTRY gl\([^( ]*\).*$/#define gl\1 MANGLE(\1)/' | sort | uniq
+ grep '^GLAPI' $files | sed -e 's/.*ENTRY gl\([^( ]*\).*$/#define gl\1 MANGLE(\1)/' | sort | uniq
echo ""
echo "#endif /* GL_MANGLE_H */"
exit
@@ -29,1540 +29,1540 @@
/*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
-#define glAccum MANGLE(Accum)
-#define glActiveStencilFaceEXT MANGLE(ActiveStencilFaceEXT)
-#define glActiveTextureARB MANGLE(ActiveTextureARB)
-#define glActiveTexture MANGLE(ActiveTexture)
-#define glActiveVaryingNV MANGLE(ActiveVaryingNV)
-#define glAlphaFragmentOp1ATI MANGLE(AlphaFragmentOp1ATI)
-#define glAlphaFragmentOp2ATI MANGLE(AlphaFragmentOp2ATI)
-#define glAlphaFragmentOp3ATI MANGLE(AlphaFragmentOp3ATI)
-#define glAlphaFunc MANGLE(AlphaFunc)
-#define glApplyTextureEXT MANGLE(ApplyTextureEXT)
-#define glAreProgramsResidentNV MANGLE(AreProgramsResidentNV)
-#define glAreTexturesResidentEXT MANGLE(AreTexturesResidentEXT)
-#define glAreTexturesResident MANGLE(AreTexturesResident)
-#define glArrayElementEXT MANGLE(ArrayElementEXT)
-#define glArrayElement MANGLE(ArrayElement)
-#define glArrayObjectATI MANGLE(ArrayObjectATI)
-#define glAsyncMarkerSGIX MANGLE(AsyncMarkerSGIX)
-#define glAttachObjectARB MANGLE(AttachObjectARB)
-#define glAttachShader MANGLE(AttachShader)
-#define glBeginFragmentShaderATI MANGLE(BeginFragmentShaderATI)
-#define glBegin MANGLE(Begin)
-#define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV)
-#define glBeginQueryARB MANGLE(BeginQueryARB)
-#define glBeginQuery MANGLE(BeginQuery)
-#define glBeginTransformFeedbackNV MANGLE(BeginTransformFeedbackNV)
-#define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT)
-#define glBindAttribLocationARB MANGLE(BindAttribLocationARB)
-#define glBindAttribLocation MANGLE(BindAttribLocation)
-#define glBindBufferARB MANGLE(BindBufferARB)
-#define glBindBufferBaseNV MANGLE(BindBufferBaseNV)
-#define glBindBuffer MANGLE(BindBuffer)
-#define glBindBufferOffsetNV MANGLE(BindBufferOffsetNV)
-#define glBindBufferRangeNV MANGLE(BindBufferRangeNV)
-#define glBindFragDataLocationEXT MANGLE(BindFragDataLocationEXT)
-#define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI)
-#define glBindFramebufferEXT MANGLE(BindFramebufferEXT)
-#define glBindLightParameterEXT MANGLE(BindLightParameterEXT)
-#define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT)
-#define glBindParameterEXT MANGLE(BindParameterEXT)
-#define glBindProgramARB MANGLE(BindProgramARB)
-#define glBindProgramNV MANGLE(BindProgramNV)
-#define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT)
-#define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT)
-#define glBindTextureEXT MANGLE(BindTextureEXT)
-#define glBindTexture MANGLE(BindTexture)
-#define glBindTextureUnitParameterEXT MANGLE(BindTextureUnitParameterEXT)
-#define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE)
-#define glBindVertexShaderEXT MANGLE(BindVertexShaderEXT)
-#define glBinormal3bEXT MANGLE(Binormal3bEXT)
-#define glBinormal3bvEXT MANGLE(Binormal3bvEXT)
-#define glBinormal3dEXT MANGLE(Binormal3dEXT)
-#define glBinormal3dvEXT MANGLE(Binormal3dvEXT)
-#define glBinormal3fEXT MANGLE(Binormal3fEXT)
-#define glBinormal3fvEXT MANGLE(Binormal3fvEXT)
-#define glBinormal3iEXT MANGLE(Binormal3iEXT)
-#define glBinormal3ivEXT MANGLE(Binormal3ivEXT)
-#define glBinormal3sEXT MANGLE(Binormal3sEXT)
-#define glBinormal3svEXT MANGLE(Binormal3svEXT)
-#define glBinormalPointerEXT MANGLE(BinormalPointerEXT)
-#define glBitmap MANGLE(Bitmap)
-#define glBlendColorEXT MANGLE(BlendColorEXT)
-#define glBlendColor MANGLE(BlendColor)
-#define glBlendEquationEXT MANGLE(BlendEquationEXT)
-#define glBlendEquation MANGLE(BlendEquation)
-#define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI)
-#define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT)
-#define glBlendEquationSeparate MANGLE(BlendEquationSeparate)
-#define glBlendFunc MANGLE(BlendFunc)
-#define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT)
-#define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR)
-#define glBlendFuncSeparate MANGLE(BlendFuncSeparate)
-#define glBlitFramebufferEXT MANGLE(BlitFramebufferEXT)
-#define glBufferDataARB MANGLE(BufferDataARB)
-#define glBufferData MANGLE(BufferData)
-#define glBufferParameteriAPPLE MANGLE(BufferParameteriAPPLE)
-#define glBufferSubDataARB MANGLE(BufferSubDataARB)
-#define glBufferSubData MANGLE(BufferSubData)
-#define glCallList MANGLE(CallList)
-#define glCallLists MANGLE(CallLists)
-#define glCheckFramebufferStatusEXT MANGLE(CheckFramebufferStatusEXT)
-#define glClampColorARB MANGLE(ClampColorARB)
-#define glClearAccum MANGLE(ClearAccum)
-#define glClearColorIiEXT MANGLE(ClearColorIiEXT)
-#define glClearColorIuiEXT MANGLE(ClearColorIuiEXT)
-#define glClearColor MANGLE(ClearColor)
-#define glClearDebugLogMESA MANGLE(ClearDebugLogMESA)
-#define glClearDepthdNV MANGLE(ClearDepthdNV)
-#define glClearDepth MANGLE(ClearDepth)
-#define glClearIndex MANGLE(ClearIndex)
-#define glClear MANGLE(Clear)
-#define glClearStencil MANGLE(ClearStencil)
-#define glClientActiveTextureARB MANGLE(ClientActiveTextureARB)
-#define glClientActiveTexture MANGLE(ClientActiveTexture)
-#define glClientActiveVertexStreamATI MANGLE(ClientActiveVertexStreamATI)
-#define glClipPlane MANGLE(ClipPlane)
-#define glColor3b MANGLE(Color3b)
-#define glColor3bv MANGLE(Color3bv)
-#define glColor3d MANGLE(Color3d)
-#define glColor3dv MANGLE(Color3dv)
-#define glColor3f MANGLE(Color3f)
-#define glColor3fVertex3fSUN MANGLE(Color3fVertex3fSUN)
-#define glColor3fVertex3fvSUN MANGLE(Color3fVertex3fvSUN)
-#define glColor3fv MANGLE(Color3fv)
-#define glColor3hNV MANGLE(Color3hNV)
-#define glColor3hvNV MANGLE(Color3hvNV)
-#define glColor3i MANGLE(Color3i)
-#define glColor3iv MANGLE(Color3iv)
-#define glColor3s MANGLE(Color3s)
-#define glColor3sv MANGLE(Color3sv)
-#define glColor3ub MANGLE(Color3ub)
-#define glColor3ubv MANGLE(Color3ubv)
-#define glColor3ui MANGLE(Color3ui)
-#define glColor3uiv MANGLE(Color3uiv)
-#define glColor3us MANGLE(Color3us)
-#define glColor3usv MANGLE(Color3usv)
-#define glColor4b MANGLE(Color4b)
-#define glColor4bv MANGLE(Color4bv)
-#define glColor4d MANGLE(Color4d)
-#define glColor4dv MANGLE(Color4dv)
-#define glColor4f MANGLE(Color4f)
-#define glColor4fNormal3fVertex3fSUN MANGLE(Color4fNormal3fVertex3fSUN)
-#define glColor4fNormal3fVertex3fvSUN MANGLE(Color4fNormal3fVertex3fvSUN)
-#define glColor4fv MANGLE(Color4fv)
-#define glColor4hNV MANGLE(Color4hNV)
-#define glColor4hvNV MANGLE(Color4hvNV)
-#define glColor4i MANGLE(Color4i)
-#define glColor4iv MANGLE(Color4iv)
-#define glColor4s MANGLE(Color4s)
-#define glColor4sv MANGLE(Color4sv)
-#define glColor4ub MANGLE(Color4ub)
-#define glColor4ubVertex2fSUN MANGLE(Color4ubVertex2fSUN)
-#define glColor4ubVertex2fvSUN MANGLE(Color4ubVertex2fvSUN)
-#define glColor4ubVertex3fSUN MANGLE(Color4ubVertex3fSUN)
-#define glColor4ubVertex3fvSUN MANGLE(Color4ubVertex3fvSUN)
-#define glColor4ubv MANGLE(Color4ubv)
-#define glColor4ui MANGLE(Color4ui)
-#define glColor4uiv MANGLE(Color4uiv)
-#define glColor4us MANGLE(Color4us)
-#define glColor4usv MANGLE(Color4usv)
-#define glColorFragmentOp1ATI MANGLE(ColorFragmentOp1ATI)
-#define glColorFragmentOp2ATI MANGLE(ColorFragmentOp2ATI)
-#define glColorFragmentOp3ATI MANGLE(ColorFragmentOp3ATI)
-#define glColorMaskIndexedEXT MANGLE(ColorMaskIndexedEXT)
-#define glColorMask MANGLE(ColorMask)
-#define glColorMaterial MANGLE(ColorMaterial)
-#define glColorPointerEXT MANGLE(ColorPointerEXT)
-#define glColorPointerListIBM MANGLE(ColorPointerListIBM)
-#define glColorPointer MANGLE(ColorPointer)
-#define glColorPointervINTEL MANGLE(ColorPointervINTEL)
-#define glColorSubTableEXT MANGLE(ColorSubTableEXT)
-#define glColorSubTable MANGLE(ColorSubTable)
-#define glColorTableEXT MANGLE(ColorTableEXT)
-#define glColorTable MANGLE(ColorTable)
-#define glColorTableParameterfv MANGLE(ColorTableParameterfv)
-#define glColorTableParameterfvSGI MANGLE(ColorTableParameterfvSGI)
-#define glColorTableParameteriv MANGLE(ColorTableParameteriv)
-#define glColorTableParameterivSGI MANGLE(ColorTableParameterivSGI)
-#define glColorTableSGI MANGLE(ColorTableSGI)
-#define glCombinerInputNV MANGLE(CombinerInputNV)
-#define glCombinerOutputNV MANGLE(CombinerOutputNV)
-#define glCombinerParameterfNV MANGLE(CombinerParameterfNV)
-#define glCombinerParameterfvNV MANGLE(CombinerParameterfvNV)
-#define glCombinerParameteriNV MANGLE(CombinerParameteriNV)
-#define glCombinerParameterivNV MANGLE(CombinerParameterivNV)
-#define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV)
-#define glCompileShaderARB MANGLE(CompileShaderARB)
-#define glCompileShader MANGLE(CompileShader)
-#define glCompressedTexImage1DARB MANGLE(CompressedTexImage1DARB)
-#define glCompressedTexImage1D MANGLE(CompressedTexImage1D)
-#define glCompressedTexImage2DARB MANGLE(CompressedTexImage2DARB)
-#define glCompressedTexImage2D MANGLE(CompressedTexImage2D)
-#define glCompressedTexImage3DARB MANGLE(CompressedTexImage3DARB)
-#define glCompressedTexImage3D MANGLE(CompressedTexImage3D)
-#define glCompressedTexSubImage1DARB MANGLE(CompressedTexSubImage1DARB)
-#define glCompressedTexSubImage1D MANGLE(CompressedTexSubImage1D)
-#define glCompressedTexSubImage2DARB MANGLE(CompressedTexSubImage2DARB)
-#define glCompressedTexSubImage2D MANGLE(CompressedTexSubImage2D)
-#define glCompressedTexSubImage3DARB MANGLE(CompressedTexSubImage3DARB)
-#define glCompressedTexSubImage3D MANGLE(CompressedTexSubImage3D)
-#define glConvolutionFilter1DEXT MANGLE(ConvolutionFilter1DEXT)
-#define glConvolutionFilter1D MANGLE(ConvolutionFilter1D)
-#define glConvolutionFilter2DEXT MANGLE(ConvolutionFilter2DEXT)
-#define glConvolutionFilter2D MANGLE(ConvolutionFilter2D)
-#define glConvolutionParameterfEXT MANGLE(ConvolutionParameterfEXT)
-#define glConvolutionParameterf MANGLE(ConvolutionParameterf)
-#define glConvolutionParameterfvEXT MANGLE(ConvolutionParameterfvEXT)
-#define glConvolutionParameterfv MANGLE(ConvolutionParameterfv)
-#define glConvolutionParameteriEXT MANGLE(ConvolutionParameteriEXT)
-#define glConvolutionParameteri MANGLE(ConvolutionParameteri)
-#define glConvolutionParameterivEXT MANGLE(ConvolutionParameterivEXT)
-#define glConvolutionParameteriv MANGLE(ConvolutionParameteriv)
-#define glCopyColorSubTableEXT MANGLE(CopyColorSubTableEXT)
-#define glCopyColorSubTable MANGLE(CopyColorSubTable)
-#define glCopyColorTable MANGLE(CopyColorTable)
-#define glCopyColorTableSGI MANGLE(CopyColorTableSGI)
-#define glCopyConvolutionFilter1DEXT MANGLE(CopyConvolutionFilter1DEXT)
-#define glCopyConvolutionFilter1D MANGLE(CopyConvolutionFilter1D)
-#define glCopyConvolutionFilter2DEXT MANGLE(CopyConvolutionFilter2DEXT)
-#define glCopyConvolutionFilter2D MANGLE(CopyConvolutionFilter2D)
-#define glCopyPixels MANGLE(CopyPixels)
-#define glCopyTexImage1DEXT MANGLE(CopyTexImage1DEXT)
-#define glCopyTexImage1D MANGLE(CopyTexImage1D)
-#define glCopyTexImage2DEXT MANGLE(CopyTexImage2DEXT)
-#define glCopyTexImage2D MANGLE(CopyTexImage2D)
-#define glCopyTexSubImage1DEXT MANGLE(CopyTexSubImage1DEXT)
-#define glCopyTexSubImage1D MANGLE(CopyTexSubImage1D)
-#define glCopyTexSubImage2DEXT MANGLE(CopyTexSubImage2DEXT)
-#define glCopyTexSubImage2D MANGLE(CopyTexSubImage2D)
-#define glCopyTexSubImage3DEXT MANGLE(CopyTexSubImage3DEXT)
-#define glCopyTexSubImage3D MANGLE(CopyTexSubImage3D)
-#define glCreateDebugObjectMESA MANGLE(CreateDebugObjectMESA)
-#define glCreateProgram MANGLE(CreateProgram)
-#define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB)
-#define glCreateShader MANGLE(CreateShader)
-#define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB)
-#define glCullFace MANGLE(CullFace)
-#define glCullParameterdvEXT MANGLE(CullParameterdvEXT)
-#define glCullParameterfvEXT MANGLE(CullParameterfvEXT)
-#define glCurrentPaletteMatrixARB MANGLE(CurrentPaletteMatrixARB)
-#define glDeformationMap3dSGIX MANGLE(DeformationMap3dSGIX)
-#define glDeformationMap3fSGIX MANGLE(DeformationMap3fSGIX)
-#define glDeformSGIX MANGLE(DeformSGIX)
-#define glDeleteAsyncMarkersSGIX MANGLE(DeleteAsyncMarkersSGIX)
-#define glDeleteBuffersARB MANGLE(DeleteBuffersARB)
-#define glDeleteBuffers MANGLE(DeleteBuffers)
-#define glDeleteFencesAPPLE MANGLE(DeleteFencesAPPLE)
-#define glDeleteFencesNV MANGLE(DeleteFencesNV)
-#define glDeleteFragmentShaderATI MANGLE(DeleteFragmentShaderATI)
-#define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT)
-#define glDeleteLists MANGLE(DeleteLists)
-#define glDeleteObjectARB MANGLE(DeleteObjectARB)
-#define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV)
-#define glDeleteProgram MANGLE(DeleteProgram)
-#define glDeleteProgramsARB MANGLE(DeleteProgramsARB)
-#define glDeleteProgramsNV MANGLE(DeleteProgramsNV)
-#define glDeleteQueriesARB MANGLE(DeleteQueriesARB)
-#define glDeleteQueries MANGLE(DeleteQueries)
-#define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT)
-#define glDeleteShader MANGLE(DeleteShader)
-#define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT)
-#define glDeleteTextures MANGLE(DeleteTextures)
-#define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE)
-#define glDeleteVertexShaderEXT MANGLE(DeleteVertexShaderEXT)
-#define glDepthBoundsdNV MANGLE(DepthBoundsdNV)
-#define glDepthBoundsEXT MANGLE(DepthBoundsEXT)
-#define glDepthFunc MANGLE(DepthFunc)
-#define glDepthMask MANGLE(DepthMask)
-#define glDepthRangedNV MANGLE(DepthRangedNV)
-#define glDepthRange MANGLE(DepthRange)
-#define glDetachObjectARB MANGLE(DetachObjectARB)
-#define glDetachShader MANGLE(DetachShader)
-#define glDetailTexFuncSGIS MANGLE(DetailTexFuncSGIS)
-#define glDisableClientState MANGLE(DisableClientState)
-#define glDisableIndexedEXT MANGLE(DisableIndexedEXT)
-#define glDisable MANGLE(Disable)
-#define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT)
-#define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB)
-#define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray)
-#define glDrawArraysEXT MANGLE(DrawArraysEXT)
-#define glDrawArraysInstancedEXT MANGLE(DrawArraysInstancedEXT)
-#define glDrawArrays MANGLE(DrawArrays)
-#define glDrawBuffer MANGLE(DrawBuffer)
-#define glDrawBuffersARB MANGLE(DrawBuffersARB)
-#define glDrawBuffersATI MANGLE(DrawBuffersATI)
-#define glDrawBuffers MANGLE(DrawBuffers)
-#define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE)
-#define glDrawElementArrayATI MANGLE(DrawElementArrayATI)
-#define glDrawElementsInstancedEXT MANGLE(DrawElementsInstancedEXT)
-#define glDrawElements MANGLE(DrawElements)
-#define glDrawMeshArraysSUN MANGLE(DrawMeshArraysSUN)
-#define glDrawPixels MANGLE(DrawPixels)
-#define glDrawRangeElementArrayAPPLE MANGLE(DrawRangeElementArrayAPPLE)
-#define glDrawRangeElementArrayATI MANGLE(DrawRangeElementArrayATI)
-#define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT)
-#define glDrawRangeElements MANGLE(DrawRangeElements)
-#define glEdgeFlag MANGLE(EdgeFlag)
-#define glEdgeFlagPointerEXT MANGLE(EdgeFlagPointerEXT)
-#define glEdgeFlagPointerListIBM MANGLE(EdgeFlagPointerListIBM)
-#define glEdgeFlagPointer MANGLE(EdgeFlagPointer)
-#define glEdgeFlagv MANGLE(EdgeFlagv)
-#define glElementPointerAPPLE MANGLE(ElementPointerAPPLE)
-#define glElementPointerATI MANGLE(ElementPointerATI)
-#define glEnableClientState MANGLE(EnableClientState)
-#define glEnableIndexedEXT MANGLE(EnableIndexedEXT)
-#define glEnable MANGLE(Enable)
-#define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT)
-#define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB)
-#define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray)
-#define glEndFragmentShaderATI MANGLE(EndFragmentShaderATI)
-#define glEndList MANGLE(EndList)
-#define glEnd MANGLE(End)
-#define glEndOcclusionQueryNV MANGLE(EndOcclusionQueryNV)
-#define glEndQueryARB MANGLE(EndQueryARB)
-#define glEndQuery MANGLE(EndQuery)
-#define glEndTransformFeedbackNV MANGLE(EndTransformFeedbackNV)
-#define glEndVertexShaderEXT MANGLE(EndVertexShaderEXT)
-#define glEvalCoord1d MANGLE(EvalCoord1d)
-#define glEvalCoord1dv MANGLE(EvalCoord1dv)
-#define glEvalCoord1f MANGLE(EvalCoord1f)
-#define glEvalCoord1fv MANGLE(EvalCoord1fv)
-#define glEvalCoord2d MANGLE(EvalCoord2d)
-#define glEvalCoord2dv MANGLE(EvalCoord2dv)
-#define glEvalCoord2f MANGLE(EvalCoord2f)
-#define glEvalCoord2fv MANGLE(EvalCoord2fv)
-#define glEvalMapsNV MANGLE(EvalMapsNV)
-#define glEvalMesh1 MANGLE(EvalMesh1)
-#define glEvalMesh2 MANGLE(EvalMesh2)
-#define glEvalPoint1 MANGLE(EvalPoint1)
-#define glEvalPoint2 MANGLE(EvalPoint2)
-#define glExecuteProgramNV MANGLE(ExecuteProgramNV)
-#define glExtractComponentEXT MANGLE(ExtractComponentEXT)
-#define glFeedbackBuffer MANGLE(FeedbackBuffer)
-#define glFinalCombinerInputNV MANGLE(FinalCombinerInputNV)
-#define glFinishAsyncSGIX MANGLE(FinishAsyncSGIX)
-#define glFinishFenceAPPLE MANGLE(FinishFenceAPPLE)
-#define glFinishFenceNV MANGLE(FinishFenceNV)
-#define glFinish MANGLE(Finish)
-#define glFinishObjectAPPLE MANGLE(FinishObjectAPPLE)
-#define glFinishTextureSUNX MANGLE(FinishTextureSUNX)
-#define glFlush MANGLE(Flush)
-#define glFlushMappedBufferRangeAPPLE MANGLE(FlushMappedBufferRangeAPPLE)
-#define glFlushPixelDataRangeNV MANGLE(FlushPixelDataRangeNV)
-#define glFlushRasterSGIX MANGLE(FlushRasterSGIX)
-#define glFlushVertexArrayRangeAPPLE MANGLE(FlushVertexArrayRangeAPPLE)
-#define glFlushVertexArrayRangeNV MANGLE(FlushVertexArrayRangeNV)
-#define glFogCoorddEXT MANGLE(FogCoorddEXT)
-#define glFogCoordd MANGLE(FogCoordd)
-#define glFogCoorddvEXT MANGLE(FogCoorddvEXT)
-#define glFogCoorddv MANGLE(FogCoorddv)
-#define glFogCoordfEXT MANGLE(FogCoordfEXT)
-#define glFogCoordf MANGLE(FogCoordf)
-#define glFogCoordfvEXT MANGLE(FogCoordfvEXT)
-#define glFogCoordfv MANGLE(FogCoordfv)
-#define glFogCoordhNV MANGLE(FogCoordhNV)
-#define glFogCoordhvNV MANGLE(FogCoordhvNV)
-#define glFogCoordPointerEXT MANGLE(FogCoordPointerEXT)
-#define glFogCoordPointerListIBM MANGLE(FogCoordPointerListIBM)
-#define glFogCoordPointer MANGLE(FogCoordPointer)
-#define glFogf MANGLE(Fogf)
-#define glFogFuncSGIS MANGLE(FogFuncSGIS)
-#define glFogfv MANGLE(Fogfv)
-#define glFogi MANGLE(Fogi)
-#define glFogiv MANGLE(Fogiv)
-#define glFragmentColorMaterialSGIX MANGLE(FragmentColorMaterialSGIX)
-#define glFragmentLightfSGIX MANGLE(FragmentLightfSGIX)
-#define glFragmentLightfvSGIX MANGLE(FragmentLightfvSGIX)
-#define glFragmentLightiSGIX MANGLE(FragmentLightiSGIX)
-#define glFragmentLightivSGIX MANGLE(FragmentLightivSGIX)
-#define glFragmentLightModelfSGIX MANGLE(FragmentLightModelfSGIX)
-#define glFragmentLightModelfvSGIX MANGLE(FragmentLightModelfvSGIX)
-#define glFragmentLightModeliSGIX MANGLE(FragmentLightModeliSGIX)
-#define glFragmentLightModelivSGIX MANGLE(FragmentLightModelivSGIX)
-#define glFragmentMaterialfSGIX MANGLE(FragmentMaterialfSGIX)
-#define glFragmentMaterialfvSGIX MANGLE(FragmentMaterialfvSGIX)
-#define glFragmentMaterialiSGIX MANGLE(FragmentMaterialiSGIX)
-#define glFragmentMaterialivSGIX MANGLE(FragmentMaterialivSGIX)
-#define glFramebufferRenderbufferEXT MANGLE(FramebufferRenderbufferEXT)
-#define glFramebufferTexture1DEXT MANGLE(FramebufferTexture1DEXT)
-#define glFramebufferTexture2DEXT MANGLE(FramebufferTexture2DEXT)
-#define glFramebufferTexture3DEXT MANGLE(FramebufferTexture3DEXT)
-#define glFramebufferTextureEXT MANGLE(FramebufferTextureEXT)
-#define glFramebufferTextureFaceEXT MANGLE(FramebufferTextureFaceEXT)
-#define glFramebufferTextureLayerEXT MANGLE(FramebufferTextureLayerEXT)
-#define glFrameZoomSGIX MANGLE(FrameZoomSGIX)
-#define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI)
-#define glFrontFace MANGLE(FrontFace)
-#define glFrustum MANGLE(Frustum)
-#define glGenAsyncMarkersSGIX MANGLE(GenAsyncMarkersSGIX)
-#define glGenBuffersARB MANGLE(GenBuffersARB)
-#define glGenBuffers MANGLE(GenBuffers)
-#define glGenerateMipmapEXT MANGLE(GenerateMipmapEXT)
-#define glGenFencesAPPLE MANGLE(GenFencesAPPLE)
-#define glGenFencesNV MANGLE(GenFencesNV)
-#define glGenFragmentShadersATI MANGLE(GenFragmentShadersATI)
-#define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT)
-#define glGenLists MANGLE(GenLists)
-#define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV)
-#define glGenProgramsARB MANGLE(GenProgramsARB)
-#define glGenProgramsNV MANGLE(GenProgramsNV)
-#define glGenQueriesARB MANGLE(GenQueriesARB)
-#define glGenQueries MANGLE(GenQueries)
-#define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT)
-#define glGenSymbolsEXT MANGLE(GenSymbolsEXT)
-#define glGenTexturesEXT MANGLE(GenTexturesEXT)
-#define glGenTextures MANGLE(GenTextures)
-#define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE)
-#define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT)
-#define glGetActiveAttribARB MANGLE(GetActiveAttribARB)
-#define glGetActiveAttrib MANGLE(GetActiveAttrib)
-#define glGetActiveUniformARB MANGLE(GetActiveUniformARB)
-#define glGetActiveUniform MANGLE(GetActiveUniform)
-#define glGetActiveVaryingNV MANGLE(GetActiveVaryingNV)
-#define glGetArrayObjectfvATI MANGLE(GetArrayObjectfvATI)
-#define glGetArrayObjectivATI MANGLE(GetArrayObjectivATI)
-#define glGetAttachedObjectsARB MANGLE(GetAttachedObjectsARB)
-#define glGetAttachedShaders MANGLE(GetAttachedShaders)
-#define glGetAttribLocationARB MANGLE(GetAttribLocationARB)
-#define glGetAttribLocation MANGLE(GetAttribLocation)
-#define glGetBooleanIndexedvEXT MANGLE(GetBooleanIndexedvEXT)
-#define glGetBooleanv MANGLE(GetBooleanv)
-#define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB)
-#define glGetBufferParameteriv MANGLE(GetBufferParameteriv)
-#define glGetBufferPointervARB MANGLE(GetBufferPointervARB)
-#define glGetBufferPointerv MANGLE(GetBufferPointerv)
-#define glGetBufferSubDataARB MANGLE(GetBufferSubDataARB)
-#define glGetBufferSubData MANGLE(GetBufferSubData)
-#define glGetClipPlane MANGLE(GetClipPlane)
-#define glGetColorTableEXT MANGLE(GetColorTableEXT)
-#define glGetColorTable MANGLE(GetColorTable)
-#define glGetColorTableParameterfvEXT MANGLE(GetColorTableParameterfvEXT)
-#define glGetColorTableParameterfv MANGLE(GetColorTableParameterfv)
-#define glGetColorTableParameterfvSGI MANGLE(GetColorTableParameterfvSGI)
-#define glGetColorTableParameterivEXT MANGLE(GetColorTableParameterivEXT)
-#define glGetColorTableParameteriv MANGLE(GetColorTableParameteriv)
-#define glGetColorTableParameterivSGI MANGLE(GetColorTableParameterivSGI)
-#define glGetColorTableSGI MANGLE(GetColorTableSGI)
-#define glGetCombinerInputParameterfvNV MANGLE(GetCombinerInputParameterfvNV)
-#define glGetCombinerInputParameterivNV MANGLE(GetCombinerInputParameterivNV)
-#define glGetCombinerOutputParameterfvNV MANGLE(GetCombinerOutputParameterfvNV)
-#define glGetCombinerOutputParameterivNV MANGLE(GetCombinerOutputParameterivNV)
-#define glGetCombinerStageParameterfvNV MANGLE(GetCombinerStageParameterfvNV)
-#define glGetCompressedTexImageARB MANGLE(GetCompressedTexImageARB)
-#define glGetCompressedTexImage MANGLE(GetCompressedTexImage)
-#define glGetConvolutionFilterEXT MANGLE(GetConvolutionFilterEXT)
-#define glGetConvolutionFilter MANGLE(GetConvolutionFilter)
-#define glGetConvolutionParameterfvEXT MANGLE(GetConvolutionParameterfvEXT)
-#define glGetConvolutionParameterfv MANGLE(GetConvolutionParameterfv)
-#define glGetConvolutionParameterivEXT MANGLE(GetConvolutionParameterivEXT)
-#define glGetConvolutionParameteriv MANGLE(GetConvolutionParameteriv)
-#define glGetDebugLogLengthMESA MANGLE(GetDebugLogLengthMESA)
-#define glGetDebugLogMESA MANGLE(GetDebugLogMESA)
-#define glGetDetailTexFuncSGIS MANGLE(GetDetailTexFuncSGIS)
-#define glGetDoublev MANGLE(GetDoublev)
-#define glGetError MANGLE(GetError)
-#define glGetFenceivNV MANGLE(GetFenceivNV)
-#define glGetFinalCombinerInputParameterfvNV MANGLE(GetFinalCombinerInputParameterfvNV)
-#define glGetFinalCombinerInputParameterivNV MANGLE(GetFinalCombinerInputParameterivNV)
-#define glGetFloatv MANGLE(GetFloatv)
-#define glGetFogFuncSGIS MANGLE(GetFogFuncSGIS)
-#define glGetFragDataLocationEXT MANGLE(GetFragDataLocationEXT)
-#define glGetFragmentLightfvSGIX MANGLE(GetFragmentLightfvSGIX)
-#define glGetFragmentLightivSGIX MANGLE(GetFragmentLightivSGIX)
-#define glGetFragmentMaterialfvSGIX MANGLE(GetFragmentMaterialfvSGIX)
-#define glGetFragmentMaterialivSGIX MANGLE(GetFragmentMaterialivSGIX)
-#define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT)
-#define glGetHandleARB MANGLE(GetHandleARB)
-#define glGetHistogramEXT MANGLE(GetHistogramEXT)
-#define glGetHistogram MANGLE(GetHistogram)
-#define glGetHistogramParameterfvEXT MANGLE(GetHistogramParameterfvEXT)
-#define glGetHistogramParameterfv MANGLE(GetHistogramParameterfv)
-#define glGetHistogramParameterivEXT MANGLE(GetHistogramParameterivEXT)
-#define glGetHistogramParameteriv MANGLE(GetHistogramParameteriv)
-#define glGetImageTransformParameterfvHP MANGLE(GetImageTransformParameterfvHP)
-#define glGetImageTransformParameterivHP MANGLE(GetImageTransformParameterivHP)
-#define glGetInfoLogARB MANGLE(GetInfoLogARB)
-#define glGetInstrumentsSGIX MANGLE(GetInstrumentsSGIX)
-#define glGetIntegerIndexedvEXT MANGLE(GetIntegerIndexedvEXT)
-#define glGetIntegerv MANGLE(GetIntegerv)
-#define glGetInvariantBooleanvEXT MANGLE(GetInvariantBooleanvEXT)
-#define glGetInvariantFloatvEXT MANGLE(GetInvariantFloatvEXT)
-#define glGetInvariantIntegervEXT MANGLE(GetInvariantIntegervEXT)
-#define glGetLightfv MANGLE(GetLightfv)
-#define glGetLightiv MANGLE(GetLightiv)
-#define glGetListParameterfvSGIX MANGLE(GetListParameterfvSGIX)
-#define glGetListParameterivSGIX MANGLE(GetListParameterivSGIX)
-#define glGetLocalConstantBooleanvEXT MANGLE(GetLocalConstantBooleanvEXT)
-#define glGetLocalConstantFloatvEXT MANGLE(GetLocalConstantFloatvEXT)
-#define glGetLocalConstantIntegervEXT MANGLE(GetLocalConstantIntegervEXT)
-#define glGetMapAttribParameterfvNV MANGLE(GetMapAttribParameterfvNV)
-#define glGetMapAttribParameterivNV MANGLE(GetMapAttribParameterivNV)
-#define glGetMapControlPointsNV MANGLE(GetMapControlPointsNV)
-#define glGetMapdv MANGLE(GetMapdv)
-#define glGetMapfv MANGLE(GetMapfv)
-#define glGetMapiv MANGLE(GetMapiv)
-#define glGetMapParameterfvNV MANGLE(GetMapParameterfvNV)
-#define glGetMapParameterivNV MANGLE(GetMapParameterivNV)
-#define glGetMaterialfv MANGLE(GetMaterialfv)
-#define glGetMaterialiv MANGLE(GetMaterialiv)
-#define glGetMinmaxEXT MANGLE(GetMinmaxEXT)
-#define glGetMinmax MANGLE(GetMinmax)
-#define glGetMinmaxParameterfvEXT MANGLE(GetMinmaxParameterfvEXT)
-#define glGetMinmaxParameterfv MANGLE(GetMinmaxParameterfv)
-#define glGetMinmaxParameterivEXT MANGLE(GetMinmaxParameterivEXT)
-#define glGetMinmaxParameteriv MANGLE(GetMinmaxParameteriv)
-#define glGetObjectBufferfvATI MANGLE(GetObjectBufferfvATI)
-#define glGetObjectBufferivATI MANGLE(GetObjectBufferivATI)
-#define glGetObjectParameterfvARB MANGLE(GetObjectParameterfvARB)
-#define glGetObjectParameterivARB MANGLE(GetObjectParameterivARB)
-#define glGetOcclusionQueryivNV MANGLE(GetOcclusionQueryivNV)
-#define glGetOcclusionQueryuivNV MANGLE(GetOcclusionQueryuivNV)
-#define glGetPixelMapfv MANGLE(GetPixelMapfv)
-#define glGetPixelMapuiv MANGLE(GetPixelMapuiv)
-#define glGetPixelMapusv MANGLE(GetPixelMapusv)
-#define glGetPixelTexGenParameterfvSGIS MANGLE(GetPixelTexGenParameterfvSGIS)
-#define glGetPixelTexGenParameterivSGIS MANGLE(GetPixelTexGenParameterivSGIS)
-#define glGetPointervEXT MANGLE(GetPointervEXT)
-#define glGetPointerv MANGLE(GetPointerv)
-#define glGetPolygonStipple MANGLE(GetPolygonStipple)
-#define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB)
-#define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB)
-#define glGetProgramEnvParameterIivNV MANGLE(GetProgramEnvParameterIivNV)
-#define glGetProgramEnvParameterIuivNV MANGLE(GetProgramEnvParameterIuivNV)
-#define glGetProgramInfoLog MANGLE(GetProgramInfoLog)
-#define glGetProgramivARB MANGLE(GetProgramivARB)
-#define glGetProgramiv MANGLE(GetProgramiv)
-#define glGetProgramivNV MANGLE(GetProgramivNV)
-#define glGetProgramLocalParameterdvARB MANGLE(GetProgramLocalParameterdvARB)
-#define glGetProgramLocalParameterfvARB MANGLE(GetProgramLocalParameterfvARB)
-#define glGetProgramLocalParameterIivNV MANGLE(GetProgramLocalParameterIivNV)
-#define glGetProgramLocalParameterIuivNV MANGLE(GetProgramLocalParameterIuivNV)
-#define glGetProgramNamedParameterdvNV MANGLE(GetProgramNamedParameterdvNV)
-#define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV)
-#define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV)
-#define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV)
-#define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA)
-#define glGetProgramStringARB MANGLE(GetProgramStringARB)
-#define glGetProgramStringNV MANGLE(GetProgramStringNV)
-#define glGetQueryivARB MANGLE(GetQueryivARB)
-#define glGetQueryiv MANGLE(GetQueryiv)
-#define glGetQueryObjecti64vEXT MANGLE(GetQueryObjecti64vEXT)
-#define glGetQueryObjectivARB MANGLE(GetQueryObjectivARB)
-#define glGetQueryObjectiv MANGLE(GetQueryObjectiv)
-#define glGetQueryObjectui64vEXT MANGLE(GetQueryObjectui64vEXT)
-#define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB)
-#define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv)
-#define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT)
-#define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT)
-#define glGetSeparableFilter MANGLE(GetSeparableFilter)
-#define glGetShaderInfoLog MANGLE(GetShaderInfoLog)
-#define glGetShaderiv MANGLE(GetShaderiv)
-#define glGetShaderSourceARB MANGLE(GetShaderSourceARB)
-#define glGetShaderSource MANGLE(GetShaderSource)
-#define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS)
-#define glGetString MANGLE(GetString)
-#define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI)
-#define glGetTexBumpParameterivATI MANGLE(GetTexBumpParameterivATI)
-#define glGetTexEnvfv MANGLE(GetTexEnvfv)
-#define glGetTexEnviv MANGLE(GetTexEnviv)
-#define glGetTexFilterFuncSGIS MANGLE(GetTexFilterFuncSGIS)
-#define glGetTexGendv MANGLE(GetTexGendv)
-#define glGetTexGenfv MANGLE(GetTexGenfv)
-#define glGetTexGeniv MANGLE(GetTexGeniv)
-#define glGetTexImage MANGLE(GetTexImage)
-#define glGetTexLevelParameterfv MANGLE(GetTexLevelParameterfv)
-#define glGetTexLevelParameteriv MANGLE(GetTexLevelParameteriv)
-#define glGetTexParameterfv MANGLE(GetTexParameterfv)
-#define glGetTexParameterIivEXT MANGLE(GetTexParameterIivEXT)
-#define glGetTexParameterIuivEXT MANGLE(GetTexParameterIuivEXT)
-#define glGetTexParameteriv MANGLE(GetTexParameteriv)
-#define glGetTrackMatrixivNV MANGLE(GetTrackMatrixivNV)
-#define glGetTransformFeedbackVaryingNV MANGLE(GetTransformFeedbackVaryingNV)
-#define glGetUniformBufferSizeEXT MANGLE(GetUniformBufferSizeEXT)
-#define glGetUniformfvARB MANGLE(GetUniformfvARB)
-#define glGetUniformfv MANGLE(GetUniformfv)
-#define glGetUniformivARB MANGLE(GetUniformivARB)
-#define glGetUniformiv MANGLE(GetUniformiv)
-#define glGetUniformLocationARB MANGLE(GetUniformLocationARB)
-#define glGetUniformLocation MANGLE(GetUniformLocation)
-#define glGetUniformOffsetEXT MANGLE(GetUniformOffsetEXT)
-#define glGetUniformuivEXT MANGLE(GetUniformuivEXT)
-#define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI)
-#define glGetVariantArrayObjectivATI MANGLE(GetVariantArrayObjectivATI)
-#define glGetVariantBooleanvEXT MANGLE(GetVariantBooleanvEXT)
-#define glGetVariantFloatvEXT MANGLE(GetVariantFloatvEXT)
-#define glGetVariantIntegervEXT MANGLE(GetVariantIntegervEXT)
-#define glGetVariantPointervEXT MANGLE(GetVariantPointervEXT)
-#define glGetVaryingLocationNV MANGLE(GetVaryingLocationNV)
-#define glGetVertexAttribArrayObjectfvATI MANGLE(GetVertexAttribArrayObjectfvATI)
-#define glGetVertexAttribArrayObjectivATI MANGLE(GetVertexAttribArrayObjectivATI)
-#define glGetVertexAttribdvARB MANGLE(GetVertexAttribdvARB)
-#define glGetVertexAttribdv MANGLE(GetVertexAttribdv)
-#define glGetVertexAttribdvNV MANGLE(GetVertexAttribdvNV)
-#define glGetVertexAttribfvARB MANGLE(GetVertexAttribfvARB)
-#define glGetVertexAttribfv MANGLE(GetVertexAttribfv)
-#define glGetVertexAttribfvNV MANGLE(GetVertexAttribfvNV)
-#define glGetVertexAttribIivEXT MANGLE(GetVertexAttribIivEXT)
-#define glGetVertexAttribIuivEXT MANGLE(GetVertexAttribIuivEXT)
-#define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB)
-#define glGetVertexAttribiv MANGLE(GetVertexAttribiv)
-#define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV)
-#define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB)
-#define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv)
-#define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV)
-#define glGlobalAlphaFactorbSUN MANGLE(GlobalAlphaFactorbSUN)
-#define glGlobalAlphaFactordSUN MANGLE(GlobalAlphaFactordSUN)
-#define glGlobalAlphaFactorfSUN MANGLE(GlobalAlphaFactorfSUN)
-#define glGlobalAlphaFactoriSUN MANGLE(GlobalAlphaFactoriSUN)
-#define glGlobalAlphaFactorsSUN MANGLE(GlobalAlphaFactorsSUN)
-#define glGlobalAlphaFactorubSUN MANGLE(GlobalAlphaFactorubSUN)
-#define glGlobalAlphaFactoruiSUN MANGLE(GlobalAlphaFactoruiSUN)
-#define glGlobalAlphaFactorusSUN MANGLE(GlobalAlphaFactorusSUN)
-#define glHint MANGLE(Hint)
-#define glHintPGI MANGLE(HintPGI)
-#define glHistogramEXT MANGLE(HistogramEXT)
-#define glHistogram MANGLE(Histogram)
-#define glIglooInterfaceSGIX MANGLE(IglooInterfaceSGIX)
-#define glImageTransformParameterfHP MANGLE(ImageTransformParameterfHP)
-#define glImageTransformParameterfvHP MANGLE(ImageTransformParameterfvHP)
-#define glImageTransformParameteriHP MANGLE(ImageTransformParameteriHP)
-#define glImageTransformParameterivHP MANGLE(ImageTransformParameterivHP)
-#define glIndexd MANGLE(Indexd)
-#define glIndexdv MANGLE(Indexdv)
-#define glIndexf MANGLE(Indexf)
-#define glIndexFuncEXT MANGLE(IndexFuncEXT)
-#define glIndexfv MANGLE(Indexfv)
-#define glIndexi MANGLE(Indexi)
-#define glIndexiv MANGLE(Indexiv)
-#define glIndexMask MANGLE(IndexMask)
-#define glIndexMaterialEXT MANGLE(IndexMaterialEXT)
-#define glIndexPointerEXT MANGLE(IndexPointerEXT)
-#define glIndexPointerListIBM MANGLE(IndexPointerListIBM)
-#define glIndexPointer MANGLE(IndexPointer)
-#define glIndexs MANGLE(Indexs)
-#define glIndexsv MANGLE(Indexsv)
-#define glIndexub MANGLE(Indexub)
-#define glIndexubv MANGLE(Indexubv)
-#define glInitNames MANGLE(InitNames)
-#define glInsertComponentEXT MANGLE(InsertComponentEXT)
-#define glInstrumentsBufferSGIX MANGLE(InstrumentsBufferSGIX)
-#define glInterleavedArrays MANGLE(InterleavedArrays)
-#define glIsAsyncMarkerSGIX MANGLE(IsAsyncMarkerSGIX)
-#define glIsBufferARB MANGLE(IsBufferARB)
-#define glIsBuffer MANGLE(IsBuffer)
-#define glIsEnabledIndexedEXT MANGLE(IsEnabledIndexedEXT)
-#define glIsEnabled MANGLE(IsEnabled)
-#define glIsFenceAPPLE MANGLE(IsFenceAPPLE)
-#define glIsFenceNV MANGLE(IsFenceNV)
-#define glIsFramebufferEXT MANGLE(IsFramebufferEXT)
-#define glIsList MANGLE(IsList)
-#define glIsObjectBufferATI MANGLE(IsObjectBufferATI)
-#define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV)
-#define glIsProgramARB MANGLE(IsProgramARB)
-#define glIsProgram MANGLE(IsProgram)
-#define glIsProgramNV MANGLE(IsProgramNV)
-#define glIsQueryARB MANGLE(IsQueryARB)
-#define glIsQuery MANGLE(IsQuery)
-#define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT)
-#define glIsShader MANGLE(IsShader)
-#define glIsTextureEXT MANGLE(IsTextureEXT)
-#define glIsTexture MANGLE(IsTexture)
-#define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT)
-#define glIsVertexArrayAPPLE MANGLE(IsVertexArrayAPPLE)
-#define glLightEnviSGIX MANGLE(LightEnviSGIX)
-#define glLightf MANGLE(Lightf)
-#define glLightfv MANGLE(Lightfv)
-#define glLighti MANGLE(Lighti)
-#define glLightiv MANGLE(Lightiv)
-#define glLightModelf MANGLE(LightModelf)
-#define glLightModelfv MANGLE(LightModelfv)
-#define glLightModeli MANGLE(LightModeli)
-#define glLightModeliv MANGLE(LightModeliv)
-#define glLineStipple MANGLE(LineStipple)
-#define glLineWidth MANGLE(LineWidth)
-#define glLinkProgramARB MANGLE(LinkProgramARB)
-#define glLinkProgram MANGLE(LinkProgram)
-#define glListBase MANGLE(ListBase)
-#define glListParameterfSGIX MANGLE(ListParameterfSGIX)
-#define glListParameterfvSGIX MANGLE(ListParameterfvSGIX)
-#define glListParameteriSGIX MANGLE(ListParameteriSGIX)
-#define glListParameterivSGIX MANGLE(ListParameterivSGIX)
-#define glLoadIdentityDeformationMapSGIX MANGLE(LoadIdentityDeformationMapSGIX)
-#define glLoadIdentity MANGLE(LoadIdentity)
-#define glLoadMatrixd MANGLE(LoadMatrixd)
-#define glLoadMatrixf MANGLE(LoadMatrixf)
-#define glLoadName MANGLE(LoadName)
-#define glLoadProgramNV MANGLE(LoadProgramNV)
-#define glLoadTransposeMatrixdARB MANGLE(LoadTransposeMatrixdARB)
-#define glLoadTransposeMatrixd MANGLE(LoadTransposeMatrixd)
-#define glLoadTransposeMatrixfARB MANGLE(LoadTransposeMatrixfARB)
-#define glLoadTransposeMatrixf MANGLE(LoadTransposeMatrixf)
-#define glLockArraysEXT MANGLE(LockArraysEXT)
-#define glLogicOp MANGLE(LogicOp)
-#define glMap1d MANGLE(Map1d)
-#define glMap1f MANGLE(Map1f)
-#define glMap2d MANGLE(Map2d)
-#define glMap2f MANGLE(Map2f)
-#define glMapBufferARB MANGLE(MapBufferARB)
-#define glMapBuffer MANGLE(MapBuffer)
-#define glMapControlPointsNV MANGLE(MapControlPointsNV)
-#define glMapGrid1d MANGLE(MapGrid1d)
-#define glMapGrid1f MANGLE(MapGrid1f)
-#define glMapGrid2d MANGLE(MapGrid2d)
-#define glMapGrid2f MANGLE(MapGrid2f)
-#define glMapObjectBufferATI MANGLE(MapObjectBufferATI)
-#define glMapParameterfvNV MANGLE(MapParameterfvNV)
-#define glMapParameterivNV MANGLE(MapParameterivNV)
-#define glMaterialf MANGLE(Materialf)
-#define glMaterialfv MANGLE(Materialfv)
-#define glMateriali MANGLE(Materiali)
-#define glMaterialiv MANGLE(Materialiv)
-#define glMatrixIndexPointerARB MANGLE(MatrixIndexPointerARB)
-#define glMatrixIndexubvARB MANGLE(MatrixIndexubvARB)
-#define glMatrixIndexuivARB MANGLE(MatrixIndexuivARB)
-#define glMatrixIndexusvARB MANGLE(MatrixIndexusvARB)
-#define glMatrixMode MANGLE(MatrixMode)
-#define glMinmaxEXT MANGLE(MinmaxEXT)
-#define glMinmax MANGLE(Minmax)
-#define glMultiDrawArraysEXT MANGLE(MultiDrawArraysEXT)
-#define glMultiDrawArrays MANGLE(MultiDrawArrays)
-#define glMultiDrawElementArrayAPPLE MANGLE(MultiDrawElementArrayAPPLE)
-#define glMultiDrawElementsEXT MANGLE(MultiDrawElementsEXT)
-#define glMultiDrawElements MANGLE(MultiDrawElements)
-#define glMultiDrawRangeElementArrayAPPLE MANGLE(MultiDrawRangeElementArrayAPPLE)
-#define glMultiModeDrawArraysIBM MANGLE(MultiModeDrawArraysIBM)
-#define glMultiModeDrawElementsIBM MANGLE(MultiModeDrawElementsIBM)
-#define glMultiTexCoord1dARB MANGLE(MultiTexCoord1dARB)
-#define glMultiTexCoord1d MANGLE(MultiTexCoord1d)
-#define glMultiTexCoord1dvARB MANGLE(MultiTexCoord1dvARB)
-#define glMultiTexCoord1dv MANGLE(MultiTexCoord1dv)
-#define glMultiTexCoord1fARB MANGLE(MultiTexCoord1fARB)
-#define glMultiTexCoord1f MANGLE(MultiTexCoord1f)
-#define glMultiTexCoord1fvARB MANGLE(MultiTexCoord1fvARB)
-#define glMultiTexCoord1fv MANGLE(MultiTexCoord1fv)
-#define glMultiTexCoord1hNV MANGLE(MultiTexCoord1hNV)
-#define glMultiTexCoord1hvNV MANGLE(MultiTexCoord1hvNV)
-#define glMultiTexCoord1iARB MANGLE(MultiTexCoord1iARB)
-#define glMultiTexCoord1i MANGLE(MultiTexCoord1i)
-#define glMultiTexCoord1ivARB MANGLE(MultiTexCoord1ivARB)
-#define glMultiTexCoord1iv MANGLE(MultiTexCoord1iv)
-#define glMultiTexCoord1sARB MANGLE(MultiTexCoord1sARB)
-#define glMultiTexCoord1s MANGLE(MultiTexCoord1s)
-#define glMultiTexCoord1svARB MANGLE(MultiTexCoord1svARB)
-#define glMultiTexCoord1sv MANGLE(MultiTexCoord1sv)
-#define glMultiTexCoord2dARB MANGLE(MultiTexCoord2dARB)
-#define glMultiTexCoord2d MANGLE(MultiTexCoord2d)
-#define glMultiTexCoord2dvARB MANGLE(MultiTexCoord2dvARB)
-#define glMultiTexCoord2dv MANGLE(MultiTexCoord2dv)
-#define glMultiTexCoord2fARB MANGLE(MultiTexCoord2fARB)
-#define glMultiTexCoord2f MANGLE(MultiTexCoord2f)
-#define glMultiTexCoord2fvARB MANGLE(MultiTexCoord2fvARB)
-#define glMultiTexCoord2fv MANGLE(MultiTexCoord2fv)
-#define glMultiTexCoord2hNV MANGLE(MultiTexCoord2hNV)
-#define glMultiTexCoord2hvNV MANGLE(MultiTexCoord2hvNV)
-#define glMultiTexCoord2iARB MANGLE(MultiTexCoord2iARB)
-#define glMultiTexCoord2i MANGLE(MultiTexCoord2i)
-#define glMultiTexCoord2ivARB MANGLE(MultiTexCoord2ivARB)
-#define glMultiTexCoord2iv MANGLE(MultiTexCoord2iv)
-#define glMultiTexCoord2sARB MANGLE(MultiTexCoord2sARB)
-#define glMultiTexCoord2s MANGLE(MultiTexCoord2s)
-#define glMultiTexCoord2svARB MANGLE(MultiTexCoord2svARB)
-#define glMultiTexCoord2sv MANGLE(MultiTexCoord2sv)
-#define glMultiTexCoord3dARB MANGLE(MultiTexCoord3dARB)
-#define glMultiTexCoord3d MANGLE(MultiTexCoord3d)
-#define glMultiTexCoord3dvARB MANGLE(MultiTexCoord3dvARB)
-#define glMultiTexCoord3dv MANGLE(MultiTexCoord3dv)
-#define glMultiTexCoord3fARB MANGLE(MultiTexCoord3fARB)
-#define glMultiTexCoord3f MANGLE(MultiTexCoord3f)
-#define glMultiTexCoord3fvARB MANGLE(MultiTexCoord3fvARB)
-#define glMultiTexCoord3fv MANGLE(MultiTexCoord3fv)
-#define glMultiTexCoord3hNV MANGLE(MultiTexCoord3hNV)
-#define glMultiTexCoord3hvNV MANGLE(MultiTexCoord3hvNV)
-#define glMultiTexCoord3iARB MANGLE(MultiTexCoord3iARB)
-#define glMultiTexCoord3i MANGLE(MultiTexCoord3i)
-#define glMultiTexCoord3ivARB MANGLE(MultiTexCoord3ivARB)
-#define glMultiTexCoord3iv MANGLE(MultiTexCoord3iv)
-#define glMultiTexCoord3sARB MANGLE(MultiTexCoord3sARB)
-#define glMultiTexCoord3s MANGLE(MultiTexCoord3s)
-#define glMultiTexCoord3svARB MANGLE(MultiTexCoord3svARB)
-#define glMultiTexCoord3sv MANGLE(MultiTexCoord3sv)
-#define glMultiTexCoord4dARB MANGLE(MultiTexCoord4dARB)
-#define glMultiTexCoord4d MANGLE(MultiTexCoord4d)
-#define glMultiTexCoord4dvARB MANGLE(MultiTexCoord4dvARB)
-#define glMultiTexCoord4dv MANGLE(MultiTexCoord4dv)
-#define glMultiTexCoord4fARB MANGLE(MultiTexCoord4fARB)
-#define glMultiTexCoord4f MANGLE(MultiTexCoord4f)
-#define glMultiTexCoord4fvARB MANGLE(MultiTexCoord4fvARB)
-#define glMultiTexCoord4fv MANGLE(MultiTexCoord4fv)
-#define glMultiTexCoord4hNV MANGLE(MultiTexCoord4hNV)
-#define glMultiTexCoord4hvNV MANGLE(MultiTexCoord4hvNV)
-#define glMultiTexCoord4iARB MANGLE(MultiTexCoord4iARB)
-#define glMultiTexCoord4i MANGLE(MultiTexCoord4i)
-#define glMultiTexCoord4ivARB MANGLE(MultiTexCoord4ivARB)
-#define glMultiTexCoord4iv MANGLE(MultiTexCoord4iv)
-#define glMultiTexCoord4sARB MANGLE(MultiTexCoord4sARB)
-#define glMultiTexCoord4s MANGLE(MultiTexCoord4s)
-#define glMultiTexCoord4svARB MANGLE(MultiTexCoord4svARB)
-#define glMultiTexCoord4sv MANGLE(MultiTexCoord4sv)
-#define glMultMatrixd MANGLE(MultMatrixd)
-#define glMultMatrixf MANGLE(MultMatrixf)
-#define glMultTransposeMatrixdARB MANGLE(MultTransposeMatrixdARB)
-#define glMultTransposeMatrixd MANGLE(MultTransposeMatrixd)
-#define glMultTransposeMatrixfARB MANGLE(MultTransposeMatrixfARB)
-#define glMultTransposeMatrixf MANGLE(MultTransposeMatrixf)
-#define glNewList MANGLE(NewList)
-#define glNewObjectBufferATI MANGLE(NewObjectBufferATI)
-#define glNormal3b MANGLE(Normal3b)
-#define glNormal3bv MANGLE(Normal3bv)
-#define glNormal3d MANGLE(Normal3d)
-#define glNormal3dv MANGLE(Normal3dv)
-#define glNormal3f MANGLE(Normal3f)
-#define glNormal3fVertex3fSUN MANGLE(Normal3fVertex3fSUN)
-#define glNormal3fVertex3fvSUN MANGLE(Normal3fVertex3fvSUN)
-#define glNormal3fv MANGLE(Normal3fv)
-#define glNormal3hNV MANGLE(Normal3hNV)
-#define glNormal3hvNV MANGLE(Normal3hvNV)
-#define glNormal3i MANGLE(Normal3i)
-#define glNormal3iv MANGLE(Normal3iv)
-#define glNormal3s MANGLE(Normal3s)
-#define glNormal3sv MANGLE(Normal3sv)
-#define glNormalPointerEXT MANGLE(NormalPointerEXT)
-#define glNormalPointerListIBM MANGLE(NormalPointerListIBM)
-#define glNormalPointer MANGLE(NormalPointer)
-#define glNormalPointervINTEL MANGLE(NormalPointervINTEL)
-#define glNormalStream3bATI MANGLE(NormalStream3bATI)
-#define glNormalStream3bvATI MANGLE(NormalStream3bvATI)
-#define glNormalStream3dATI MANGLE(NormalStream3dATI)
-#define glNormalStream3dvATI MANGLE(NormalStream3dvATI)
-#define glNormalStream3fATI MANGLE(NormalStream3fATI)
-#define glNormalStream3fvATI MANGLE(NormalStream3fvATI)
-#define glNormalStream3iATI MANGLE(NormalStream3iATI)
-#define glNormalStream3ivATI MANGLE(NormalStream3ivATI)
-#define glNormalStream3sATI MANGLE(NormalStream3sATI)
-#define glNormalStream3svATI MANGLE(NormalStream3svATI)
-#define glOrtho MANGLE(Ortho)
-#define glPassTexCoordATI MANGLE(PassTexCoordATI)
-#define glPassThrough MANGLE(PassThrough)
-#define glPixelDataRangeNV MANGLE(PixelDataRangeNV)
-#define glPixelMapfv MANGLE(PixelMapfv)
-#define glPixelMapuiv MANGLE(PixelMapuiv)
-#define glPixelMapusv MANGLE(PixelMapusv)
-#define glPixelStoref MANGLE(PixelStoref)
-#define glPixelStorei MANGLE(PixelStorei)
-#define glPixelTexGenParameterfSGIS MANGLE(PixelTexGenParameterfSGIS)
-#define glPixelTexGenParameterfvSGIS MANGLE(PixelTexGenParameterfvSGIS)
-#define glPixelTexGenParameteriSGIS MANGLE(PixelTexGenParameteriSGIS)
-#define glPixelTexGenParameterivSGIS MANGLE(PixelTexGenParameterivSGIS)
-#define glPixelTexGenSGIX MANGLE(PixelTexGenSGIX)
-#define glPixelTransferf MANGLE(PixelTransferf)
-#define glPixelTransferi MANGLE(PixelTransferi)
-#define glPixelTransformParameterfEXT MANGLE(PixelTransformParameterfEXT)
-#define glPixelTransformParameterfvEXT MANGLE(PixelTransformParameterfvEXT)
-#define glPixelTransformParameteriEXT MANGLE(PixelTransformParameteriEXT)
-#define glPixelTransformParameterivEXT MANGLE(PixelTransformParameterivEXT)
-#define glPixelZoom MANGLE(PixelZoom)
-#define glPNTrianglesfATI MANGLE(PNTrianglesfATI)
-#define glPNTrianglesiATI MANGLE(PNTrianglesiATI)
-#define glPointParameterfARB MANGLE(PointParameterfARB)
-#define glPointParameterfEXT MANGLE(PointParameterfEXT)
-#define glPointParameterf MANGLE(PointParameterf)
-#define glPointParameterfSGIS MANGLE(PointParameterfSGIS)
-#define glPointParameterfvARB MANGLE(PointParameterfvARB)
-#define glPointParameterfvEXT MANGLE(PointParameterfvEXT)
-#define glPointParameterfv MANGLE(PointParameterfv)
-#define glPointParameterfvSGIS MANGLE(PointParameterfvSGIS)
-#define glPointParameteri MANGLE(PointParameteri)
-#define glPointParameteriNV MANGLE(PointParameteriNV)
-#define glPointParameteriv MANGLE(PointParameteriv)
-#define glPointParameterivNV MANGLE(PointParameterivNV)
-#define glPointSize MANGLE(PointSize)
-#define glPollAsyncSGIX MANGLE(PollAsyncSGIX)
-#define glPollInstrumentsSGIX MANGLE(PollInstrumentsSGIX)
-#define glPolygonMode MANGLE(PolygonMode)
-#define glPolygonOffsetEXT MANGLE(PolygonOffsetEXT)
-#define glPolygonOffset MANGLE(PolygonOffset)
-#define glPolygonStipple MANGLE(PolygonStipple)
-#define glPopAttrib MANGLE(PopAttrib)
-#define glPopClientAttrib MANGLE(PopClientAttrib)
-#define glPopMatrix MANGLE(PopMatrix)
-#define glPopName MANGLE(PopName)
-#define glPrimitiveRestartIndexNV MANGLE(PrimitiveRestartIndexNV)
-#define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV)
-#define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT)
-#define glPrioritizeTextures MANGLE(PrioritizeTextures)
-#define glProgramBufferParametersfvNV MANGLE(ProgramBufferParametersfvNV)
-#define glProgramBufferParametersIivNV MANGLE(ProgramBufferParametersIivNV)
-#define glProgramBufferParametersIuivNV MANGLE(ProgramBufferParametersIuivNV)
-#define glProgramCallbackMESA MANGLE(ProgramCallbackMESA)
-#define glProgramEnvParameter4dARB MANGLE(ProgramEnvParameter4dARB)
-#define glProgramEnvParameter4dvARB MANGLE(ProgramEnvParameter4dvARB)
-#define glProgramEnvParameter4fARB MANGLE(ProgramEnvParameter4fARB)
-#define glProgramEnvParameter4fvARB MANGLE(ProgramEnvParameter4fvARB)
-#define glProgramEnvParameterI4iNV MANGLE(ProgramEnvParameterI4iNV)
-#define glProgramEnvParameterI4ivNV MANGLE(ProgramEnvParameterI4ivNV)
-#define glProgramEnvParameterI4uiNV MANGLE(ProgramEnvParameterI4uiNV)
-#define glProgramEnvParameterI4uivNV MANGLE(ProgramEnvParameterI4uivNV)
-#define glProgramEnvParameters4fvEXT MANGLE(ProgramEnvParameters4fvEXT)
-#define glProgramEnvParametersI4ivNV MANGLE(ProgramEnvParametersI4ivNV)
-#define glProgramEnvParametersI4uivNV MANGLE(ProgramEnvParametersI4uivNV)
-#define glProgramLocalParameter4dARB MANGLE(ProgramLocalParameter4dARB)
-#define glProgramLocalParameter4dvARB MANGLE(ProgramLocalParameter4dvARB)
-#define glProgramLocalParameter4fARB MANGLE(ProgramLocalParameter4fARB)
-#define glProgramLocalParameter4fvARB MANGLE(ProgramLocalParameter4fvARB)
-#define glProgramLocalParameterI4iNV MANGLE(ProgramLocalParameterI4iNV)
-#define glProgramLocalParameterI4ivNV MANGLE(ProgramLocalParameterI4ivNV)
-#define glProgramLocalParameterI4uiNV MANGLE(ProgramLocalParameterI4uiNV)
-#define glProgramLocalParameterI4uivNV MANGLE(ProgramLocalParameterI4uivNV)
-#define glProgramLocalParameters4fvEXT MANGLE(ProgramLocalParameters4fvEXT)
-#define glProgramLocalParametersI4ivNV MANGLE(ProgramLocalParametersI4ivNV)
-#define glProgramLocalParametersI4uivNV MANGLE(ProgramLocalParametersI4uivNV)
-#define glProgramNamedParameter4dNV MANGLE(ProgramNamedParameter4dNV)
-#define glProgramNamedParameter4dvNV MANGLE(ProgramNamedParameter4dvNV)
-#define glProgramNamedParameter4fNV MANGLE(ProgramNamedParameter4fNV)
-#define glProgramNamedParameter4fvNV MANGLE(ProgramNamedParameter4fvNV)
-#define glProgramParameter4dNV MANGLE(ProgramParameter4dNV)
-#define glProgramParameter4dvNV MANGLE(ProgramParameter4dvNV)
-#define glProgramParameter4fNV MANGLE(ProgramParameter4fNV)
-#define glProgramParameter4fvNV MANGLE(ProgramParameter4fvNV)
-#define glProgramParameteriEXT MANGLE(ProgramParameteriEXT)
-#define glProgramParameters4dvNV MANGLE(ProgramParameters4dvNV)
-#define glProgramParameters4fvNV MANGLE(ProgramParameters4fvNV)
-#define glProgramStringARB MANGLE(ProgramStringARB)
-#define glProgramVertexLimitNV MANGLE(ProgramVertexLimitNV)
-#define glPushAttrib MANGLE(PushAttrib)
-#define glPushClientAttrib MANGLE(PushClientAttrib)
-#define glPushMatrix MANGLE(PushMatrix)
-#define glPushName MANGLE(PushName)
-#define glRasterPos2d MANGLE(RasterPos2d)
-#define glRasterPos2dv MANGLE(RasterPos2dv)
-#define glRasterPos2f MANGLE(RasterPos2f)
-#define glRasterPos2fv MANGLE(RasterPos2fv)
-#define glRasterPos2i MANGLE(RasterPos2i)
-#define glRasterPos2iv MANGLE(RasterPos2iv)
-#define glRasterPos2s MANGLE(RasterPos2s)
-#define glRasterPos2sv MANGLE(RasterPos2sv)
-#define glRasterPos3d MANGLE(RasterPos3d)
-#define glRasterPos3dv MANGLE(RasterPos3dv)
-#define glRasterPos3f MANGLE(RasterPos3f)
-#define glRasterPos3fv MANGLE(RasterPos3fv)
-#define glRasterPos3i MANGLE(RasterPos3i)
-#define glRasterPos3iv MANGLE(RasterPos3iv)
-#define glRasterPos3s MANGLE(RasterPos3s)
-#define glRasterPos3sv MANGLE(RasterPos3sv)
-#define glRasterPos4d MANGLE(RasterPos4d)
-#define glRasterPos4dv MANGLE(RasterPos4dv)
-#define glRasterPos4f MANGLE(RasterPos4f)
-#define glRasterPos4fv MANGLE(RasterPos4fv)
-#define glRasterPos4i MANGLE(RasterPos4i)
-#define glRasterPos4iv MANGLE(RasterPos4iv)
-#define glRasterPos4s MANGLE(RasterPos4s)
-#define glRasterPos4sv MANGLE(RasterPos4sv)
-#define glReadBuffer MANGLE(ReadBuffer)
-#define glReadInstrumentsSGIX MANGLE(ReadInstrumentsSGIX)
-#define glReadPixels MANGLE(ReadPixels)
-#define glRectd MANGLE(Rectd)
-#define glRectdv MANGLE(Rectdv)
-#define glRectf MANGLE(Rectf)
-#define glRectfv MANGLE(Rectfv)
-#define glRecti MANGLE(Recti)
-#define glRectiv MANGLE(Rectiv)
-#define glRects MANGLE(Rects)
-#define glRectsv MANGLE(Rectsv)
-#define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX)
-#define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT)
-#define glRenderbufferStorageMultisampleCoverageNV MANGLE(RenderbufferStorageMultisampleCoverageNV)
-#define glRenderbufferStorageMultisampleEXT MANGLE(RenderbufferStorageMultisampleEXT)
-#define glRenderMode MANGLE(RenderMode)
-#define glReplacementCodePointerSUN MANGLE(ReplacementCodePointerSUN)
-#define glReplacementCodeubSUN MANGLE(ReplacementCodeubSUN)
-#define glReplacementCodeubvSUN MANGLE(ReplacementCodeubvSUN)
-#define glReplacementCodeuiColor3fVertex3fSUN MANGLE(ReplacementCodeuiColor3fVertex3fSUN)
-#define glReplacementCodeuiColor3fVertex3fvSUN MANGLE(ReplacementCodeuiColor3fVertex3fvSUN)
-#define glReplacementCodeuiColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN)
-#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiColor4ubVertex3fSUN MANGLE(ReplacementCodeuiColor4ubVertex3fSUN)
-#define glReplacementCodeuiColor4ubVertex3fvSUN MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN)
-#define glReplacementCodeuiNormal3fVertex3fSUN MANGLE(ReplacementCodeuiNormal3fVertex3fSUN)
-#define glReplacementCodeuiNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN)
-#define glReplacementCodeuiSUN MANGLE(ReplacementCodeuiSUN)
-#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN)
-#define glReplacementCodeuiVertex3fSUN MANGLE(ReplacementCodeuiVertex3fSUN)
-#define glReplacementCodeuiVertex3fvSUN MANGLE(ReplacementCodeuiVertex3fvSUN)
-#define glReplacementCodeuivSUN MANGLE(ReplacementCodeuivSUN)
-#define glReplacementCodeusSUN MANGLE(ReplacementCodeusSUN)
-#define glReplacementCodeusvSUN MANGLE(ReplacementCodeusvSUN)
-#define glRequestResidentProgramsNV MANGLE(RequestResidentProgramsNV)
-#define glResetHistogramEXT MANGLE(ResetHistogramEXT)
-#define glResetHistogram MANGLE(ResetHistogram)
-#define glResetMinmaxEXT MANGLE(ResetMinmaxEXT)
-#define glResetMinmax MANGLE(ResetMinmax)
-#define glResizeBuffersMESA MANGLE(ResizeBuffersMESA)
-#define glRotated MANGLE(Rotated)
-#define glRotatef MANGLE(Rotatef)
-#define glSampleCoverageARB MANGLE(SampleCoverageARB)
-#define glSampleCoverage MANGLE(SampleCoverage)
-#define glSampleMapATI MANGLE(SampleMapATI)
-#define glSampleMaskEXT MANGLE(SampleMaskEXT)
-#define glSampleMaskSGIS MANGLE(SampleMaskSGIS)
-#define glSamplePatternEXT MANGLE(SamplePatternEXT)
-#define glSamplePatternSGIS MANGLE(SamplePatternSGIS)
-#define glScaled MANGLE(Scaled)
-#define glScalef MANGLE(Scalef)
-#define glScissor MANGLE(Scissor)
-#define glSecondaryColor3bEXT MANGLE(SecondaryColor3bEXT)
-#define glSecondaryColor3b MANGLE(SecondaryColor3b)
-#define glSecondaryColor3bvEXT MANGLE(SecondaryColor3bvEXT)
-#define glSecondaryColor3bv MANGLE(SecondaryColor3bv)
-#define glSecondaryColor3dEXT MANGLE(SecondaryColor3dEXT)
-#define glSecondaryColor3d MANGLE(SecondaryColor3d)
-#define glSecondaryColor3dvEXT MANGLE(SecondaryColor3dvEXT)
-#define glSecondaryColor3dv MANGLE(SecondaryColor3dv)
-#define glSecondaryColor3fEXT MANGLE(SecondaryColor3fEXT)
-#define glSecondaryColor3f MANGLE(SecondaryColor3f)
-#define glSecondaryColor3fvEXT MANGLE(SecondaryColor3fvEXT)
-#define glSecondaryColor3fv MANGLE(SecondaryColor3fv)
-#define glSecondaryColor3hNV MANGLE(SecondaryColor3hNV)
-#define glSecondaryColor3hvNV MANGLE(SecondaryColor3hvNV)
-#define glSecondaryColor3iEXT MANGLE(SecondaryColor3iEXT)
-#define glSecondaryColor3i MANGLE(SecondaryColor3i)
-#define glSecondaryColor3ivEXT MANGLE(SecondaryColor3ivEXT)
-#define glSecondaryColor3iv MANGLE(SecondaryColor3iv)
-#define glSecondaryColor3sEXT MANGLE(SecondaryColor3sEXT)
-#define glSecondaryColor3s MANGLE(SecondaryColor3s)
-#define glSecondaryColor3svEXT MANGLE(SecondaryColor3svEXT)
-#define glSecondaryColor3sv MANGLE(SecondaryColor3sv)
-#define glSecondaryColor3ubEXT MANGLE(SecondaryColor3ubEXT)
-#define glSecondaryColor3ub MANGLE(SecondaryColor3ub)
-#define glSecondaryColor3ubvEXT MANGLE(SecondaryColor3ubvEXT)
-#define glSecondaryColor3ubv MANGLE(SecondaryColor3ubv)
-#define glSecondaryColor3uiEXT MANGLE(SecondaryColor3uiEXT)
-#define glSecondaryColor3ui MANGLE(SecondaryColor3ui)
-#define glSecondaryColor3uivEXT MANGLE(SecondaryColor3uivEXT)
-#define glSecondaryColor3uiv MANGLE(SecondaryColor3uiv)
-#define glSecondaryColor3usEXT MANGLE(SecondaryColor3usEXT)
-#define glSecondaryColor3us MANGLE(SecondaryColor3us)
-#define glSecondaryColor3usvEXT MANGLE(SecondaryColor3usvEXT)
-#define glSecondaryColor3usv MANGLE(SecondaryColor3usv)
-#define glSecondaryColorPointerEXT MANGLE(SecondaryColorPointerEXT)
-#define glSecondaryColorPointerListIBM MANGLE(SecondaryColorPointerListIBM)
-#define glSecondaryColorPointer MANGLE(SecondaryColorPointer)
-#define glSelectBuffer MANGLE(SelectBuffer)
-#define glSeparableFilter2DEXT MANGLE(SeparableFilter2DEXT)
-#define glSeparableFilter2D MANGLE(SeparableFilter2D)
-#define glSetFenceAPPLE MANGLE(SetFenceAPPLE)
-#define glSetFenceNV MANGLE(SetFenceNV)
-#define glSetFragmentShaderConstantATI MANGLE(SetFragmentShaderConstantATI)
-#define glSetInvariantEXT MANGLE(SetInvariantEXT)
-#define glSetLocalConstantEXT MANGLE(SetLocalConstantEXT)
-#define glShadeModel MANGLE(ShadeModel)
-#define glShaderOp1EXT MANGLE(ShaderOp1EXT)
-#define glShaderOp2EXT MANGLE(ShaderOp2EXT)
-#define glShaderOp3EXT MANGLE(ShaderOp3EXT)
-#define glShaderSourceARB MANGLE(ShaderSourceARB)
-#define glShaderSource MANGLE(ShaderSource)
-#define glSharpenTexFuncSGIS MANGLE(SharpenTexFuncSGIS)
-#define glSpriteParameterfSGIX MANGLE(SpriteParameterfSGIX)
-#define glSpriteParameterfvSGIX MANGLE(SpriteParameterfvSGIX)
-#define glSpriteParameteriSGIX MANGLE(SpriteParameteriSGIX)
-#define glSpriteParameterivSGIX MANGLE(SpriteParameterivSGIX)
-#define glStartInstrumentsSGIX MANGLE(StartInstrumentsSGIX)
-#define glStencilClearTagEXT MANGLE(StencilClearTagEXT)
-#define glStencilFunc MANGLE(StencilFunc)
-#define glStencilFuncSeparateATI MANGLE(StencilFuncSeparateATI)
-#define glStencilFuncSeparate MANGLE(StencilFuncSeparate)
-#define glStencilMask MANGLE(StencilMask)
-#define glStencilMaskSeparate MANGLE(StencilMaskSeparate)
-#define glStencilOp MANGLE(StencilOp)
-#define glStencilOpSeparateATI MANGLE(StencilOpSeparateATI)
-#define glStencilOpSeparate MANGLE(StencilOpSeparate)
-#define glStopInstrumentsSGIX MANGLE(StopInstrumentsSGIX)
-#define glStringMarkerGREMEDY MANGLE(StringMarkerGREMEDY)
-#define glSwizzleEXT MANGLE(SwizzleEXT)
-#define glTagSampleBufferSGIX MANGLE(TagSampleBufferSGIX)
-#define glTangent3bEXT MANGLE(Tangent3bEXT)
-#define glTangent3bvEXT MANGLE(Tangent3bvEXT)
-#define glTangent3dEXT MANGLE(Tangent3dEXT)
-#define glTangent3dvEXT MANGLE(Tangent3dvEXT)
-#define glTangent3fEXT MANGLE(Tangent3fEXT)
-#define glTangent3fvEXT MANGLE(Tangent3fvEXT)
-#define glTangent3iEXT MANGLE(Tangent3iEXT)
-#define glTangent3ivEXT MANGLE(Tangent3ivEXT)
-#define glTangent3sEXT MANGLE(Tangent3sEXT)
-#define glTangent3svEXT MANGLE(Tangent3svEXT)
-#define glTangentPointerEXT MANGLE(TangentPointerEXT)
-#define glTbufferMask3DFX MANGLE(TbufferMask3DFX)
-#define glTestFenceAPPLE MANGLE(TestFenceAPPLE)
-#define glTestFenceNV MANGLE(TestFenceNV)
-#define glTestObjectAPPLE MANGLE(TestObjectAPPLE)
-#define glTexBufferEXT MANGLE(TexBufferEXT)
-#define glTexBumpParameterfvATI MANGLE(TexBumpParameterfvATI)
-#define glTexBumpParameterivATI MANGLE(TexBumpParameterivATI)
-#define glTexCoord1d MANGLE(TexCoord1d)
-#define glTexCoord1dv MANGLE(TexCoord1dv)
-#define glTexCoord1f MANGLE(TexCoord1f)
-#define glTexCoord1fv MANGLE(TexCoord1fv)
-#define glTexCoord1hNV MANGLE(TexCoord1hNV)
-#define glTexCoord1hvNV MANGLE(TexCoord1hvNV)
-#define glTexCoord1i MANGLE(TexCoord1i)
-#define glTexCoord1iv MANGLE(TexCoord1iv)
-#define glTexCoord1s MANGLE(TexCoord1s)
-#define glTexCoord1sv MANGLE(TexCoord1sv)
-#define glTexCoord2d MANGLE(TexCoord2d)
-#define glTexCoord2dv MANGLE(TexCoord2dv)
-#define glTexCoord2fColor3fVertex3fSUN MANGLE(TexCoord2fColor3fVertex3fSUN)
-#define glTexCoord2fColor3fVertex3fvSUN MANGLE(TexCoord2fColor3fVertex3fvSUN)
-#define glTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN)
-#define glTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN)
-#define glTexCoord2fColor4ubVertex3fSUN MANGLE(TexCoord2fColor4ubVertex3fSUN)
-#define glTexCoord2fColor4ubVertex3fvSUN MANGLE(TexCoord2fColor4ubVertex3fvSUN)
-#define glTexCoord2f MANGLE(TexCoord2f)
-#define glTexCoord2fNormal3fVertex3fSUN MANGLE(TexCoord2fNormal3fVertex3fSUN)
-#define glTexCoord2fNormal3fVertex3fvSUN MANGLE(TexCoord2fNormal3fVertex3fvSUN)
-#define glTexCoord2fVertex3fSUN MANGLE(TexCoord2fVertex3fSUN)
-#define glTexCoord2fVertex3fvSUN MANGLE(TexCoord2fVertex3fvSUN)
-#define glTexCoord2fv MANGLE(TexCoord2fv)
-#define glTexCoord2hNV MANGLE(TexCoord2hNV)
-#define glTexCoord2hvNV MANGLE(TexCoord2hvNV)
-#define glTexCoord2i MANGLE(TexCoord2i)
-#define glTexCoord2iv MANGLE(TexCoord2iv)
-#define glTexCoord2s MANGLE(TexCoord2s)
-#define glTexCoord2sv MANGLE(TexCoord2sv)
-#define glTexCoord3d MANGLE(TexCoord3d)
-#define glTexCoord3dv MANGLE(TexCoord3dv)
-#define glTexCoord3f MANGLE(TexCoord3f)
-#define glTexCoord3fv MANGLE(TexCoord3fv)
-#define glTexCoord3hNV MANGLE(TexCoord3hNV)
-#define glTexCoord3hvNV MANGLE(TexCoord3hvNV)
-#define glTexCoord3i MANGLE(TexCoord3i)
-#define glTexCoord3iv MANGLE(TexCoord3iv)
-#define glTexCoord3s MANGLE(TexCoord3s)
-#define glTexCoord3sv MANGLE(TexCoord3sv)
-#define glTexCoord4d MANGLE(TexCoord4d)
-#define glTexCoord4dv MANGLE(TexCoord4dv)
-#define glTexCoord4fColor4fNormal3fVertex4fSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN)
-#define glTexCoord4fColor4fNormal3fVertex4fvSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN)
-#define glTexCoord4f MANGLE(TexCoord4f)
-#define glTexCoord4fVertex4fSUN MANGLE(TexCoord4fVertex4fSUN)
-#define glTexCoord4fVertex4fvSUN MANGLE(TexCoord4fVertex4fvSUN)
-#define glTexCoord4fv MANGLE(TexCoord4fv)
-#define glTexCoord4hNV MANGLE(TexCoord4hNV)
-#define glTexCoord4hvNV MANGLE(TexCoord4hvNV)
-#define glTexCoord4i MANGLE(TexCoord4i)
-#define glTexCoord4iv MANGLE(TexCoord4iv)
-#define glTexCoord4s MANGLE(TexCoord4s)
-#define glTexCoord4sv MANGLE(TexCoord4sv)
-#define glTexCoordPointerEXT MANGLE(TexCoordPointerEXT)
-#define glTexCoordPointerListIBM MANGLE(TexCoordPointerListIBM)
-#define glTexCoordPointer MANGLE(TexCoordPointer)
-#define glTexCoordPointervINTEL MANGLE(TexCoordPointervINTEL)
-#define glTexEnvf MANGLE(TexEnvf)
-#define glTexEnvfv MANGLE(TexEnvfv)
-#define glTexEnvi MANGLE(TexEnvi)
-#define glTexEnviv MANGLE(TexEnviv)
-#define glTexFilterFuncSGIS MANGLE(TexFilterFuncSGIS)
-#define glTexGend MANGLE(TexGend)
-#define glTexGendv MANGLE(TexGendv)
-#define glTexGenf MANGLE(TexGenf)
-#define glTexGenfv MANGLE(TexGenfv)
-#define glTexGeni MANGLE(TexGeni)
-#define glTexGeniv MANGLE(TexGeniv)
-#define glTexImage1D MANGLE(TexImage1D)
-#define glTexImage2D MANGLE(TexImage2D)
-#define glTexImage3DEXT MANGLE(TexImage3DEXT)
-#define glTexImage3D MANGLE(TexImage3D)
-#define glTexImage4DSGIS MANGLE(TexImage4DSGIS)
-#define glTexParameterf MANGLE(TexParameterf)
-#define glTexParameterfv MANGLE(TexParameterfv)
-#define glTexParameterIivEXT MANGLE(TexParameterIivEXT)
-#define glTexParameteri MANGLE(TexParameteri)
-#define glTexParameterIuivEXT MANGLE(TexParameterIuivEXT)
-#define glTexParameteriv MANGLE(TexParameteriv)
-#define glTexSubImage1DEXT MANGLE(TexSubImage1DEXT)
-#define glTexSubImage1D MANGLE(TexSubImage1D)
-#define glTexSubImage2DEXT MANGLE(TexSubImage2DEXT)
-#define glTexSubImage2D MANGLE(TexSubImage2D)
-#define glTexSubImage3DEXT MANGLE(TexSubImage3DEXT)
-#define glTexSubImage3D MANGLE(TexSubImage3D)
-#define glTexSubImage4DSGIS MANGLE(TexSubImage4DSGIS)
-#define glTextureColorMaskSGIS MANGLE(TextureColorMaskSGIS)
-#define glTextureLightEXT MANGLE(TextureLightEXT)
-#define glTextureMaterialEXT MANGLE(TextureMaterialEXT)
-#define glTextureNormalEXT MANGLE(TextureNormalEXT)
-#define glTrackMatrixNV MANGLE(TrackMatrixNV)
-#define glTransformFeedbackAttribsNV MANGLE(TransformFeedbackAttribsNV)
-#define glTransformFeedbackVaryingsNV MANGLE(TransformFeedbackVaryingsNV)
-#define glTranslated MANGLE(Translated)
-#define glTranslatef MANGLE(Translatef)
-#define glUniform1fARB MANGLE(Uniform1fARB)
-#define glUniform1f MANGLE(Uniform1f)
-#define glUniform1fvARB MANGLE(Uniform1fvARB)
-#define glUniform1fv MANGLE(Uniform1fv)
-#define glUniform1iARB MANGLE(Uniform1iARB)
-#define glUniform1i MANGLE(Uniform1i)
-#define glUniform1ivARB MANGLE(Uniform1ivARB)
-#define glUniform1iv MANGLE(Uniform1iv)
-#define glUniform1uiEXT MANGLE(Uniform1uiEXT)
-#define glUniform1uivEXT MANGLE(Uniform1uivEXT)
-#define glUniform2fARB MANGLE(Uniform2fARB)
-#define glUniform2f MANGLE(Uniform2f)
-#define glUniform2fvARB MANGLE(Uniform2fvARB)
-#define glUniform2fv MANGLE(Uniform2fv)
-#define glUniform2iARB MANGLE(Uniform2iARB)
-#define glUniform2i MANGLE(Uniform2i)
-#define glUniform2ivARB MANGLE(Uniform2ivARB)
-#define glUniform2iv MANGLE(Uniform2iv)
-#define glUniform2uiEXT MANGLE(Uniform2uiEXT)
-#define glUniform2uivEXT MANGLE(Uniform2uivEXT)
-#define glUniform3fARB MANGLE(Uniform3fARB)
-#define glUniform3f MANGLE(Uniform3f)
-#define glUniform3fvARB MANGLE(Uniform3fvARB)
-#define glUniform3fv MANGLE(Uniform3fv)
-#define glUniform3iARB MANGLE(Uniform3iARB)
-#define glUniform3i MANGLE(Uniform3i)
-#define glUniform3ivARB MANGLE(Uniform3ivARB)
-#define glUniform3iv MANGLE(Uniform3iv)
-#define glUniform3uiEXT MANGLE(Uniform3uiEXT)
-#define glUniform3uivEXT MANGLE(Uniform3uivEXT)
-#define glUniform4fARB MANGLE(Uniform4fARB)
-#define glUniform4f MANGLE(Uniform4f)
-#define glUniform4fvARB MANGLE(Uniform4fvARB)
-#define glUniform4fv MANGLE(Uniform4fv)
-#define glUniform4iARB MANGLE(Uniform4iARB)
-#define glUniform4i MANGLE(Uniform4i)
-#define glUniform4ivARB MANGLE(Uniform4ivARB)
-#define glUniform4iv MANGLE(Uniform4iv)
-#define glUniform4uiEXT MANGLE(Uniform4uiEXT)
-#define glUniform4uivEXT MANGLE(Uniform4uivEXT)
-#define glUniformBufferEXT MANGLE(UniformBufferEXT)
-#define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB)
-#define glUniformMatrix2fv MANGLE(UniformMatrix2fv)
-#define glUniformMatrix2x3fv MANGLE(UniformMatrix2x3fv)
-#define glUniformMatrix2x4fv MANGLE(UniformMatrix2x4fv)
-#define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB)
-#define glUniformMatrix3fv MANGLE(UniformMatrix3fv)
-#define glUniformMatrix3x2fv MANGLE(UniformMatrix3x2fv)
-#define glUniformMatrix3x4fv MANGLE(UniformMatrix3x4fv)
-#define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB)
-#define glUniformMatrix4fv MANGLE(UniformMatrix4fv)
-#define glUniformMatrix4x2fv MANGLE(UniformMatrix4x2fv)
-#define glUniformMatrix4x3fv MANGLE(UniformMatrix4x3fv)
-#define glUnlockArraysEXT MANGLE(UnlockArraysEXT)
-#define glUnmapBufferARB MANGLE(UnmapBufferARB)
-#define glUnmapBuffer MANGLE(UnmapBuffer)
-#define glUnmapObjectBufferATI MANGLE(UnmapObjectBufferATI)
-#define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI)
-#define glUseProgram MANGLE(UseProgram)
-#define glUseProgramObjectARB MANGLE(UseProgramObjectARB)
-#define glValidateProgramARB MANGLE(ValidateProgramARB)
-#define glValidateProgram MANGLE(ValidateProgram)
-#define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI)
-#define glVariantbvEXT MANGLE(VariantbvEXT)
-#define glVariantdvEXT MANGLE(VariantdvEXT)
-#define glVariantfvEXT MANGLE(VariantfvEXT)
-#define glVariantivEXT MANGLE(VariantivEXT)
-#define glVariantPointerEXT MANGLE(VariantPointerEXT)
-#define glVariantsvEXT MANGLE(VariantsvEXT)
-#define glVariantubvEXT MANGLE(VariantubvEXT)
-#define glVariantuivEXT MANGLE(VariantuivEXT)
-#define glVariantusvEXT MANGLE(VariantusvEXT)
-#define glVertex2d MANGLE(Vertex2d)
-#define glVertex2dv MANGLE(Vertex2dv)
-#define glVertex2f MANGLE(Vertex2f)
-#define glVertex2fv MANGLE(Vertex2fv)
-#define glVertex2hNV MANGLE(Vertex2hNV)
-#define glVertex2hvNV MANGLE(Vertex2hvNV)
-#define glVertex2i MANGLE(Vertex2i)
-#define glVertex2iv MANGLE(Vertex2iv)
-#define glVertex2s MANGLE(Vertex2s)
-#define glVertex2sv MANGLE(Vertex2sv)
-#define glVertex3d MANGLE(Vertex3d)
-#define glVertex3dv MANGLE(Vertex3dv)
-#define glVertex3f MANGLE(Vertex3f)
-#define glVertex3fv MANGLE(Vertex3fv)
-#define glVertex3hNV MANGLE(Vertex3hNV)
-#define glVertex3hvNV MANGLE(Vertex3hvNV)
-#define glVertex3i MANGLE(Vertex3i)
-#define glVertex3iv MANGLE(Vertex3iv)
-#define glVertex3s MANGLE(Vertex3s)
-#define glVertex3sv MANGLE(Vertex3sv)
-#define glVertex4d MANGLE(Vertex4d)
-#define glVertex4dv MANGLE(Vertex4dv)
-#define glVertex4f MANGLE(Vertex4f)
-#define glVertex4fv MANGLE(Vertex4fv)
-#define glVertex4hNV MANGLE(Vertex4hNV)
-#define glVertex4hvNV MANGLE(Vertex4hvNV)
-#define glVertex4i MANGLE(Vertex4i)
-#define glVertex4iv MANGLE(Vertex4iv)
-#define glVertex4s MANGLE(Vertex4s)
-#define glVertex4sv MANGLE(Vertex4sv)
-#define glVertexArrayParameteriAPPLE MANGLE(VertexArrayParameteriAPPLE)
-#define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE)
-#define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV)
-#define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB)
-#define glVertexAttrib1d MANGLE(VertexAttrib1d)
-#define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV)
-#define glVertexAttrib1dvARB MANGLE(VertexAttrib1dvARB)
-#define glVertexAttrib1dv MANGLE(VertexAttrib1dv)
-#define glVertexAttrib1dvNV MANGLE(VertexAttrib1dvNV)
-#define glVertexAttrib1fARB MANGLE(VertexAttrib1fARB)
-#define glVertexAttrib1f MANGLE(VertexAttrib1f)
-#define glVertexAttrib1fNV MANGLE(VertexAttrib1fNV)
-#define glVertexAttrib1fvARB MANGLE(VertexAttrib1fvARB)
-#define glVertexAttrib1fv MANGLE(VertexAttrib1fv)
-#define glVertexAttrib1fvNV MANGLE(VertexAttrib1fvNV)
-#define glVertexAttrib1hNV MANGLE(VertexAttrib1hNV)
-#define glVertexAttrib1hvNV MANGLE(VertexAttrib1hvNV)
-#define glVertexAttrib1sARB MANGLE(VertexAttrib1sARB)
-#define glVertexAttrib1s MANGLE(VertexAttrib1s)
-#define glVertexAttrib1sNV MANGLE(VertexAttrib1sNV)
-#define glVertexAttrib1svARB MANGLE(VertexAttrib1svARB)
-#define glVertexAttrib1sv MANGLE(VertexAttrib1sv)
-#define glVertexAttrib1svNV MANGLE(VertexAttrib1svNV)
-#define glVertexAttrib2dARB MANGLE(VertexAttrib2dARB)
-#define glVertexAttrib2d MANGLE(VertexAttrib2d)
-#define glVertexAttrib2dNV MANGLE(VertexAttrib2dNV)
-#define glVertexAttrib2dvARB MANGLE(VertexAttrib2dvARB)
-#define glVertexAttrib2dv MANGLE(VertexAttrib2dv)
-#define glVertexAttrib2dvNV MANGLE(VertexAttrib2dvNV)
-#define glVertexAttrib2fARB MANGLE(VertexAttrib2fARB)
-#define glVertexAttrib2f MANGLE(VertexAttrib2f)
-#define glVertexAttrib2fNV MANGLE(VertexAttrib2fNV)
-#define glVertexAttrib2fvARB MANGLE(VertexAttrib2fvARB)
-#define glVertexAttrib2fv MANGLE(VertexAttrib2fv)
-#define glVertexAttrib2fvNV MANGLE(VertexAttrib2fvNV)
-#define glVertexAttrib2hNV MANGLE(VertexAttrib2hNV)
-#define glVertexAttrib2hvNV MANGLE(VertexAttrib2hvNV)
-#define glVertexAttrib2sARB MANGLE(VertexAttrib2sARB)
-#define glVertexAttrib2s MANGLE(VertexAttrib2s)
-#define glVertexAttrib2sNV MANGLE(VertexAttrib2sNV)
-#define glVertexAttrib2svARB MANGLE(VertexAttrib2svARB)
-#define glVertexAttrib2sv MANGLE(VertexAttrib2sv)
-#define glVertexAttrib2svNV MANGLE(VertexAttrib2svNV)
-#define glVertexAttrib3dARB MANGLE(VertexAttrib3dARB)
-#define glVertexAttrib3d MANGLE(VertexAttrib3d)
-#define glVertexAttrib3dNV MANGLE(VertexAttrib3dNV)
-#define glVertexAttrib3dvARB MANGLE(VertexAttrib3dvARB)
-#define glVertexAttrib3dv MANGLE(VertexAttrib3dv)
-#define glVertexAttrib3dvNV MANGLE(VertexAttrib3dvNV)
-#define glVertexAttrib3fARB MANGLE(VertexAttrib3fARB)
-#define glVertexAttrib3f MANGLE(VertexAttrib3f)
-#define glVertexAttrib3fNV MANGLE(VertexAttrib3fNV)
-#define glVertexAttrib3fvARB MANGLE(VertexAttrib3fvARB)
-#define glVertexAttrib3fv MANGLE(VertexAttrib3fv)
-#define glVertexAttrib3fvNV MANGLE(VertexAttrib3fvNV)
-#define glVertexAttrib3hNV MANGLE(VertexAttrib3hNV)
-#define glVertexAttrib3hvNV MANGLE(VertexAttrib3hvNV)
-#define glVertexAttrib3sARB MANGLE(VertexAttrib3sARB)
-#define glVertexAttrib3s MANGLE(VertexAttrib3s)
-#define glVertexAttrib3sNV MANGLE(VertexAttrib3sNV)
-#define glVertexAttrib3svARB MANGLE(VertexAttrib3svARB)
-#define glVertexAttrib3sv MANGLE(VertexAttrib3sv)
-#define glVertexAttrib3svNV MANGLE(VertexAttrib3svNV)
-#define glVertexAttrib4bvARB MANGLE(VertexAttrib4bvARB)
-#define glVertexAttrib4bv MANGLE(VertexAttrib4bv)
-#define glVertexAttrib4dARB MANGLE(VertexAttrib4dARB)
-#define glVertexAttrib4d MANGLE(VertexAttrib4d)
-#define glVertexAttrib4dNV MANGLE(VertexAttrib4dNV)
-#define glVertexAttrib4dvARB MANGLE(VertexAttrib4dvARB)
-#define glVertexAttrib4dv MANGLE(VertexAttrib4dv)
-#define glVertexAttrib4dvNV MANGLE(VertexAttrib4dvNV)
-#define glVertexAttrib4fARB MANGLE(VertexAttrib4fARB)
-#define glVertexAttrib4f MANGLE(VertexAttrib4f)
-#define glVertexAttrib4fNV MANGLE(VertexAttrib4fNV)
-#define glVertexAttrib4fvARB MANGLE(VertexAttrib4fvARB)
-#define glVertexAttrib4fv MANGLE(VertexAttrib4fv)
-#define glVertexAttrib4fvNV MANGLE(VertexAttrib4fvNV)
-#define glVertexAttrib4hNV MANGLE(VertexAttrib4hNV)
-#define glVertexAttrib4hvNV MANGLE(VertexAttrib4hvNV)
-#define glVertexAttrib4ivARB MANGLE(VertexAttrib4ivARB)
-#define glVertexAttrib4iv MANGLE(VertexAttrib4iv)
-#define glVertexAttrib4NbvARB MANGLE(VertexAttrib4NbvARB)
-#define glVertexAttrib4Nbv MANGLE(VertexAttrib4Nbv)
-#define glVertexAttrib4NivARB MANGLE(VertexAttrib4NivARB)
-#define glVertexAttrib4Niv MANGLE(VertexAttrib4Niv)
-#define glVertexAttrib4NsvARB MANGLE(VertexAttrib4NsvARB)
-#define glVertexAttrib4Nsv MANGLE(VertexAttrib4Nsv)
-#define glVertexAttrib4NubARB MANGLE(VertexAttrib4NubARB)
-#define glVertexAttrib4Nub MANGLE(VertexAttrib4Nub)
-#define glVertexAttrib4NubvARB MANGLE(VertexAttrib4NubvARB)
-#define glVertexAttrib4Nubv MANGLE(VertexAttrib4Nubv)
-#define glVertexAttrib4NuivARB MANGLE(VertexAttrib4NuivARB)
-#define glVertexAttrib4Nuiv MANGLE(VertexAttrib4Nuiv)
-#define glVertexAttrib4NusvARB MANGLE(VertexAttrib4NusvARB)
-#define glVertexAttrib4Nusv MANGLE(VertexAttrib4Nusv)
-#define glVertexAttrib4sARB MANGLE(VertexAttrib4sARB)
-#define glVertexAttrib4s MANGLE(VertexAttrib4s)
-#define glVertexAttrib4sNV MANGLE(VertexAttrib4sNV)
-#define glVertexAttrib4svARB MANGLE(VertexAttrib4svARB)
-#define glVertexAttrib4sv MANGLE(VertexAttrib4sv)
-#define glVertexAttrib4svNV MANGLE(VertexAttrib4svNV)
-#define glVertexAttrib4ubNV MANGLE(VertexAttrib4ubNV)
-#define glVertexAttrib4ubvARB MANGLE(VertexAttrib4ubvARB)
-#define glVertexAttrib4ubv MANGLE(VertexAttrib4ubv)
-#define glVertexAttrib4ubvNV MANGLE(VertexAttrib4ubvNV)
-#define glVertexAttrib4uivARB MANGLE(VertexAttrib4uivARB)
-#define glVertexAttrib4uiv MANGLE(VertexAttrib4uiv)
-#define glVertexAttrib4usvARB MANGLE(VertexAttrib4usvARB)
-#define glVertexAttrib4usv MANGLE(VertexAttrib4usv)
-#define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI)
-#define glVertexAttribI1iEXT MANGLE(VertexAttribI1iEXT)
-#define glVertexAttribI1ivEXT MANGLE(VertexAttribI1ivEXT)
-#define glVertexAttribI1uiEXT MANGLE(VertexAttribI1uiEXT)
-#define glVertexAttribI1uivEXT MANGLE(VertexAttribI1uivEXT)
-#define glVertexAttribI2iEXT MANGLE(VertexAttribI2iEXT)
-#define glVertexAttribI2ivEXT MANGLE(VertexAttribI2ivEXT)
-#define glVertexAttribI2uiEXT MANGLE(VertexAttribI2uiEXT)
-#define glVertexAttribI2uivEXT MANGLE(VertexAttribI2uivEXT)
-#define glVertexAttribI3iEXT MANGLE(VertexAttribI3iEXT)
-#define glVertexAttribI3ivEXT MANGLE(VertexAttribI3ivEXT)
-#define glVertexAttribI3uiEXT MANGLE(VertexAttribI3uiEXT)
-#define glVertexAttribI3uivEXT MANGLE(VertexAttribI3uivEXT)
-#define glVertexAttribI4bvEXT MANGLE(VertexAttribI4bvEXT)
-#define glVertexAttribI4iEXT MANGLE(VertexAttribI4iEXT)
-#define glVertexAttribI4ivEXT MANGLE(VertexAttribI4ivEXT)
-#define glVertexAttribI4svEXT MANGLE(VertexAttribI4svEXT)
-#define glVertexAttribI4ubvEXT MANGLE(VertexAttribI4ubvEXT)
-#define glVertexAttribI4uiEXT MANGLE(VertexAttribI4uiEXT)
-#define glVertexAttribI4uivEXT MANGLE(VertexAttribI4uivEXT)
-#define glVertexAttribI4usvEXT MANGLE(VertexAttribI4usvEXT)
-#define glVertexAttribIPointerEXT MANGLE(VertexAttribIPointerEXT)
-#define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB)
-#define glVertexAttribPointer MANGLE(VertexAttribPointer)
-#define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV)
-#define glVertexAttribs1dvNV MANGLE(VertexAttribs1dvNV)
-#define glVertexAttribs1fvNV MANGLE(VertexAttribs1fvNV)
-#define glVertexAttribs1hvNV MANGLE(VertexAttribs1hvNV)
-#define glVertexAttribs1svNV MANGLE(VertexAttribs1svNV)
-#define glVertexAttribs2dvNV MANGLE(VertexAttribs2dvNV)
-#define glVertexAttribs2fvNV MANGLE(VertexAttribs2fvNV)
-#define glVertexAttribs2hvNV MANGLE(VertexAttribs2hvNV)
-#define glVertexAttribs2svNV MANGLE(VertexAttribs2svNV)
-#define glVertexAttribs3dvNV MANGLE(VertexAttribs3dvNV)
-#define glVertexAttribs3fvNV MANGLE(VertexAttribs3fvNV)
-#define glVertexAttribs3hvNV MANGLE(VertexAttribs3hvNV)
-#define glVertexAttribs3svNV MANGLE(VertexAttribs3svNV)
-#define glVertexAttribs4dvNV MANGLE(VertexAttribs4dvNV)
-#define glVertexAttribs4fvNV MANGLE(VertexAttribs4fvNV)
-#define glVertexAttribs4hvNV MANGLE(VertexAttribs4hvNV)
-#define glVertexAttribs4svNV MANGLE(VertexAttribs4svNV)
-#define glVertexAttribs4ubvNV MANGLE(VertexAttribs4ubvNV)
-#define glVertexBlendARB MANGLE(VertexBlendARB)
-#define glVertexBlendEnvfATI MANGLE(VertexBlendEnvfATI)
-#define glVertexBlendEnviATI MANGLE(VertexBlendEnviATI)
-#define glVertexPointerEXT MANGLE(VertexPointerEXT)
-#define glVertexPointerListIBM MANGLE(VertexPointerListIBM)
-#define glVertexPointer MANGLE(VertexPointer)
-#define glVertexPointervINTEL MANGLE(VertexPointervINTEL)
-#define glVertexStream1dATI MANGLE(VertexStream1dATI)
-#define glVertexStream1dvATI MANGLE(VertexStream1dvATI)
-#define glVertexStream1fATI MANGLE(VertexStream1fATI)
-#define glVertexStream1fvATI MANGLE(VertexStream1fvATI)
-#define glVertexStream1iATI MANGLE(VertexStream1iATI)
-#define glVertexStream1ivATI MANGLE(VertexStream1ivATI)
-#define glVertexStream1sATI MANGLE(VertexStream1sATI)
-#define glVertexStream1svATI MANGLE(VertexStream1svATI)
-#define glVertexStream2dATI MANGLE(VertexStream2dATI)
-#define glVertexStream2dvATI MANGLE(VertexStream2dvATI)
-#define glVertexStream2fATI MANGLE(VertexStream2fATI)
-#define glVertexStream2fvATI MANGLE(VertexStream2fvATI)
-#define glVertexStream2iATI MANGLE(VertexStream2iATI)
-#define glVertexStream2ivATI MANGLE(VertexStream2ivATI)
-#define glVertexStream2sATI MANGLE(VertexStream2sATI)
-#define glVertexStream2svATI MANGLE(VertexStream2svATI)
-#define glVertexStream3dATI MANGLE(VertexStream3dATI)
-#define glVertexStream3dvATI MANGLE(VertexStream3dvATI)
-#define glVertexStream3fATI MANGLE(VertexStream3fATI)
-#define glVertexStream3fvATI MANGLE(VertexStream3fvATI)
-#define glVertexStream3iATI MANGLE(VertexStream3iATI)
-#define glVertexStream3ivATI MANGLE(VertexStream3ivATI)
-#define glVertexStream3sATI MANGLE(VertexStream3sATI)
-#define glVertexStream3svATI MANGLE(VertexStream3svATI)
-#define glVertexStream4dATI MANGLE(VertexStream4dATI)
-#define glVertexStream4dvATI MANGLE(VertexStream4dvATI)
-#define glVertexStream4fATI MANGLE(VertexStream4fATI)
-#define glVertexStream4fvATI MANGLE(VertexStream4fvATI)
-#define glVertexStream4iATI MANGLE(VertexStream4iATI)
-#define glVertexStream4ivATI MANGLE(VertexStream4ivATI)
-#define glVertexStream4sATI MANGLE(VertexStream4sATI)
-#define glVertexStream4svATI MANGLE(VertexStream4svATI)
-#define glVertexWeightfEXT MANGLE(VertexWeightfEXT)
-#define glVertexWeightfvEXT MANGLE(VertexWeightfvEXT)
-#define glVertexWeighthNV MANGLE(VertexWeighthNV)
-#define glVertexWeighthvNV MANGLE(VertexWeighthvNV)
-#define glVertexWeightPointerEXT MANGLE(VertexWeightPointerEXT)
-#define glViewport MANGLE(Viewport)
-#define glWeightbvARB MANGLE(WeightbvARB)
-#define glWeightdvARB MANGLE(WeightdvARB)
-#define glWeightfvARB MANGLE(WeightfvARB)
-#define glWeightivARB MANGLE(WeightivARB)
-#define glWeightPointerARB MANGLE(WeightPointerARB)
-#define glWeightsvARB MANGLE(WeightsvARB)
-#define glWeightubvARB MANGLE(WeightubvARB)
-#define glWeightuivARB MANGLE(WeightuivARB)
-#define glWeightusvARB MANGLE(WeightusvARB)
-#define glWindowPos2dARB MANGLE(WindowPos2dARB)
-#define glWindowPos2d MANGLE(WindowPos2d)
-#define glWindowPos2dMESA MANGLE(WindowPos2dMESA)
-#define glWindowPos2dvARB MANGLE(WindowPos2dvARB)
-#define glWindowPos2dv MANGLE(WindowPos2dv)
-#define glWindowPos2dvMESA MANGLE(WindowPos2dvMESA)
-#define glWindowPos2fARB MANGLE(WindowPos2fARB)
-#define glWindowPos2f MANGLE(WindowPos2f)
-#define glWindowPos2fMESA MANGLE(WindowPos2fMESA)
-#define glWindowPos2fvARB MANGLE(WindowPos2fvARB)
-#define glWindowPos2fv MANGLE(WindowPos2fv)
-#define glWindowPos2fvMESA MANGLE(WindowPos2fvMESA)
-#define glWindowPos2iARB MANGLE(WindowPos2iARB)
-#define glWindowPos2i MANGLE(WindowPos2i)
-#define glWindowPos2iMESA MANGLE(WindowPos2iMESA)
-#define glWindowPos2ivARB MANGLE(WindowPos2ivARB)
-#define glWindowPos2iv MANGLE(WindowPos2iv)
-#define glWindowPos2ivMESA MANGLE(WindowPos2ivMESA)
-#define glWindowPos2sARB MANGLE(WindowPos2sARB)
-#define glWindowPos2s MANGLE(WindowPos2s)
-#define glWindowPos2sMESA MANGLE(WindowPos2sMESA)
-#define glWindowPos2svARB MANGLE(WindowPos2svARB)
-#define glWindowPos2sv MANGLE(WindowPos2sv)
-#define glWindowPos2svMESA MANGLE(WindowPos2svMESA)
-#define glWindowPos3dARB MANGLE(WindowPos3dARB)
-#define glWindowPos3d MANGLE(WindowPos3d)
-#define glWindowPos3dMESA MANGLE(WindowPos3dMESA)
-#define glWindowPos3dvARB MANGLE(WindowPos3dvARB)
-#define glWindowPos3dv MANGLE(WindowPos3dv)
-#define glWindowPos3dvMESA MANGLE(WindowPos3dvMESA)
-#define glWindowPos3fARB MANGLE(WindowPos3fARB)
-#define glWindowPos3f MANGLE(WindowPos3f)
-#define glWindowPos3fMESA MANGLE(WindowPos3fMESA)
-#define glWindowPos3fvARB MANGLE(WindowPos3fvARB)
-#define glWindowPos3fv MANGLE(WindowPos3fv)
-#define glWindowPos3fvMESA MANGLE(WindowPos3fvMESA)
-#define glWindowPos3iARB MANGLE(WindowPos3iARB)
-#define glWindowPos3i MANGLE(WindowPos3i)
-#define glWindowPos3iMESA MANGLE(WindowPos3iMESA)
-#define glWindowPos3ivARB MANGLE(WindowPos3ivARB)
-#define glWindowPos3iv MANGLE(WindowPos3iv)
-#define glWindowPos3ivMESA MANGLE(WindowPos3ivMESA)
-#define glWindowPos3sARB MANGLE(WindowPos3sARB)
-#define glWindowPos3s MANGLE(WindowPos3s)
-#define glWindowPos3sMESA MANGLE(WindowPos3sMESA)
-#define glWindowPos3svARB MANGLE(WindowPos3svARB)
-#define glWindowPos3sv MANGLE(WindowPos3sv)
-#define glWindowPos3svMESA MANGLE(WindowPos3svMESA)
-#define glWindowPos4dMESA MANGLE(WindowPos4dMESA)
-#define glWindowPos4dvMESA MANGLE(WindowPos4dvMESA)
-#define glWindowPos4fMESA MANGLE(WindowPos4fMESA)
-#define glWindowPos4fvMESA MANGLE(WindowPos4fvMESA)
-#define glWindowPos4iMESA MANGLE(WindowPos4iMESA)
-#define glWindowPos4ivMESA MANGLE(WindowPos4ivMESA)
-#define glWindowPos4sMESA MANGLE(WindowPos4sMESA)
-#define glWindowPos4svMESA MANGLE(WindowPos4svMESA)
-#define glWriteMaskEXT MANGLE(WriteMaskEXT)
+#define glAccum MANGLE(Accum)
+#define glActiveStencilFaceEXT MANGLE(ActiveStencilFaceEXT)
+#define glActiveTextureARB MANGLE(ActiveTextureARB)
+#define glActiveTexture MANGLE(ActiveTexture)
+#define glActiveVaryingNV MANGLE(ActiveVaryingNV)
+#define glAlphaFragmentOp1ATI MANGLE(AlphaFragmentOp1ATI)
+#define glAlphaFragmentOp2ATI MANGLE(AlphaFragmentOp2ATI)
+#define glAlphaFragmentOp3ATI MANGLE(AlphaFragmentOp3ATI)
+#define glAlphaFunc MANGLE(AlphaFunc)
+#define glApplyTextureEXT MANGLE(ApplyTextureEXT)
+#define glAreProgramsResidentNV MANGLE(AreProgramsResidentNV)
+#define glAreTexturesResidentEXT MANGLE(AreTexturesResidentEXT)
+#define glAreTexturesResident MANGLE(AreTexturesResident)
+#define glArrayElementEXT MANGLE(ArrayElementEXT)
+#define glArrayElement MANGLE(ArrayElement)
+#define glArrayObjectATI MANGLE(ArrayObjectATI)
+#define glAsyncMarkerSGIX MANGLE(AsyncMarkerSGIX)
+#define glAttachObjectARB MANGLE(AttachObjectARB)
+#define glAttachShader MANGLE(AttachShader)
+#define glBeginFragmentShaderATI MANGLE(BeginFragmentShaderATI)
+#define glBegin MANGLE(Begin)
+#define glBeginOcclusionQueryNV MANGLE(BeginOcclusionQueryNV)
+#define glBeginQueryARB MANGLE(BeginQueryARB)
+#define glBeginQuery MANGLE(BeginQuery)
+#define glBeginTransformFeedbackNV MANGLE(BeginTransformFeedbackNV)
+#define glBeginVertexShaderEXT MANGLE(BeginVertexShaderEXT)
+#define glBindAttribLocationARB MANGLE(BindAttribLocationARB)
+#define glBindAttribLocation MANGLE(BindAttribLocation)
+#define glBindBufferARB MANGLE(BindBufferARB)
+#define glBindBufferBaseNV MANGLE(BindBufferBaseNV)
+#define glBindBuffer MANGLE(BindBuffer)
+#define glBindBufferOffsetNV MANGLE(BindBufferOffsetNV)
+#define glBindBufferRangeNV MANGLE(BindBufferRangeNV)
+#define glBindFragDataLocationEXT MANGLE(BindFragDataLocationEXT)
+#define glBindFragmentShaderATI MANGLE(BindFragmentShaderATI)
+#define glBindFramebufferEXT MANGLE(BindFramebufferEXT)
+#define glBindLightParameterEXT MANGLE(BindLightParameterEXT)
+#define glBindMaterialParameterEXT MANGLE(BindMaterialParameterEXT)
+#define glBindParameterEXT MANGLE(BindParameterEXT)
+#define glBindProgramARB MANGLE(BindProgramARB)
+#define glBindProgramNV MANGLE(BindProgramNV)
+#define glBindRenderbufferEXT MANGLE(BindRenderbufferEXT)
+#define glBindTexGenParameterEXT MANGLE(BindTexGenParameterEXT)
+#define glBindTextureEXT MANGLE(BindTextureEXT)
+#define glBindTexture MANGLE(BindTexture)
+#define glBindTextureUnitParameterEXT MANGLE(BindTextureUnitParameterEXT)
+#define glBindVertexArrayAPPLE MANGLE(BindVertexArrayAPPLE)
+#define glBindVertexShaderEXT MANGLE(BindVertexShaderEXT)
+#define glBinormal3bEXT MANGLE(Binormal3bEXT)
+#define glBinormal3bvEXT MANGLE(Binormal3bvEXT)
+#define glBinormal3dEXT MANGLE(Binormal3dEXT)
+#define glBinormal3dvEXT MANGLE(Binormal3dvEXT)
+#define glBinormal3fEXT MANGLE(Binormal3fEXT)
+#define glBinormal3fvEXT MANGLE(Binormal3fvEXT)
+#define glBinormal3iEXT MANGLE(Binormal3iEXT)
+#define glBinormal3ivEXT MANGLE(Binormal3ivEXT)
+#define glBinormal3sEXT MANGLE(Binormal3sEXT)
+#define glBinormal3svEXT MANGLE(Binormal3svEXT)
+#define glBinormalPointerEXT MANGLE(BinormalPointerEXT)
+#define glBitmap MANGLE(Bitmap)
+#define glBlendColorEXT MANGLE(BlendColorEXT)
+#define glBlendColor MANGLE(BlendColor)
+#define glBlendEquationEXT MANGLE(BlendEquationEXT)
+#define glBlendEquation MANGLE(BlendEquation)
+#define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI)
+#define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT)
+#define glBlendEquationSeparate MANGLE(BlendEquationSeparate)
+#define glBlendFunc MANGLE(BlendFunc)
+#define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT)
+#define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR)
+#define glBlendFuncSeparate MANGLE(BlendFuncSeparate)
+#define glBlitFramebufferEXT MANGLE(BlitFramebufferEXT)
+#define glBufferDataARB MANGLE(BufferDataARB)
+#define glBufferData MANGLE(BufferData)
+#define glBufferParameteriAPPLE MANGLE(BufferParameteriAPPLE)
+#define glBufferSubDataARB MANGLE(BufferSubDataARB)
+#define glBufferSubData MANGLE(BufferSubData)
+#define glCallList MANGLE(CallList)
+#define glCallLists MANGLE(CallLists)
+#define glCheckFramebufferStatusEXT MANGLE(CheckFramebufferStatusEXT)
+#define glClampColorARB MANGLE(ClampColorARB)
+#define glClearAccum MANGLE(ClearAccum)
+#define glClearColorIiEXT MANGLE(ClearColorIiEXT)
+#define glClearColorIuiEXT MANGLE(ClearColorIuiEXT)
+#define glClearColor MANGLE(ClearColor)
+#define glClearDebugLogMESA MANGLE(ClearDebugLogMESA)
+#define glClearDepthdNV MANGLE(ClearDepthdNV)
+#define glClearDepth MANGLE(ClearDepth)
+#define glClearIndex MANGLE(ClearIndex)
+#define glClear MANGLE(Clear)
+#define glClearStencil MANGLE(ClearStencil)
+#define glClientActiveTextureARB MANGLE(ClientActiveTextureARB)
+#define glClientActiveTexture MANGLE(ClientActiveTexture)
+#define glClientActiveVertexStreamATI MANGLE(ClientActiveVertexStreamATI)
+#define glClipPlane MANGLE(ClipPlane)
+#define glColor3b MANGLE(Color3b)
+#define glColor3bv MANGLE(Color3bv)
+#define glColor3d MANGLE(Color3d)
+#define glColor3dv MANGLE(Color3dv)
+#define glColor3f MANGLE(Color3f)
+#define glColor3fVertex3fSUN MANGLE(Color3fVertex3fSUN)
+#define glColor3fVertex3fvSUN MANGLE(Color3fVertex3fvSUN)
+#define glColor3fv MANGLE(Color3fv)
+#define glColor3hNV MANGLE(Color3hNV)
+#define glColor3hvNV MANGLE(Color3hvNV)
+#define glColor3i MANGLE(Color3i)
+#define glColor3iv MANGLE(Color3iv)
+#define glColor3s MANGLE(Color3s)
+#define glColor3sv MANGLE(Color3sv)
+#define glColor3ub MANGLE(Color3ub)
+#define glColor3ubv MANGLE(Color3ubv)
+#define glColor3ui MANGLE(Color3ui)
+#define glColor3uiv MANGLE(Color3uiv)
+#define glColor3us MANGLE(Color3us)
+#define glColor3usv MANGLE(Color3usv)
+#define glColor4b MANGLE(Color4b)
+#define glColor4bv MANGLE(Color4bv)
+#define glColor4d MANGLE(Color4d)
+#define glColor4dv MANGLE(Color4dv)
+#define glColor4f MANGLE(Color4f)
+#define glColor4fNormal3fVertex3fSUN MANGLE(Color4fNormal3fVertex3fSUN)
+#define glColor4fNormal3fVertex3fvSUN MANGLE(Color4fNormal3fVertex3fvSUN)
+#define glColor4fv MANGLE(Color4fv)
+#define glColor4hNV MANGLE(Color4hNV)
+#define glColor4hvNV MANGLE(Color4hvNV)
+#define glColor4i MANGLE(Color4i)
+#define glColor4iv MANGLE(Color4iv)
+#define glColor4s MANGLE(Color4s)
+#define glColor4sv MANGLE(Color4sv)
+#define glColor4ub MANGLE(Color4ub)
+#define glColor4ubVertex2fSUN MANGLE(Color4ubVertex2fSUN)
+#define glColor4ubVertex2fvSUN MANGLE(Color4ubVertex2fvSUN)
+#define glColor4ubVertex3fSUN MANGLE(Color4ubVertex3fSUN)
+#define glColor4ubVertex3fvSUN MANGLE(Color4ubVertex3fvSUN)
+#define glColor4ubv MANGLE(Color4ubv)
+#define glColor4ui MANGLE(Color4ui)
+#define glColor4uiv MANGLE(Color4uiv)
+#define glColor4us MANGLE(Color4us)
+#define glColor4usv MANGLE(Color4usv)
+#define glColorFragmentOp1ATI MANGLE(ColorFragmentOp1ATI)
+#define glColorFragmentOp2ATI MANGLE(ColorFragmentOp2ATI)
+#define glColorFragmentOp3ATI MANGLE(ColorFragmentOp3ATI)
+#define glColorMaskIndexedEXT MANGLE(ColorMaskIndexedEXT)
+#define glColorMask MANGLE(ColorMask)
+#define glColorMaterial MANGLE(ColorMaterial)
+#define glColorPointerEXT MANGLE(ColorPointerEXT)
+#define glColorPointerListIBM MANGLE(ColorPointerListIBM)
+#define glColorPointer MANGLE(ColorPointer)
+#define glColorPointervINTEL MANGLE(ColorPointervINTEL)
+#define glColorSubTableEXT MANGLE(ColorSubTableEXT)
+#define glColorSubTable MANGLE(ColorSubTable)
+#define glColorTableEXT MANGLE(ColorTableEXT)
+#define glColorTable MANGLE(ColorTable)
+#define glColorTableParameterfv MANGLE(ColorTableParameterfv)
+#define glColorTableParameterfvSGI MANGLE(ColorTableParameterfvSGI)
+#define glColorTableParameteriv MANGLE(ColorTableParameteriv)
+#define glColorTableParameterivSGI MANGLE(ColorTableParameterivSGI)
+#define glColorTableSGI MANGLE(ColorTableSGI)
+#define glCombinerInputNV MANGLE(CombinerInputNV)
+#define glCombinerOutputNV MANGLE(CombinerOutputNV)
+#define glCombinerParameterfNV MANGLE(CombinerParameterfNV)
+#define glCombinerParameterfvNV MANGLE(CombinerParameterfvNV)
+#define glCombinerParameteriNV MANGLE(CombinerParameteriNV)
+#define glCombinerParameterivNV MANGLE(CombinerParameterivNV)
+#define glCombinerStageParameterfvNV MANGLE(CombinerStageParameterfvNV)
+#define glCompileShaderARB MANGLE(CompileShaderARB)
+#define glCompileShader MANGLE(CompileShader)
+#define glCompressedTexImage1DARB MANGLE(CompressedTexImage1DARB)
+#define glCompressedTexImage1D MANGLE(CompressedTexImage1D)
+#define glCompressedTexImage2DARB MANGLE(CompressedTexImage2DARB)
+#define glCompressedTexImage2D MANGLE(CompressedTexImage2D)
+#define glCompressedTexImage3DARB MANGLE(CompressedTexImage3DARB)
+#define glCompressedTexImage3D MANGLE(CompressedTexImage3D)
+#define glCompressedTexSubImage1DARB MANGLE(CompressedTexSubImage1DARB)
+#define glCompressedTexSubImage1D MANGLE(CompressedTexSubImage1D)
+#define glCompressedTexSubImage2DARB MANGLE(CompressedTexSubImage2DARB)
+#define glCompressedTexSubImage2D MANGLE(CompressedTexSubImage2D)
+#define glCompressedTexSubImage3DARB MANGLE(CompressedTexSubImage3DARB)
+#define glCompressedTexSubImage3D MANGLE(CompressedTexSubImage3D)
+#define glConvolutionFilter1DEXT MANGLE(ConvolutionFilter1DEXT)
+#define glConvolutionFilter1D MANGLE(ConvolutionFilter1D)
+#define glConvolutionFilter2DEXT MANGLE(ConvolutionFilter2DEXT)
+#define glConvolutionFilter2D MANGLE(ConvolutionFilter2D)
+#define glConvolutionParameterfEXT MANGLE(ConvolutionParameterfEXT)
+#define glConvolutionParameterf MANGLE(ConvolutionParameterf)
+#define glConvolutionParameterfvEXT MANGLE(ConvolutionParameterfvEXT)
+#define glConvolutionParameterfv MANGLE(ConvolutionParameterfv)
+#define glConvolutionParameteriEXT MANGLE(ConvolutionParameteriEXT)
+#define glConvolutionParameteri MANGLE(ConvolutionParameteri)
+#define glConvolutionParameterivEXT MANGLE(ConvolutionParameterivEXT)
+#define glConvolutionParameteriv MANGLE(ConvolutionParameteriv)
+#define glCopyColorSubTableEXT MANGLE(CopyColorSubTableEXT)
+#define glCopyColorSubTable MANGLE(CopyColorSubTable)
+#define glCopyColorTable MANGLE(CopyColorTable)
+#define glCopyColorTableSGI MANGLE(CopyColorTableSGI)
+#define glCopyConvolutionFilter1DEXT MANGLE(CopyConvolutionFilter1DEXT)
+#define glCopyConvolutionFilter1D MANGLE(CopyConvolutionFilter1D)
+#define glCopyConvolutionFilter2DEXT MANGLE(CopyConvolutionFilter2DEXT)
+#define glCopyConvolutionFilter2D MANGLE(CopyConvolutionFilter2D)
+#define glCopyPixels MANGLE(CopyPixels)
+#define glCopyTexImage1DEXT MANGLE(CopyTexImage1DEXT)
+#define glCopyTexImage1D MANGLE(CopyTexImage1D)
+#define glCopyTexImage2DEXT MANGLE(CopyTexImage2DEXT)
+#define glCopyTexImage2D MANGLE(CopyTexImage2D)
+#define glCopyTexSubImage1DEXT MANGLE(CopyTexSubImage1DEXT)
+#define glCopyTexSubImage1D MANGLE(CopyTexSubImage1D)
+#define glCopyTexSubImage2DEXT MANGLE(CopyTexSubImage2DEXT)
+#define glCopyTexSubImage2D MANGLE(CopyTexSubImage2D)
+#define glCopyTexSubImage3DEXT MANGLE(CopyTexSubImage3DEXT)
+#define glCopyTexSubImage3D MANGLE(CopyTexSubImage3D)
+#define glCreateDebugObjectMESA MANGLE(CreateDebugObjectMESA)
+#define glCreateProgram MANGLE(CreateProgram)
+#define glCreateProgramObjectARB MANGLE(CreateProgramObjectARB)
+#define glCreateShader MANGLE(CreateShader)
+#define glCreateShaderObjectARB MANGLE(CreateShaderObjectARB)
+#define glCullFace MANGLE(CullFace)
+#define glCullParameterdvEXT MANGLE(CullParameterdvEXT)
+#define glCullParameterfvEXT MANGLE(CullParameterfvEXT)
+#define glCurrentPaletteMatrixARB MANGLE(CurrentPaletteMatrixARB)
+#define glDeformationMap3dSGIX MANGLE(DeformationMap3dSGIX)
+#define glDeformationMap3fSGIX MANGLE(DeformationMap3fSGIX)
+#define glDeformSGIX MANGLE(DeformSGIX)
+#define glDeleteAsyncMarkersSGIX MANGLE(DeleteAsyncMarkersSGIX)
+#define glDeleteBuffersARB MANGLE(DeleteBuffersARB)
+#define glDeleteBuffers MANGLE(DeleteBuffers)
+#define glDeleteFencesAPPLE MANGLE(DeleteFencesAPPLE)
+#define glDeleteFencesNV MANGLE(DeleteFencesNV)
+#define glDeleteFragmentShaderATI MANGLE(DeleteFragmentShaderATI)
+#define glDeleteFramebuffersEXT MANGLE(DeleteFramebuffersEXT)
+#define glDeleteLists MANGLE(DeleteLists)
+#define glDeleteObjectARB MANGLE(DeleteObjectARB)
+#define glDeleteOcclusionQueriesNV MANGLE(DeleteOcclusionQueriesNV)
+#define glDeleteProgram MANGLE(DeleteProgram)
+#define glDeleteProgramsARB MANGLE(DeleteProgramsARB)
+#define glDeleteProgramsNV MANGLE(DeleteProgramsNV)
+#define glDeleteQueriesARB MANGLE(DeleteQueriesARB)
+#define glDeleteQueries MANGLE(DeleteQueries)
+#define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT)
+#define glDeleteShader MANGLE(DeleteShader)
+#define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT)
+#define glDeleteTextures MANGLE(DeleteTextures)
+#define glDeleteVertexArraysAPPLE MANGLE(DeleteVertexArraysAPPLE)
+#define glDeleteVertexShaderEXT MANGLE(DeleteVertexShaderEXT)
+#define glDepthBoundsdNV MANGLE(DepthBoundsdNV)
+#define glDepthBoundsEXT MANGLE(DepthBoundsEXT)
+#define glDepthFunc MANGLE(DepthFunc)
+#define glDepthMask MANGLE(DepthMask)
+#define glDepthRangedNV MANGLE(DepthRangedNV)
+#define glDepthRange MANGLE(DepthRange)
+#define glDetachObjectARB MANGLE(DetachObjectARB)
+#define glDetachShader MANGLE(DetachShader)
+#define glDetailTexFuncSGIS MANGLE(DetailTexFuncSGIS)
+#define glDisableClientState MANGLE(DisableClientState)
+#define glDisableIndexedEXT MANGLE(DisableIndexedEXT)
+#define glDisable MANGLE(Disable)
+#define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT)
+#define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB)
+#define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray)
+#define glDrawArraysEXT MANGLE(DrawArraysEXT)
+#define glDrawArraysInstancedEXT MANGLE(DrawArraysInstancedEXT)
+#define glDrawArrays MANGLE(DrawArrays)
+#define glDrawBuffer MANGLE(DrawBuffer)
+#define glDrawBuffersARB MANGLE(DrawBuffersARB)
+#define glDrawBuffersATI MANGLE(DrawBuffersATI)
+#define glDrawBuffers MANGLE(DrawBuffers)
+#define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE)
+#define glDrawElementArrayATI MANGLE(DrawElementArrayATI)
+#define glDrawElementsInstancedEXT MANGLE(DrawElementsInstancedEXT)
+#define glDrawElements MANGLE(DrawElements)
+#define glDrawMeshArraysSUN MANGLE(DrawMeshArraysSUN)
+#define glDrawPixels MANGLE(DrawPixels)
+#define glDrawRangeElementArrayAPPLE MANGLE(DrawRangeElementArrayAPPLE)
+#define glDrawRangeElementArrayATI MANGLE(DrawRangeElementArrayATI)
+#define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT)
+#define glDrawRangeElements MANGLE(DrawRangeElements)
+#define glEdgeFlag MANGLE(EdgeFlag)
+#define glEdgeFlagPointerEXT MANGLE(EdgeFlagPointerEXT)
+#define glEdgeFlagPointerListIBM MANGLE(EdgeFlagPointerListIBM)
+#define glEdgeFlagPointer MANGLE(EdgeFlagPointer)
+#define glEdgeFlagv MANGLE(EdgeFlagv)
+#define glElementPointerAPPLE MANGLE(ElementPointerAPPLE)
+#define glElementPointerATI MANGLE(ElementPointerATI)
+#define glEnableClientState MANGLE(EnableClientState)
+#define glEnableIndexedEXT MANGLE(EnableIndexedEXT)
+#define glEnable MANGLE(Enable)
+#define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT)
+#define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB)
+#define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray)
+#define glEndFragmentShaderATI MANGLE(EndFragmentShaderATI)
+#define glEndList MANGLE(EndList)
+#define glEnd MANGLE(End)
+#define glEndOcclusionQueryNV MANGLE(EndOcclusionQueryNV)
+#define glEndQueryARB MANGLE(EndQueryARB)
+#define glEndQuery MANGLE(EndQuery)
+#define glEndTransformFeedbackNV MANGLE(EndTransformFeedbackNV)
+#define glEndVertexShaderEXT MANGLE(EndVertexShaderEXT)
+#define glEvalCoord1d MANGLE(EvalCoord1d)
+#define glEvalCoord1dv MANGLE(EvalCoord1dv)
+#define glEvalCoord1f MANGLE(EvalCoord1f)
+#define glEvalCoord1fv MANGLE(EvalCoord1fv)
+#define glEvalCoord2d MANGLE(EvalCoord2d)
+#define glEvalCoord2dv MANGLE(EvalCoord2dv)
+#define glEvalCoord2f MANGLE(EvalCoord2f)
+#define glEvalCoord2fv MANGLE(EvalCoord2fv)
+#define glEvalMapsNV MANGLE(EvalMapsNV)
+#define glEvalMesh1 MANGLE(EvalMesh1)
+#define glEvalMesh2 MANGLE(EvalMesh2)
+#define glEvalPoint1 MANGLE(EvalPoint1)
+#define glEvalPoint2 MANGLE(EvalPoint2)
+#define glExecuteProgramNV MANGLE(ExecuteProgramNV)
+#define glExtractComponentEXT MANGLE(ExtractComponentEXT)
+#define glFeedbackBuffer MANGLE(FeedbackBuffer)
+#define glFinalCombinerInputNV MANGLE(FinalCombinerInputNV)
+#define glFinishAsyncSGIX MANGLE(FinishAsyncSGIX)
+#define glFinishFenceAPPLE MANGLE(FinishFenceAPPLE)
+#define glFinishFenceNV MANGLE(FinishFenceNV)
+#define glFinish MANGLE(Finish)
+#define glFinishObjectAPPLE MANGLE(FinishObjectAPPLE)
+#define glFinishTextureSUNX MANGLE(FinishTextureSUNX)
+#define glFlush MANGLE(Flush)
+#define glFlushMappedBufferRangeAPPLE MANGLE(FlushMappedBufferRangeAPPLE)
+#define glFlushPixelDataRangeNV MANGLE(FlushPixelDataRangeNV)
+#define glFlushRasterSGIX MANGLE(FlushRasterSGIX)
+#define glFlushVertexArrayRangeAPPLE MANGLE(FlushVertexArrayRangeAPPLE)
+#define glFlushVertexArrayRangeNV MANGLE(FlushVertexArrayRangeNV)
+#define glFogCoorddEXT MANGLE(FogCoorddEXT)
+#define glFogCoordd MANGLE(FogCoordd)
+#define glFogCoorddvEXT MANGLE(FogCoorddvEXT)
+#define glFogCoorddv MANGLE(FogCoorddv)
+#define glFogCoordfEXT MANGLE(FogCoordfEXT)
+#define glFogCoordf MANGLE(FogCoordf)
+#define glFogCoordfvEXT MANGLE(FogCoordfvEXT)
+#define glFogCoordfv MANGLE(FogCoordfv)
+#define glFogCoordhNV MANGLE(FogCoordhNV)
+#define glFogCoordhvNV MANGLE(FogCoordhvNV)
+#define glFogCoordPointerEXT MANGLE(FogCoordPointerEXT)
+#define glFogCoordPointerListIBM MANGLE(FogCoordPointerListIBM)
+#define glFogCoordPointer MANGLE(FogCoordPointer)
+#define glFogf MANGLE(Fogf)
+#define glFogFuncSGIS MANGLE(FogFuncSGIS)
+#define glFogfv MANGLE(Fogfv)
+#define glFogi MANGLE(Fogi)
+#define glFogiv MANGLE(Fogiv)
+#define glFragmentColorMaterialSGIX MANGLE(FragmentColorMaterialSGIX)
+#define glFragmentLightfSGIX MANGLE(FragmentLightfSGIX)
+#define glFragmentLightfvSGIX MANGLE(FragmentLightfvSGIX)
+#define glFragmentLightiSGIX MANGLE(FragmentLightiSGIX)
+#define glFragmentLightivSGIX MANGLE(FragmentLightivSGIX)
+#define glFragmentLightModelfSGIX MANGLE(FragmentLightModelfSGIX)
+#define glFragmentLightModelfvSGIX MANGLE(FragmentLightModelfvSGIX)
+#define glFragmentLightModeliSGIX MANGLE(FragmentLightModeliSGIX)
+#define glFragmentLightModelivSGIX MANGLE(FragmentLightModelivSGIX)
+#define glFragmentMaterialfSGIX MANGLE(FragmentMaterialfSGIX)
+#define glFragmentMaterialfvSGIX MANGLE(FragmentMaterialfvSGIX)
+#define glFragmentMaterialiSGIX MANGLE(FragmentMaterialiSGIX)
+#define glFragmentMaterialivSGIX MANGLE(FragmentMaterialivSGIX)
+#define glFramebufferRenderbufferEXT MANGLE(FramebufferRenderbufferEXT)
+#define glFramebufferTexture1DEXT MANGLE(FramebufferTexture1DEXT)
+#define glFramebufferTexture2DEXT MANGLE(FramebufferTexture2DEXT)
+#define glFramebufferTexture3DEXT MANGLE(FramebufferTexture3DEXT)
+#define glFramebufferTextureEXT MANGLE(FramebufferTextureEXT)
+#define glFramebufferTextureFaceEXT MANGLE(FramebufferTextureFaceEXT)
+#define glFramebufferTextureLayerEXT MANGLE(FramebufferTextureLayerEXT)
+#define glFrameZoomSGIX MANGLE(FrameZoomSGIX)
+#define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI)
+#define glFrontFace MANGLE(FrontFace)
+#define glFrustum MANGLE(Frustum)
+#define glGenAsyncMarkersSGIX MANGLE(GenAsyncMarkersSGIX)
+#define glGenBuffersARB MANGLE(GenBuffersARB)
+#define glGenBuffers MANGLE(GenBuffers)
+#define glGenerateMipmapEXT MANGLE(GenerateMipmapEXT)
+#define glGenFencesAPPLE MANGLE(GenFencesAPPLE)
+#define glGenFencesNV MANGLE(GenFencesNV)
+#define glGenFragmentShadersATI MANGLE(GenFragmentShadersATI)
+#define glGenFramebuffersEXT MANGLE(GenFramebuffersEXT)
+#define glGenLists MANGLE(GenLists)
+#define glGenOcclusionQueriesNV MANGLE(GenOcclusionQueriesNV)
+#define glGenProgramsARB MANGLE(GenProgramsARB)
+#define glGenProgramsNV MANGLE(GenProgramsNV)
+#define glGenQueriesARB MANGLE(GenQueriesARB)
+#define glGenQueries MANGLE(GenQueries)
+#define glGenRenderbuffersEXT MANGLE(GenRenderbuffersEXT)
+#define glGenSymbolsEXT MANGLE(GenSymbolsEXT)
+#define glGenTexturesEXT MANGLE(GenTexturesEXT)
+#define glGenTextures MANGLE(GenTextures)
+#define glGenVertexArraysAPPLE MANGLE(GenVertexArraysAPPLE)
+#define glGenVertexShadersEXT MANGLE(GenVertexShadersEXT)
+#define glGetActiveAttribARB MANGLE(GetActiveAttribARB)
+#define glGetActiveAttrib MANGLE(GetActiveAttrib)
+#define glGetActiveUniformARB MANGLE(GetActiveUniformARB)
+#define glGetActiveUniform MANGLE(GetActiveUniform)
+#define glGetActiveVaryingNV MANGLE(GetActiveVaryingNV)
+#define glGetArrayObjectfvATI MANGLE(GetArrayObjectfvATI)
+#define glGetArrayObjectivATI MANGLE(GetArrayObjectivATI)
+#define glGetAttachedObjectsARB MANGLE(GetAttachedObjectsARB)
+#define glGetAttachedShaders MANGLE(GetAttachedShaders)
+#define glGetAttribLocationARB MANGLE(GetAttribLocationARB)
+#define glGetAttribLocation MANGLE(GetAttribLocation)
+#define glGetBooleanIndexedvEXT MANGLE(GetBooleanIndexedvEXT)
+#define glGetBooleanv MANGLE(GetBooleanv)
+#define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB)
+#define glGetBufferParameteriv MANGLE(GetBufferParameteriv)
+#define glGetBufferPointervARB MANGLE(GetBufferPointervARB)
+#define glGetBufferPointerv MANGLE(GetBufferPointerv)
+#define glGetBufferSubDataARB MANGLE(GetBufferSubDataARB)
+#define glGetBufferSubData MANGLE(GetBufferSubData)
+#define glGetClipPlane MANGLE(GetClipPlane)
+#define glGetColorTableEXT MANGLE(GetColorTableEXT)
+#define glGetColorTable MANGLE(GetColorTable)
+#define glGetColorTableParameterfvEXT MANGLE(GetColorTableParameterfvEXT)
+#define glGetColorTableParameterfv MANGLE(GetColorTableParameterfv)
+#define glGetColorTableParameterfvSGI MANGLE(GetColorTableParameterfvSGI)
+#define glGetColorTableParameterivEXT MANGLE(GetColorTableParameterivEXT)
+#define glGetColorTableParameteriv MANGLE(GetColorTableParameteriv)
+#define glGetColorTableParameterivSGI MANGLE(GetColorTableParameterivSGI)
+#define glGetColorTableSGI MANGLE(GetColorTableSGI)
+#define glGetCombinerInputParameterfvNV MANGLE(GetCombinerInputParameterfvNV)
+#define glGetCombinerInputParameterivNV MANGLE(GetCombinerInputParameterivNV)
+#define glGetCombinerOutputParameterfvNV MANGLE(GetCombinerOutputParameterfvNV)
+#define glGetCombinerOutputParameterivNV MANGLE(GetCombinerOutputParameterivNV)
+#define glGetCombinerStageParameterfvNV MANGLE(GetCombinerStageParameterfvNV)
+#define glGetCompressedTexImageARB MANGLE(GetCompressedTexImageARB)
+#define glGetCompressedTexImage MANGLE(GetCompressedTexImage)
+#define glGetConvolutionFilterEXT MANGLE(GetConvolutionFilterEXT)
+#define glGetConvolutionFilter MANGLE(GetConvolutionFilter)
+#define glGetConvolutionParameterfvEXT MANGLE(GetConvolutionParameterfvEXT)
+#define glGetConvolutionParameterfv MANGLE(GetConvolutionParameterfv)
+#define glGetConvolutionParameterivEXT MANGLE(GetConvolutionParameterivEXT)
+#define glGetConvolutionParameteriv MANGLE(GetConvolutionParameteriv)
+#define glGetDebugLogLengthMESA MANGLE(GetDebugLogLengthMESA)
+#define glGetDebugLogMESA MANGLE(GetDebugLogMESA)
+#define glGetDetailTexFuncSGIS MANGLE(GetDetailTexFuncSGIS)
+#define glGetDoublev MANGLE(GetDoublev)
+#define glGetError MANGLE(GetError)
+#define glGetFenceivNV MANGLE(GetFenceivNV)
+#define glGetFinalCombinerInputParameterfvNV MANGLE(GetFinalCombinerInputParameterfvNV)
+#define glGetFinalCombinerInputParameterivNV MANGLE(GetFinalCombinerInputParameterivNV)
+#define glGetFloatv MANGLE(GetFloatv)
+#define glGetFogFuncSGIS MANGLE(GetFogFuncSGIS)
+#define glGetFragDataLocationEXT MANGLE(GetFragDataLocationEXT)
+#define glGetFragmentLightfvSGIX MANGLE(GetFragmentLightfvSGIX)
+#define glGetFragmentLightivSGIX MANGLE(GetFragmentLightivSGIX)
+#define glGetFragmentMaterialfvSGIX MANGLE(GetFragmentMaterialfvSGIX)
+#define glGetFragmentMaterialivSGIX MANGLE(GetFragmentMaterialivSGIX)
+#define glGetFramebufferAttachmentParameterivEXT MANGLE(GetFramebufferAttachmentParameterivEXT)
+#define glGetHandleARB MANGLE(GetHandleARB)
+#define glGetHistogramEXT MANGLE(GetHistogramEXT)
+#define glGetHistogram MANGLE(GetHistogram)
+#define glGetHistogramParameterfvEXT MANGLE(GetHistogramParameterfvEXT)
+#define glGetHistogramParameterfv MANGLE(GetHistogramParameterfv)
+#define glGetHistogramParameterivEXT MANGLE(GetHistogramParameterivEXT)
+#define glGetHistogramParameteriv MANGLE(GetHistogramParameteriv)
+#define glGetImageTransformParameterfvHP MANGLE(GetImageTransformParameterfvHP)
+#define glGetImageTransformParameterivHP MANGLE(GetImageTransformParameterivHP)
+#define glGetInfoLogARB MANGLE(GetInfoLogARB)
+#define glGetInstrumentsSGIX MANGLE(GetInstrumentsSGIX)
+#define glGetIntegerIndexedvEXT MANGLE(GetIntegerIndexedvEXT)
+#define glGetIntegerv MANGLE(GetIntegerv)
+#define glGetInvariantBooleanvEXT MANGLE(GetInvariantBooleanvEXT)
+#define glGetInvariantFloatvEXT MANGLE(GetInvariantFloatvEXT)
+#define glGetInvariantIntegervEXT MANGLE(GetInvariantIntegervEXT)
+#define glGetLightfv MANGLE(GetLightfv)
+#define glGetLightiv MANGLE(GetLightiv)
+#define glGetListParameterfvSGIX MANGLE(GetListParameterfvSGIX)
+#define glGetListParameterivSGIX MANGLE(GetListParameterivSGIX)
+#define glGetLocalConstantBooleanvEXT MANGLE(GetLocalConstantBooleanvEXT)
+#define glGetLocalConstantFloatvEXT MANGLE(GetLocalConstantFloatvEXT)
+#define glGetLocalConstantIntegervEXT MANGLE(GetLocalConstantIntegervEXT)
+#define glGetMapAttribParameterfvNV MANGLE(GetMapAttribParameterfvNV)
+#define glGetMapAttribParameterivNV MANGLE(GetMapAttribParameterivNV)
+#define glGetMapControlPointsNV MANGLE(GetMapControlPointsNV)
+#define glGetMapdv MANGLE(GetMapdv)
+#define glGetMapfv MANGLE(GetMapfv)
+#define glGetMapiv MANGLE(GetMapiv)
+#define glGetMapParameterfvNV MANGLE(GetMapParameterfvNV)
+#define glGetMapParameterivNV MANGLE(GetMapParameterivNV)
+#define glGetMaterialfv MANGLE(GetMaterialfv)
+#define glGetMaterialiv MANGLE(GetMaterialiv)
+#define glGetMinmaxEXT MANGLE(GetMinmaxEXT)
+#define glGetMinmax MANGLE(GetMinmax)
+#define glGetMinmaxParameterfvEXT MANGLE(GetMinmaxParameterfvEXT)
+#define glGetMinmaxParameterfv MANGLE(GetMinmaxParameterfv)
+#define glGetMinmaxParameterivEXT MANGLE(GetMinmaxParameterivEXT)
+#define glGetMinmaxParameteriv MANGLE(GetMinmaxParameteriv)
+#define glGetObjectBufferfvATI MANGLE(GetObjectBufferfvATI)
+#define glGetObjectBufferivATI MANGLE(GetObjectBufferivATI)
+#define glGetObjectParameterfvARB MANGLE(GetObjectParameterfvARB)
+#define glGetObjectParameterivARB MANGLE(GetObjectParameterivARB)
+#define glGetOcclusionQueryivNV MANGLE(GetOcclusionQueryivNV)
+#define glGetOcclusionQueryuivNV MANGLE(GetOcclusionQueryuivNV)
+#define glGetPixelMapfv MANGLE(GetPixelMapfv)
+#define glGetPixelMapuiv MANGLE(GetPixelMapuiv)
+#define glGetPixelMapusv MANGLE(GetPixelMapusv)
+#define glGetPixelTexGenParameterfvSGIS MANGLE(GetPixelTexGenParameterfvSGIS)
+#define glGetPixelTexGenParameterivSGIS MANGLE(GetPixelTexGenParameterivSGIS)
+#define glGetPointervEXT MANGLE(GetPointervEXT)
+#define glGetPointerv MANGLE(GetPointerv)
+#define glGetPolygonStipple MANGLE(GetPolygonStipple)
+#define glGetProgramEnvParameterdvARB MANGLE(GetProgramEnvParameterdvARB)
+#define glGetProgramEnvParameterfvARB MANGLE(GetProgramEnvParameterfvARB)
+#define glGetProgramEnvParameterIivNV MANGLE(GetProgramEnvParameterIivNV)
+#define glGetProgramEnvParameterIuivNV MANGLE(GetProgramEnvParameterIuivNV)
+#define glGetProgramInfoLog MANGLE(GetProgramInfoLog)
+#define glGetProgramivARB MANGLE(GetProgramivARB)
+#define glGetProgramiv MANGLE(GetProgramiv)
+#define glGetProgramivNV MANGLE(GetProgramivNV)
+#define glGetProgramLocalParameterdvARB MANGLE(GetProgramLocalParameterdvARB)
+#define glGetProgramLocalParameterfvARB MANGLE(GetProgramLocalParameterfvARB)
+#define glGetProgramLocalParameterIivNV MANGLE(GetProgramLocalParameterIivNV)
+#define glGetProgramLocalParameterIuivNV MANGLE(GetProgramLocalParameterIuivNV)
+#define glGetProgramNamedParameterdvNV MANGLE(GetProgramNamedParameterdvNV)
+#define glGetProgramNamedParameterfvNV MANGLE(GetProgramNamedParameterfvNV)
+#define glGetProgramParameterdvNV MANGLE(GetProgramParameterdvNV)
+#define glGetProgramParameterfvNV MANGLE(GetProgramParameterfvNV)
+#define glGetProgramRegisterfvMESA MANGLE(GetProgramRegisterfvMESA)
+#define glGetProgramStringARB MANGLE(GetProgramStringARB)
+#define glGetProgramStringNV MANGLE(GetProgramStringNV)
+#define glGetQueryivARB MANGLE(GetQueryivARB)
+#define glGetQueryiv MANGLE(GetQueryiv)
+#define glGetQueryObjecti64vEXT MANGLE(GetQueryObjecti64vEXT)
+#define glGetQueryObjectivARB MANGLE(GetQueryObjectivARB)
+#define glGetQueryObjectiv MANGLE(GetQueryObjectiv)
+#define glGetQueryObjectui64vEXT MANGLE(GetQueryObjectui64vEXT)
+#define glGetQueryObjectuivARB MANGLE(GetQueryObjectuivARB)
+#define glGetQueryObjectuiv MANGLE(GetQueryObjectuiv)
+#define glGetRenderbufferParameterivEXT MANGLE(GetRenderbufferParameterivEXT)
+#define glGetSeparableFilterEXT MANGLE(GetSeparableFilterEXT)
+#define glGetSeparableFilter MANGLE(GetSeparableFilter)
+#define glGetShaderInfoLog MANGLE(GetShaderInfoLog)
+#define glGetShaderiv MANGLE(GetShaderiv)
+#define glGetShaderSourceARB MANGLE(GetShaderSourceARB)
+#define glGetShaderSource MANGLE(GetShaderSource)
+#define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS)
+#define glGetString MANGLE(GetString)
+#define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI)
+#define glGetTexBumpParameterivATI MANGLE(GetTexBumpParameterivATI)
+#define glGetTexEnvfv MANGLE(GetTexEnvfv)
+#define glGetTexEnviv MANGLE(GetTexEnviv)
+#define glGetTexFilterFuncSGIS MANGLE(GetTexFilterFuncSGIS)
+#define glGetTexGendv MANGLE(GetTexGendv)
+#define glGetTexGenfv MANGLE(GetTexGenfv)
+#define glGetTexGeniv MANGLE(GetTexGeniv)
+#define glGetTexImage MANGLE(GetTexImage)
+#define glGetTexLevelParameterfv MANGLE(GetTexLevelParameterfv)
+#define glGetTexLevelParameteriv MANGLE(GetTexLevelParameteriv)
+#define glGetTexParameterfv MANGLE(GetTexParameterfv)
+#define glGetTexParameterIivEXT MANGLE(GetTexParameterIivEXT)
+#define glGetTexParameterIuivEXT MANGLE(GetTexParameterIuivEXT)
+#define glGetTexParameteriv MANGLE(GetTexParameteriv)
+#define glGetTrackMatrixivNV MANGLE(GetTrackMatrixivNV)
+#define glGetTransformFeedbackVaryingNV MANGLE(GetTransformFeedbackVaryingNV)
+#define glGetUniformBufferSizeEXT MANGLE(GetUniformBufferSizeEXT)
+#define glGetUniformfvARB MANGLE(GetUniformfvARB)
+#define glGetUniformfv MANGLE(GetUniformfv)
+#define glGetUniformivARB MANGLE(GetUniformivARB)
+#define glGetUniformiv MANGLE(GetUniformiv)
+#define glGetUniformLocationARB MANGLE(GetUniformLocationARB)
+#define glGetUniformLocation MANGLE(GetUniformLocation)
+#define glGetUniformOffsetEXT MANGLE(GetUniformOffsetEXT)
+#define glGetUniformuivEXT MANGLE(GetUniformuivEXT)
+#define glGetVariantArrayObjectfvATI MANGLE(GetVariantArrayObjectfvATI)
+#define glGetVariantArrayObjectivATI MANGLE(GetVariantArrayObjectivATI)
+#define glGetVariantBooleanvEXT MANGLE(GetVariantBooleanvEXT)
+#define glGetVariantFloatvEXT MANGLE(GetVariantFloatvEXT)
+#define glGetVariantIntegervEXT MANGLE(GetVariantIntegervEXT)
+#define glGetVariantPointervEXT MANGLE(GetVariantPointervEXT)
+#define glGetVaryingLocationNV MANGLE(GetVaryingLocationNV)
+#define glGetVertexAttribArrayObjectfvATI MANGLE(GetVertexAttribArrayObjectfvATI)
+#define glGetVertexAttribArrayObjectivATI MANGLE(GetVertexAttribArrayObjectivATI)
+#define glGetVertexAttribdvARB MANGLE(GetVertexAttribdvARB)
+#define glGetVertexAttribdv MANGLE(GetVertexAttribdv)
+#define glGetVertexAttribdvNV MANGLE(GetVertexAttribdvNV)
+#define glGetVertexAttribfvARB MANGLE(GetVertexAttribfvARB)
+#define glGetVertexAttribfv MANGLE(GetVertexAttribfv)
+#define glGetVertexAttribfvNV MANGLE(GetVertexAttribfvNV)
+#define glGetVertexAttribIivEXT MANGLE(GetVertexAttribIivEXT)
+#define glGetVertexAttribIuivEXT MANGLE(GetVertexAttribIuivEXT)
+#define glGetVertexAttribivARB MANGLE(GetVertexAttribivARB)
+#define glGetVertexAttribiv MANGLE(GetVertexAttribiv)
+#define glGetVertexAttribivNV MANGLE(GetVertexAttribivNV)
+#define glGetVertexAttribPointervARB MANGLE(GetVertexAttribPointervARB)
+#define glGetVertexAttribPointerv MANGLE(GetVertexAttribPointerv)
+#define glGetVertexAttribPointervNV MANGLE(GetVertexAttribPointervNV)
+#define glGlobalAlphaFactorbSUN MANGLE(GlobalAlphaFactorbSUN)
+#define glGlobalAlphaFactordSUN MANGLE(GlobalAlphaFactordSUN)
+#define glGlobalAlphaFactorfSUN MANGLE(GlobalAlphaFactorfSUN)
+#define glGlobalAlphaFactoriSUN MANGLE(GlobalAlphaFactoriSUN)
+#define glGlobalAlphaFactorsSUN MANGLE(GlobalAlphaFactorsSUN)
+#define glGlobalAlphaFactorubSUN MANGLE(GlobalAlphaFactorubSUN)
+#define glGlobalAlphaFactoruiSUN MANGLE(GlobalAlphaFactoruiSUN)
+#define glGlobalAlphaFactorusSUN MANGLE(GlobalAlphaFactorusSUN)
+#define glHint MANGLE(Hint)
+#define glHintPGI MANGLE(HintPGI)
+#define glHistogramEXT MANGLE(HistogramEXT)
+#define glHistogram MANGLE(Histogram)
+#define glIglooInterfaceSGIX MANGLE(IglooInterfaceSGIX)
+#define glImageTransformParameterfHP MANGLE(ImageTransformParameterfHP)
+#define glImageTransformParameterfvHP MANGLE(ImageTransformParameterfvHP)
+#define glImageTransformParameteriHP MANGLE(ImageTransformParameteriHP)
+#define glImageTransformParameterivHP MANGLE(ImageTransformParameterivHP)
+#define glIndexd MANGLE(Indexd)
+#define glIndexdv MANGLE(Indexdv)
+#define glIndexf MANGLE(Indexf)
+#define glIndexFuncEXT MANGLE(IndexFuncEXT)
+#define glIndexfv MANGLE(Indexfv)
+#define glIndexi MANGLE(Indexi)
+#define glIndexiv MANGLE(Indexiv)
+#define glIndexMask MANGLE(IndexMask)
+#define glIndexMaterialEXT MANGLE(IndexMaterialEXT)
+#define glIndexPointerEXT MANGLE(IndexPointerEXT)
+#define glIndexPointerListIBM MANGLE(IndexPointerListIBM)
+#define glIndexPointer MANGLE(IndexPointer)
+#define glIndexs MANGLE(Indexs)
+#define glIndexsv MANGLE(Indexsv)
+#define glIndexub MANGLE(Indexub)
+#define glIndexubv MANGLE(Indexubv)
+#define glInitNames MANGLE(InitNames)
+#define glInsertComponentEXT MANGLE(InsertComponentEXT)
+#define glInstrumentsBufferSGIX MANGLE(InstrumentsBufferSGIX)
+#define glInterleavedArrays MANGLE(InterleavedArrays)
+#define glIsAsyncMarkerSGIX MANGLE(IsAsyncMarkerSGIX)
+#define glIsBufferARB MANGLE(IsBufferARB)
+#define glIsBuffer MANGLE(IsBuffer)
+#define glIsEnabledIndexedEXT MANGLE(IsEnabledIndexedEXT)
+#define glIsEnabled MANGLE(IsEnabled)
+#define glIsFenceAPPLE MANGLE(IsFenceAPPLE)
+#define glIsFenceNV MANGLE(IsFenceNV)
+#define glIsFramebufferEXT MANGLE(IsFramebufferEXT)
+#define glIsList MANGLE(IsList)
+#define glIsObjectBufferATI MANGLE(IsObjectBufferATI)
+#define glIsOcclusionQueryNV MANGLE(IsOcclusionQueryNV)
+#define glIsProgramARB MANGLE(IsProgramARB)
+#define glIsProgram MANGLE(IsProgram)
+#define glIsProgramNV MANGLE(IsProgramNV)
+#define glIsQueryARB MANGLE(IsQueryARB)
+#define glIsQuery MANGLE(IsQuery)
+#define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT)
+#define glIsShader MANGLE(IsShader)
+#define glIsTextureEXT MANGLE(IsTextureEXT)
+#define glIsTexture MANGLE(IsTexture)
+#define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT)
+#define glIsVertexArrayAPPLE MANGLE(IsVertexArrayAPPLE)
+#define glLightEnviSGIX MANGLE(LightEnviSGIX)
+#define glLightf MANGLE(Lightf)
+#define glLightfv MANGLE(Lightfv)
+#define glLighti MANGLE(Lighti)
+#define glLightiv MANGLE(Lightiv)
+#define glLightModelf MANGLE(LightModelf)
+#define glLightModelfv MANGLE(LightModelfv)
+#define glLightModeli MANGLE(LightModeli)
+#define glLightModeliv MANGLE(LightModeliv)
+#define glLineStipple MANGLE(LineStipple)
+#define glLineWidth MANGLE(LineWidth)
+#define glLinkProgramARB MANGLE(LinkProgramARB)
+#define glLinkProgram MANGLE(LinkProgram)
+#define glListBase MANGLE(ListBase)
+#define glListParameterfSGIX MANGLE(ListParameterfSGIX)
+#define glListParameterfvSGIX MANGLE(ListParameterfvSGIX)
+#define glListParameteriSGIX MANGLE(ListParameteriSGIX)
+#define glListParameterivSGIX MANGLE(ListParameterivSGIX)
+#define glLoadIdentityDeformationMapSGIX MANGLE(LoadIdentityDeformationMapSGIX)
+#define glLoadIdentity MANGLE(LoadIdentity)
+#define glLoadMatrixd MANGLE(LoadMatrixd)
+#define glLoadMatrixf MANGLE(LoadMatrixf)
+#define glLoadName MANGLE(LoadName)
+#define glLoadProgramNV MANGLE(LoadProgramNV)
+#define glLoadTransposeMatrixdARB MANGLE(LoadTransposeMatrixdARB)
+#define glLoadTransposeMatrixd MANGLE(LoadTransposeMatrixd)
+#define glLoadTransposeMatrixfARB MANGLE(LoadTransposeMatrixfARB)
+#define glLoadTransposeMatrixf MANGLE(LoadTransposeMatrixf)
+#define glLockArraysEXT MANGLE(LockArraysEXT)
+#define glLogicOp MANGLE(LogicOp)
+#define glMap1d MANGLE(Map1d)
+#define glMap1f MANGLE(Map1f)
+#define glMap2d MANGLE(Map2d)
+#define glMap2f MANGLE(Map2f)
+#define glMapBufferARB MANGLE(MapBufferARB)
+#define glMapBuffer MANGLE(MapBuffer)
+#define glMapControlPointsNV MANGLE(MapControlPointsNV)
+#define glMapGrid1d MANGLE(MapGrid1d)
+#define glMapGrid1f MANGLE(MapGrid1f)
+#define glMapGrid2d MANGLE(MapGrid2d)
+#define glMapGrid2f MANGLE(MapGrid2f)
+#define glMapObjectBufferATI MANGLE(MapObjectBufferATI)
+#define glMapParameterfvNV MANGLE(MapParameterfvNV)
+#define glMapParameterivNV MANGLE(MapParameterivNV)
+#define glMaterialf MANGLE(Materialf)
+#define glMaterialfv MANGLE(Materialfv)
+#define glMateriali MANGLE(Materiali)
+#define glMaterialiv MANGLE(Materialiv)
+#define glMatrixIndexPointerARB MANGLE(MatrixIndexPointerARB)
+#define glMatrixIndexubvARB MANGLE(MatrixIndexubvARB)
+#define glMatrixIndexuivARB MANGLE(MatrixIndexuivARB)
+#define glMatrixIndexusvARB MANGLE(MatrixIndexusvARB)
+#define glMatrixMode MANGLE(MatrixMode)
+#define glMinmaxEXT MANGLE(MinmaxEXT)
+#define glMinmax MANGLE(Minmax)
+#define glMultiDrawArraysEXT MANGLE(MultiDrawArraysEXT)
+#define glMultiDrawArrays MANGLE(MultiDrawArrays)
+#define glMultiDrawElementArrayAPPLE MANGLE(MultiDrawElementArrayAPPLE)
+#define glMultiDrawElementsEXT MANGLE(MultiDrawElementsEXT)
+#define glMultiDrawElements MANGLE(MultiDrawElements)
+#define glMultiDrawRangeElementArrayAPPLE MANGLE(MultiDrawRangeElementArrayAPPLE)
+#define glMultiModeDrawArraysIBM MANGLE(MultiModeDrawArraysIBM)
+#define glMultiModeDrawElementsIBM MANGLE(MultiModeDrawElementsIBM)
+#define glMultiTexCoord1dARB MANGLE(MultiTexCoord1dARB)
+#define glMultiTexCoord1d MANGLE(MultiTexCoord1d)
+#define glMultiTexCoord1dvARB MANGLE(MultiTexCoord1dvARB)
+#define glMultiTexCoord1dv MANGLE(MultiTexCoord1dv)
+#define glMultiTexCoord1fARB MANGLE(MultiTexCoord1fARB)
+#define glMultiTexCoord1f MANGLE(MultiTexCoord1f)
+#define glMultiTexCoord1fvARB MANGLE(MultiTexCoord1fvARB)
+#define glMultiTexCoord1fv MANGLE(MultiTexCoord1fv)
+#define glMultiTexCoord1hNV MANGLE(MultiTexCoord1hNV)
+#define glMultiTexCoord1hvNV MANGLE(MultiTexCoord1hvNV)
+#define glMultiTexCoord1iARB MANGLE(MultiTexCoord1iARB)
+#define glMultiTexCoord1i MANGLE(MultiTexCoord1i)
+#define glMultiTexCoord1ivARB MANGLE(MultiTexCoord1ivARB)
+#define glMultiTexCoord1iv MANGLE(MultiTexCoord1iv)
+#define glMultiTexCoord1sARB MANGLE(MultiTexCoord1sARB)
+#define glMultiTexCoord1s MANGLE(MultiTexCoord1s)
+#define glMultiTexCoord1svARB MANGLE(MultiTexCoord1svARB)
+#define glMultiTexCoord1sv MANGLE(MultiTexCoord1sv)
+#define glMultiTexCoord2dARB MANGLE(MultiTexCoord2dARB)
+#define glMultiTexCoord2d MANGLE(MultiTexCoord2d)
+#define glMultiTexCoord2dvARB MANGLE(MultiTexCoord2dvARB)
+#define glMultiTexCoord2dv MANGLE(MultiTexCoord2dv)
+#define glMultiTexCoord2fARB MANGLE(MultiTexCoord2fARB)
+#define glMultiTexCoord2f MANGLE(MultiTexCoord2f)
+#define glMultiTexCoord2fvARB MANGLE(MultiTexCoord2fvARB)
+#define glMultiTexCoord2fv MANGLE(MultiTexCoord2fv)
+#define glMultiTexCoord2hNV MANGLE(MultiTexCoord2hNV)
+#define glMultiTexCoord2hvNV MANGLE(MultiTexCoord2hvNV)
+#define glMultiTexCoord2iARB MANGLE(MultiTexCoord2iARB)
+#define glMultiTexCoord2i MANGLE(MultiTexCoord2i)
+#define glMultiTexCoord2ivARB MANGLE(MultiTexCoord2ivARB)
+#define glMultiTexCoord2iv MANGLE(MultiTexCoord2iv)
+#define glMultiTexCoord2sARB MANGLE(MultiTexCoord2sARB)
+#define glMultiTexCoord2s MANGLE(MultiTexCoord2s)
+#define glMultiTexCoord2svARB MANGLE(MultiTexCoord2svARB)
+#define glMultiTexCoord2sv MANGLE(MultiTexCoord2sv)
+#define glMultiTexCoord3dARB MANGLE(MultiTexCoord3dARB)
+#define glMultiTexCoord3d MANGLE(MultiTexCoord3d)
+#define glMultiTexCoord3dvARB MANGLE(MultiTexCoord3dvARB)
+#define glMultiTexCoord3dv MANGLE(MultiTexCoord3dv)
+#define glMultiTexCoord3fARB MANGLE(MultiTexCoord3fARB)
+#define glMultiTexCoord3f MANGLE(MultiTexCoord3f)
+#define glMultiTexCoord3fvARB MANGLE(MultiTexCoord3fvARB)
+#define glMultiTexCoord3fv MANGLE(MultiTexCoord3fv)
+#define glMultiTexCoord3hNV MANGLE(MultiTexCoord3hNV)
+#define glMultiTexCoord3hvNV MANGLE(MultiTexCoord3hvNV)
+#define glMultiTexCoord3iARB MANGLE(MultiTexCoord3iARB)
+#define glMultiTexCoord3i MANGLE(MultiTexCoord3i)
+#define glMultiTexCoord3ivARB MANGLE(MultiTexCoord3ivARB)
+#define glMultiTexCoord3iv MANGLE(MultiTexCoord3iv)
+#define glMultiTexCoord3sARB MANGLE(MultiTexCoord3sARB)
+#define glMultiTexCoord3s MANGLE(MultiTexCoord3s)
+#define glMultiTexCoord3svARB MANGLE(MultiTexCoord3svARB)
+#define glMultiTexCoord3sv MANGLE(MultiTexCoord3sv)
+#define glMultiTexCoord4dARB MANGLE(MultiTexCoord4dARB)
+#define glMultiTexCoord4d MANGLE(MultiTexCoord4d)
+#define glMultiTexCoord4dvARB MANGLE(MultiTexCoord4dvARB)
+#define glMultiTexCoord4dv MANGLE(MultiTexCoord4dv)
+#define glMultiTexCoord4fARB MANGLE(MultiTexCoord4fARB)
+#define glMultiTexCoord4f MANGLE(MultiTexCoord4f)
+#define glMultiTexCoord4fvARB MANGLE(MultiTexCoord4fvARB)
+#define glMultiTexCoord4fv MANGLE(MultiTexCoord4fv)
+#define glMultiTexCoord4hNV MANGLE(MultiTexCoord4hNV)
+#define glMultiTexCoord4hvNV MANGLE(MultiTexCoord4hvNV)
+#define glMultiTexCoord4iARB MANGLE(MultiTexCoord4iARB)
+#define glMultiTexCoord4i MANGLE(MultiTexCoord4i)
+#define glMultiTexCoord4ivARB MANGLE(MultiTexCoord4ivARB)
+#define glMultiTexCoord4iv MANGLE(MultiTexCoord4iv)
+#define glMultiTexCoord4sARB MANGLE(MultiTexCoord4sARB)
+#define glMultiTexCoord4s MANGLE(MultiTexCoord4s)
+#define glMultiTexCoord4svARB MANGLE(MultiTexCoord4svARB)
+#define glMultiTexCoord4sv MANGLE(MultiTexCoord4sv)
+#define glMultMatrixd MANGLE(MultMatrixd)
+#define glMultMatrixf MANGLE(MultMatrixf)
+#define glMultTransposeMatrixdARB MANGLE(MultTransposeMatrixdARB)
+#define glMultTransposeMatrixd MANGLE(MultTransposeMatrixd)
+#define glMultTransposeMatrixfARB MANGLE(MultTransposeMatrixfARB)
+#define glMultTransposeMatrixf MANGLE(MultTransposeMatrixf)
+#define glNewList MANGLE(NewList)
+#define glNewObjectBufferATI MANGLE(NewObjectBufferATI)
+#define glNormal3b MANGLE(Normal3b)
+#define glNormal3bv MANGLE(Normal3bv)
+#define glNormal3d MANGLE(Normal3d)
+#define glNormal3dv MANGLE(Normal3dv)
+#define glNormal3f MANGLE(Normal3f)
+#define glNormal3fVertex3fSUN MANGLE(Normal3fVertex3fSUN)
+#define glNormal3fVertex3fvSUN MANGLE(Normal3fVertex3fvSUN)
+#define glNormal3fv MANGLE(Normal3fv)
+#define glNormal3hNV MANGLE(Normal3hNV)
+#define glNormal3hvNV MANGLE(Normal3hvNV)
+#define glNormal3i MANGLE(Normal3i)
+#define glNormal3iv MANGLE(Normal3iv)
+#define glNormal3s MANGLE(Normal3s)
+#define glNormal3sv MANGLE(Normal3sv)
+#define glNormalPointerEXT MANGLE(NormalPointerEXT)
+#define glNormalPointerListIBM MANGLE(NormalPointerListIBM)
+#define glNormalPointer MANGLE(NormalPointer)
+#define glNormalPointervINTEL MANGLE(NormalPointervINTEL)
+#define glNormalStream3bATI MANGLE(NormalStream3bATI)
+#define glNormalStream3bvATI MANGLE(NormalStream3bvATI)
+#define glNormalStream3dATI MANGLE(NormalStream3dATI)
+#define glNormalStream3dvATI MANGLE(NormalStream3dvATI)
+#define glNormalStream3fATI MANGLE(NormalStream3fATI)
+#define glNormalStream3fvATI MANGLE(NormalStream3fvATI)
+#define glNormalStream3iATI MANGLE(NormalStream3iATI)
+#define glNormalStream3ivATI MANGLE(NormalStream3ivATI)
+#define glNormalStream3sATI MANGLE(NormalStream3sATI)
+#define glNormalStream3svATI MANGLE(NormalStream3svATI)
+#define glOrtho MANGLE(Ortho)
+#define glPassTexCoordATI MANGLE(PassTexCoordATI)
+#define glPassThrough MANGLE(PassThrough)
+#define glPixelDataRangeNV MANGLE(PixelDataRangeNV)
+#define glPixelMapfv MANGLE(PixelMapfv)
+#define glPixelMapuiv MANGLE(PixelMapuiv)
+#define glPixelMapusv MANGLE(PixelMapusv)
+#define glPixelStoref MANGLE(PixelStoref)
+#define glPixelStorei MANGLE(PixelStorei)
+#define glPixelTexGenParameterfSGIS MANGLE(PixelTexGenParameterfSGIS)
+#define glPixelTexGenParameterfvSGIS MANGLE(PixelTexGenParameterfvSGIS)
+#define glPixelTexGenParameteriSGIS MANGLE(PixelTexGenParameteriSGIS)
+#define glPixelTexGenParameterivSGIS MANGLE(PixelTexGenParameterivSGIS)
+#define glPixelTexGenSGIX MANGLE(PixelTexGenSGIX)
+#define glPixelTransferf MANGLE(PixelTransferf)
+#define glPixelTransferi MANGLE(PixelTransferi)
+#define glPixelTransformParameterfEXT MANGLE(PixelTransformParameterfEXT)
+#define glPixelTransformParameterfvEXT MANGLE(PixelTransformParameterfvEXT)
+#define glPixelTransformParameteriEXT MANGLE(PixelTransformParameteriEXT)
+#define glPixelTransformParameterivEXT MANGLE(PixelTransformParameterivEXT)
+#define glPixelZoom MANGLE(PixelZoom)
+#define glPNTrianglesfATI MANGLE(PNTrianglesfATI)
+#define glPNTrianglesiATI MANGLE(PNTrianglesiATI)
+#define glPointParameterfARB MANGLE(PointParameterfARB)
+#define glPointParameterfEXT MANGLE(PointParameterfEXT)
+#define glPointParameterf MANGLE(PointParameterf)
+#define glPointParameterfSGIS MANGLE(PointParameterfSGIS)
+#define glPointParameterfvARB MANGLE(PointParameterfvARB)
+#define glPointParameterfvEXT MANGLE(PointParameterfvEXT)
+#define glPointParameterfv MANGLE(PointParameterfv)
+#define glPointParameterfvSGIS MANGLE(PointParameterfvSGIS)
+#define glPointParameteri MANGLE(PointParameteri)
+#define glPointParameteriNV MANGLE(PointParameteriNV)
+#define glPointParameteriv MANGLE(PointParameteriv)
+#define glPointParameterivNV MANGLE(PointParameterivNV)
+#define glPointSize MANGLE(PointSize)
+#define glPollAsyncSGIX MANGLE(PollAsyncSGIX)
+#define glPollInstrumentsSGIX MANGLE(PollInstrumentsSGIX)
+#define glPolygonMode MANGLE(PolygonMode)
+#define glPolygonOffsetEXT MANGLE(PolygonOffsetEXT)
+#define glPolygonOffset MANGLE(PolygonOffset)
+#define glPolygonStipple MANGLE(PolygonStipple)
+#define glPopAttrib MANGLE(PopAttrib)
+#define glPopClientAttrib MANGLE(PopClientAttrib)
+#define glPopMatrix MANGLE(PopMatrix)
+#define glPopName MANGLE(PopName)
+#define glPrimitiveRestartIndexNV MANGLE(PrimitiveRestartIndexNV)
+#define glPrimitiveRestartNV MANGLE(PrimitiveRestartNV)
+#define glPrioritizeTexturesEXT MANGLE(PrioritizeTexturesEXT)
+#define glPrioritizeTextures MANGLE(PrioritizeTextures)
+#define glProgramBufferParametersfvNV MANGLE(ProgramBufferParametersfvNV)
+#define glProgramBufferParametersIivNV MANGLE(ProgramBufferParametersIivNV)
+#define glProgramBufferParametersIuivNV MANGLE(ProgramBufferParametersIuivNV)
+#define glProgramCallbackMESA MANGLE(ProgramCallbackMESA)
+#define glProgramEnvParameter4dARB MANGLE(ProgramEnvParameter4dARB)
+#define glProgramEnvParameter4dvARB MANGLE(ProgramEnvParameter4dvARB)
+#define glProgramEnvParameter4fARB MANGLE(ProgramEnvParameter4fARB)
+#define glProgramEnvParameter4fvARB MANGLE(ProgramEnvParameter4fvARB)
+#define glProgramEnvParameterI4iNV MANGLE(ProgramEnvParameterI4iNV)
+#define glProgramEnvParameterI4ivNV MANGLE(ProgramEnvParameterI4ivNV)
+#define glProgramEnvParameterI4uiNV MANGLE(ProgramEnvParameterI4uiNV)
+#define glProgramEnvParameterI4uivNV MANGLE(ProgramEnvParameterI4uivNV)
+#define glProgramEnvParameters4fvEXT MANGLE(ProgramEnvParameters4fvEXT)
+#define glProgramEnvParametersI4ivNV MANGLE(ProgramEnvParametersI4ivNV)
+#define glProgramEnvParametersI4uivNV MANGLE(ProgramEnvParametersI4uivNV)
+#define glProgramLocalParameter4dARB MANGLE(ProgramLocalParameter4dARB)
+#define glProgramLocalParameter4dvARB MANGLE(ProgramLocalParameter4dvARB)
+#define glProgramLocalParameter4fARB MANGLE(ProgramLocalParameter4fARB)
+#define glProgramLocalParameter4fvARB MANGLE(ProgramLocalParameter4fvARB)
+#define glProgramLocalParameterI4iNV MANGLE(ProgramLocalParameterI4iNV)
+#define glProgramLocalParameterI4ivNV MANGLE(ProgramLocalParameterI4ivNV)
+#define glProgramLocalParameterI4uiNV MANGLE(ProgramLocalParameterI4uiNV)
+#define glProgramLocalParameterI4uivNV MANGLE(ProgramLocalParameterI4uivNV)
+#define glProgramLocalParameters4fvEXT MANGLE(ProgramLocalParameters4fvEXT)
+#define glProgramLocalParametersI4ivNV MANGLE(ProgramLocalParametersI4ivNV)
+#define glProgramLocalParametersI4uivNV MANGLE(ProgramLocalParametersI4uivNV)
+#define glProgramNamedParameter4dNV MANGLE(ProgramNamedParameter4dNV)
+#define glProgramNamedParameter4dvNV MANGLE(ProgramNamedParameter4dvNV)
+#define glProgramNamedParameter4fNV MANGLE(ProgramNamedParameter4fNV)
+#define glProgramNamedParameter4fvNV MANGLE(ProgramNamedParameter4fvNV)
+#define glProgramParameter4dNV MANGLE(ProgramParameter4dNV)
+#define glProgramParameter4dvNV MANGLE(ProgramParameter4dvNV)
+#define glProgramParameter4fNV MANGLE(ProgramParameter4fNV)
+#define glProgramParameter4fvNV MANGLE(ProgramParameter4fvNV)
+#define glProgramParameteriEXT MANGLE(ProgramParameteriEXT)
+#define glProgramParameters4dvNV MANGLE(ProgramParameters4dvNV)
+#define glProgramParameters4fvNV MANGLE(ProgramParameters4fvNV)
+#define glProgramStringARB MANGLE(ProgramStringARB)
+#define glProgramVertexLimitNV MANGLE(ProgramVertexLimitNV)
+#define glPushAttrib MANGLE(PushAttrib)
+#define glPushClientAttrib MANGLE(PushClientAttrib)
+#define glPushMatrix MANGLE(PushMatrix)
+#define glPushName MANGLE(PushName)
+#define glRasterPos2d MANGLE(RasterPos2d)
+#define glRasterPos2dv MANGLE(RasterPos2dv)
+#define glRasterPos2f MANGLE(RasterPos2f)
+#define glRasterPos2fv MANGLE(RasterPos2fv)
+#define glRasterPos2i MANGLE(RasterPos2i)
+#define glRasterPos2iv MANGLE(RasterPos2iv)
+#define glRasterPos2s MANGLE(RasterPos2s)
+#define glRasterPos2sv MANGLE(RasterPos2sv)
+#define glRasterPos3d MANGLE(RasterPos3d)
+#define glRasterPos3dv MANGLE(RasterPos3dv)
+#define glRasterPos3f MANGLE(RasterPos3f)
+#define glRasterPos3fv MANGLE(RasterPos3fv)
+#define glRasterPos3i MANGLE(RasterPos3i)
+#define glRasterPos3iv MANGLE(RasterPos3iv)
+#define glRasterPos3s MANGLE(RasterPos3s)
+#define glRasterPos3sv MANGLE(RasterPos3sv)
+#define glRasterPos4d MANGLE(RasterPos4d)
+#define glRasterPos4dv MANGLE(RasterPos4dv)
+#define glRasterPos4f MANGLE(RasterPos4f)
+#define glRasterPos4fv MANGLE(RasterPos4fv)
+#define glRasterPos4i MANGLE(RasterPos4i)
+#define glRasterPos4iv MANGLE(RasterPos4iv)
+#define glRasterPos4s MANGLE(RasterPos4s)
+#define glRasterPos4sv MANGLE(RasterPos4sv)
+#define glReadBuffer MANGLE(ReadBuffer)
+#define glReadInstrumentsSGIX MANGLE(ReadInstrumentsSGIX)
+#define glReadPixels MANGLE(ReadPixels)
+#define glRectd MANGLE(Rectd)
+#define glRectdv MANGLE(Rectdv)
+#define glRectf MANGLE(Rectf)
+#define glRectfv MANGLE(Rectfv)
+#define glRecti MANGLE(Recti)
+#define glRectiv MANGLE(Rectiv)
+#define glRects MANGLE(Rects)
+#define glRectsv MANGLE(Rectsv)
+#define glReferencePlaneSGIX MANGLE(ReferencePlaneSGIX)
+#define glRenderbufferStorageEXT MANGLE(RenderbufferStorageEXT)
+#define glRenderbufferStorageMultisampleCoverageNV MANGLE(RenderbufferStorageMultisampleCoverageNV)
+#define glRenderbufferStorageMultisampleEXT MANGLE(RenderbufferStorageMultisampleEXT)
+#define glRenderMode MANGLE(RenderMode)
+#define glReplacementCodePointerSUN MANGLE(ReplacementCodePointerSUN)
+#define glReplacementCodeubSUN MANGLE(ReplacementCodeubSUN)
+#define glReplacementCodeubvSUN MANGLE(ReplacementCodeubvSUN)
+#define glReplacementCodeuiColor3fVertex3fSUN MANGLE(ReplacementCodeuiColor3fVertex3fSUN)
+#define glReplacementCodeuiColor3fVertex3fvSUN MANGLE(ReplacementCodeuiColor3fVertex3fvSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor4ubVertex3fSUN MANGLE(ReplacementCodeuiColor4ubVertex3fSUN)
+#define glReplacementCodeuiColor4ubVertex3fvSUN MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN)
+#define glReplacementCodeuiNormal3fVertex3fSUN MANGLE(ReplacementCodeuiNormal3fVertex3fSUN)
+#define glReplacementCodeuiNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN)
+#define glReplacementCodeuiSUN MANGLE(ReplacementCodeuiSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fvSUN MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN)
+#define glReplacementCodeuiVertex3fSUN MANGLE(ReplacementCodeuiVertex3fSUN)
+#define glReplacementCodeuiVertex3fvSUN MANGLE(ReplacementCodeuiVertex3fvSUN)
+#define glReplacementCodeuivSUN MANGLE(ReplacementCodeuivSUN)
+#define glReplacementCodeusSUN MANGLE(ReplacementCodeusSUN)
+#define glReplacementCodeusvSUN MANGLE(ReplacementCodeusvSUN)
+#define glRequestResidentProgramsNV MANGLE(RequestResidentProgramsNV)
+#define glResetHistogramEXT MANGLE(ResetHistogramEXT)
+#define glResetHistogram MANGLE(ResetHistogram)
+#define glResetMinmaxEXT MANGLE(ResetMinmaxEXT)
+#define glResetMinmax MANGLE(ResetMinmax)
+#define glResizeBuffersMESA MANGLE(ResizeBuffersMESA)
+#define glRotated MANGLE(Rotated)
+#define glRotatef MANGLE(Rotatef)
+#define glSampleCoverageARB MANGLE(SampleCoverageARB)
+#define glSampleCoverage MANGLE(SampleCoverage)
+#define glSampleMapATI MANGLE(SampleMapATI)
+#define glSampleMaskEXT MANGLE(SampleMaskEXT)
+#define glSampleMaskSGIS MANGLE(SampleMaskSGIS)
+#define glSamplePatternEXT MANGLE(SamplePatternEXT)
+#define glSamplePatternSGIS MANGLE(SamplePatternSGIS)
+#define glScaled MANGLE(Scaled)
+#define glScalef MANGLE(Scalef)
+#define glScissor MANGLE(Scissor)
+#define glSecondaryColor3bEXT MANGLE(SecondaryColor3bEXT)
+#define glSecondaryColor3b MANGLE(SecondaryColor3b)
+#define glSecondaryColor3bvEXT MANGLE(SecondaryColor3bvEXT)
+#define glSecondaryColor3bv MANGLE(SecondaryColor3bv)
+#define glSecondaryColor3dEXT MANGLE(SecondaryColor3dEXT)
+#define glSecondaryColor3d MANGLE(SecondaryColor3d)
+#define glSecondaryColor3dvEXT MANGLE(SecondaryColor3dvEXT)
+#define glSecondaryColor3dv MANGLE(SecondaryColor3dv)
+#define glSecondaryColor3fEXT MANGLE(SecondaryColor3fEXT)
+#define glSecondaryColor3f MANGLE(SecondaryColor3f)
+#define glSecondaryColor3fvEXT MANGLE(SecondaryColor3fvEXT)
+#define glSecondaryColor3fv MANGLE(SecondaryColor3fv)
+#define glSecondaryColor3hNV MANGLE(SecondaryColor3hNV)
+#define glSecondaryColor3hvNV MANGLE(SecondaryColor3hvNV)
+#define glSecondaryColor3iEXT MANGLE(SecondaryColor3iEXT)
+#define glSecondaryColor3i MANGLE(SecondaryColor3i)
+#define glSecondaryColor3ivEXT MANGLE(SecondaryColor3ivEXT)
+#define glSecondaryColor3iv MANGLE(SecondaryColor3iv)
+#define glSecondaryColor3sEXT MANGLE(SecondaryColor3sEXT)
+#define glSecondaryColor3s MANGLE(SecondaryColor3s)
+#define glSecondaryColor3svEXT MANGLE(SecondaryColor3svEXT)
+#define glSecondaryColor3sv MANGLE(SecondaryColor3sv)
+#define glSecondaryColor3ubEXT MANGLE(SecondaryColor3ubEXT)
+#define glSecondaryColor3ub MANGLE(SecondaryColor3ub)
+#define glSecondaryColor3ubvEXT MANGLE(SecondaryColor3ubvEXT)
+#define glSecondaryColor3ubv MANGLE(SecondaryColor3ubv)
+#define glSecondaryColor3uiEXT MANGLE(SecondaryColor3uiEXT)
+#define glSecondaryColor3ui MANGLE(SecondaryColor3ui)
+#define glSecondaryColor3uivEXT MANGLE(SecondaryColor3uivEXT)
+#define glSecondaryColor3uiv MANGLE(SecondaryColor3uiv)
+#define glSecondaryColor3usEXT MANGLE(SecondaryColor3usEXT)
+#define glSecondaryColor3us MANGLE(SecondaryColor3us)
+#define glSecondaryColor3usvEXT MANGLE(SecondaryColor3usvEXT)
+#define glSecondaryColor3usv MANGLE(SecondaryColor3usv)
+#define glSecondaryColorPointerEXT MANGLE(SecondaryColorPointerEXT)
+#define glSecondaryColorPointerListIBM MANGLE(SecondaryColorPointerListIBM)
+#define glSecondaryColorPointer MANGLE(SecondaryColorPointer)
+#define glSelectBuffer MANGLE(SelectBuffer)
+#define glSeparableFilter2DEXT MANGLE(SeparableFilter2DEXT)
+#define glSeparableFilter2D MANGLE(SeparableFilter2D)
+#define glSetFenceAPPLE MANGLE(SetFenceAPPLE)
+#define glSetFenceNV MANGLE(SetFenceNV)
+#define glSetFragmentShaderConstantATI MANGLE(SetFragmentShaderConstantATI)
+#define glSetInvariantEXT MANGLE(SetInvariantEXT)
+#define glSetLocalConstantEXT MANGLE(SetLocalConstantEXT)
+#define glShadeModel MANGLE(ShadeModel)
+#define glShaderOp1EXT MANGLE(ShaderOp1EXT)
+#define glShaderOp2EXT MANGLE(ShaderOp2EXT)
+#define glShaderOp3EXT MANGLE(ShaderOp3EXT)
+#define glShaderSourceARB MANGLE(ShaderSourceARB)
+#define glShaderSource MANGLE(ShaderSource)
+#define glSharpenTexFuncSGIS MANGLE(SharpenTexFuncSGIS)
+#define glSpriteParameterfSGIX MANGLE(SpriteParameterfSGIX)
+#define glSpriteParameterfvSGIX MANGLE(SpriteParameterfvSGIX)
+#define glSpriteParameteriSGIX MANGLE(SpriteParameteriSGIX)
+#define glSpriteParameterivSGIX MANGLE(SpriteParameterivSGIX)
+#define glStartInstrumentsSGIX MANGLE(StartInstrumentsSGIX)
+#define glStencilClearTagEXT MANGLE(StencilClearTagEXT)
+#define glStencilFunc MANGLE(StencilFunc)
+#define glStencilFuncSeparateATI MANGLE(StencilFuncSeparateATI)
+#define glStencilFuncSeparate MANGLE(StencilFuncSeparate)
+#define glStencilMask MANGLE(StencilMask)
+#define glStencilMaskSeparate MANGLE(StencilMaskSeparate)
+#define glStencilOp MANGLE(StencilOp)
+#define glStencilOpSeparateATI MANGLE(StencilOpSeparateATI)
+#define glStencilOpSeparate MANGLE(StencilOpSeparate)
+#define glStopInstrumentsSGIX MANGLE(StopInstrumentsSGIX)
+#define glStringMarkerGREMEDY MANGLE(StringMarkerGREMEDY)
+#define glSwizzleEXT MANGLE(SwizzleEXT)
+#define glTagSampleBufferSGIX MANGLE(TagSampleBufferSGIX)
+#define glTangent3bEXT MANGLE(Tangent3bEXT)
+#define glTangent3bvEXT MANGLE(Tangent3bvEXT)
+#define glTangent3dEXT MANGLE(Tangent3dEXT)
+#define glTangent3dvEXT MANGLE(Tangent3dvEXT)
+#define glTangent3fEXT MANGLE(Tangent3fEXT)
+#define glTangent3fvEXT MANGLE(Tangent3fvEXT)
+#define glTangent3iEXT MANGLE(Tangent3iEXT)
+#define glTangent3ivEXT MANGLE(Tangent3ivEXT)
+#define glTangent3sEXT MANGLE(Tangent3sEXT)
+#define glTangent3svEXT MANGLE(Tangent3svEXT)
+#define glTangentPointerEXT MANGLE(TangentPointerEXT)
+#define glTbufferMask3DFX MANGLE(TbufferMask3DFX)
+#define glTestFenceAPPLE MANGLE(TestFenceAPPLE)
+#define glTestFenceNV MANGLE(TestFenceNV)
+#define glTestObjectAPPLE MANGLE(TestObjectAPPLE)
+#define glTexBufferEXT MANGLE(TexBufferEXT)
+#define glTexBumpParameterfvATI MANGLE(TexBumpParameterfvATI)
+#define glTexBumpParameterivATI MANGLE(TexBumpParameterivATI)
+#define glTexCoord1d MANGLE(TexCoord1d)
+#define glTexCoord1dv MANGLE(TexCoord1dv)
+#define glTexCoord1f MANGLE(TexCoord1f)
+#define glTexCoord1fv MANGLE(TexCoord1fv)
+#define glTexCoord1hNV MANGLE(TexCoord1hNV)
+#define glTexCoord1hvNV MANGLE(TexCoord1hvNV)
+#define glTexCoord1i MANGLE(TexCoord1i)
+#define glTexCoord1iv MANGLE(TexCoord1iv)
+#define glTexCoord1s MANGLE(TexCoord1s)
+#define glTexCoord1sv MANGLE(TexCoord1sv)
+#define glTexCoord2d MANGLE(TexCoord2d)
+#define glTexCoord2dv MANGLE(TexCoord2dv)
+#define glTexCoord2fColor3fVertex3fSUN MANGLE(TexCoord2fColor3fVertex3fSUN)
+#define glTexCoord2fColor3fVertex3fvSUN MANGLE(TexCoord2fColor3fVertex3fvSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fvSUN MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glTexCoord2fColor4ubVertex3fSUN MANGLE(TexCoord2fColor4ubVertex3fSUN)
+#define glTexCoord2fColor4ubVertex3fvSUN MANGLE(TexCoord2fColor4ubVertex3fvSUN)
+#define glTexCoord2f MANGLE(TexCoord2f)
+#define glTexCoord2fNormal3fVertex3fSUN MANGLE(TexCoord2fNormal3fVertex3fSUN)
+#define glTexCoord2fNormal3fVertex3fvSUN MANGLE(TexCoord2fNormal3fVertex3fvSUN)
+#define glTexCoord2fVertex3fSUN MANGLE(TexCoord2fVertex3fSUN)
+#define glTexCoord2fVertex3fvSUN MANGLE(TexCoord2fVertex3fvSUN)
+#define glTexCoord2fv MANGLE(TexCoord2fv)
+#define glTexCoord2hNV MANGLE(TexCoord2hNV)
+#define glTexCoord2hvNV MANGLE(TexCoord2hvNV)
+#define glTexCoord2i MANGLE(TexCoord2i)
+#define glTexCoord2iv MANGLE(TexCoord2iv)
+#define glTexCoord2s MANGLE(TexCoord2s)
+#define glTexCoord2sv MANGLE(TexCoord2sv)
+#define glTexCoord3d MANGLE(TexCoord3d)
+#define glTexCoord3dv MANGLE(TexCoord3dv)
+#define glTexCoord3f MANGLE(TexCoord3f)
+#define glTexCoord3fv MANGLE(TexCoord3fv)
+#define glTexCoord3hNV MANGLE(TexCoord3hNV)
+#define glTexCoord3hvNV MANGLE(TexCoord3hvNV)
+#define glTexCoord3i MANGLE(TexCoord3i)
+#define glTexCoord3iv MANGLE(TexCoord3iv)
+#define glTexCoord3s MANGLE(TexCoord3s)
+#define glTexCoord3sv MANGLE(TexCoord3sv)
+#define glTexCoord4d MANGLE(TexCoord4d)
+#define glTexCoord4dv MANGLE(TexCoord4dv)
+#define glTexCoord4fColor4fNormal3fVertex4fSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fvSUN MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN)
+#define glTexCoord4f MANGLE(TexCoord4f)
+#define glTexCoord4fVertex4fSUN MANGLE(TexCoord4fVertex4fSUN)
+#define glTexCoord4fVertex4fvSUN MANGLE(TexCoord4fVertex4fvSUN)
+#define glTexCoord4fv MANGLE(TexCoord4fv)
+#define glTexCoord4hNV MANGLE(TexCoord4hNV)
+#define glTexCoord4hvNV MANGLE(TexCoord4hvNV)
+#define glTexCoord4i MANGLE(TexCoord4i)
+#define glTexCoord4iv MANGLE(TexCoord4iv)
+#define glTexCoord4s MANGLE(TexCoord4s)
+#define glTexCoord4sv MANGLE(TexCoord4sv)
+#define glTexCoordPointerEXT MANGLE(TexCoordPointerEXT)
+#define glTexCoordPointerListIBM MANGLE(TexCoordPointerListIBM)
+#define glTexCoordPointer MANGLE(TexCoordPointer)
+#define glTexCoordPointervINTEL MANGLE(TexCoordPointervINTEL)
+#define glTexEnvf MANGLE(TexEnvf)
+#define glTexEnvfv MANGLE(TexEnvfv)
+#define glTexEnvi MANGLE(TexEnvi)
+#define glTexEnviv MANGLE(TexEnviv)
+#define glTexFilterFuncSGIS MANGLE(TexFilterFuncSGIS)
+#define glTexGend MANGLE(TexGend)
+#define glTexGendv MANGLE(TexGendv)
+#define glTexGenf MANGLE(TexGenf)
+#define glTexGenfv MANGLE(TexGenfv)
+#define glTexGeni MANGLE(TexGeni)
+#define glTexGeniv MANGLE(TexGeniv)
+#define glTexImage1D MANGLE(TexImage1D)
+#define glTexImage2D MANGLE(TexImage2D)
+#define glTexImage3DEXT MANGLE(TexImage3DEXT)
+#define glTexImage3D MANGLE(TexImage3D)
+#define glTexImage4DSGIS MANGLE(TexImage4DSGIS)
+#define glTexParameterf MANGLE(TexParameterf)
+#define glTexParameterfv MANGLE(TexParameterfv)
+#define glTexParameterIivEXT MANGLE(TexParameterIivEXT)
+#define glTexParameteri MANGLE(TexParameteri)
+#define glTexParameterIuivEXT MANGLE(TexParameterIuivEXT)
+#define glTexParameteriv MANGLE(TexParameteriv)
+#define glTexSubImage1DEXT MANGLE(TexSubImage1DEXT)
+#define glTexSubImage1D MANGLE(TexSubImage1D)
+#define glTexSubImage2DEXT MANGLE(TexSubImage2DEXT)
+#define glTexSubImage2D MANGLE(TexSubImage2D)
+#define glTexSubImage3DEXT MANGLE(TexSubImage3DEXT)
+#define glTexSubImage3D MANGLE(TexSubImage3D)
+#define glTexSubImage4DSGIS MANGLE(TexSubImage4DSGIS)
+#define glTextureColorMaskSGIS MANGLE(TextureColorMaskSGIS)
+#define glTextureLightEXT MANGLE(TextureLightEXT)
+#define glTextureMaterialEXT MANGLE(TextureMaterialEXT)
+#define glTextureNormalEXT MANGLE(TextureNormalEXT)
+#define glTrackMatrixNV MANGLE(TrackMatrixNV)
+#define glTransformFeedbackAttribsNV MANGLE(TransformFeedbackAttribsNV)
+#define glTransformFeedbackVaryingsNV MANGLE(TransformFeedbackVaryingsNV)
+#define glTranslated MANGLE(Translated)
+#define glTranslatef MANGLE(Translatef)
+#define glUniform1fARB MANGLE(Uniform1fARB)
+#define glUniform1f MANGLE(Uniform1f)
+#define glUniform1fvARB MANGLE(Uniform1fvARB)
+#define glUniform1fv MANGLE(Uniform1fv)
+#define glUniform1iARB MANGLE(Uniform1iARB)
+#define glUniform1i MANGLE(Uniform1i)
+#define glUniform1ivARB MANGLE(Uniform1ivARB)
+#define glUniform1iv MANGLE(Uniform1iv)
+#define glUniform1uiEXT MANGLE(Uniform1uiEXT)
+#define glUniform1uivEXT MANGLE(Uniform1uivEXT)
+#define glUniform2fARB MANGLE(Uniform2fARB)
+#define glUniform2f MANGLE(Uniform2f)
+#define glUniform2fvARB MANGLE(Uniform2fvARB)
+#define glUniform2fv MANGLE(Uniform2fv)
+#define glUniform2iARB MANGLE(Uniform2iARB)
+#define glUniform2i MANGLE(Uniform2i)
+#define glUniform2ivARB MANGLE(Uniform2ivARB)
+#define glUniform2iv MANGLE(Uniform2iv)
+#define glUniform2uiEXT MANGLE(Uniform2uiEXT)
+#define glUniform2uivEXT MANGLE(Uniform2uivEXT)
+#define glUniform3fARB MANGLE(Uniform3fARB)
+#define glUniform3f MANGLE(Uniform3f)
+#define glUniform3fvARB MANGLE(Uniform3fvARB)
+#define glUniform3fv MANGLE(Uniform3fv)
+#define glUniform3iARB MANGLE(Uniform3iARB)
+#define glUniform3i MANGLE(Uniform3i)
+#define glUniform3ivARB MANGLE(Uniform3ivARB)
+#define glUniform3iv MANGLE(Uniform3iv)
+#define glUniform3uiEXT MANGLE(Uniform3uiEXT)
+#define glUniform3uivEXT MANGLE(Uniform3uivEXT)
+#define glUniform4fARB MANGLE(Uniform4fARB)
+#define glUniform4f MANGLE(Uniform4f)
+#define glUniform4fvARB MANGLE(Uniform4fvARB)
+#define glUniform4fv MANGLE(Uniform4fv)
+#define glUniform4iARB MANGLE(Uniform4iARB)
+#define glUniform4i MANGLE(Uniform4i)
+#define glUniform4ivARB MANGLE(Uniform4ivARB)
+#define glUniform4iv MANGLE(Uniform4iv)
+#define glUniform4uiEXT MANGLE(Uniform4uiEXT)
+#define glUniform4uivEXT MANGLE(Uniform4uivEXT)
+#define glUniformBufferEXT MANGLE(UniformBufferEXT)
+#define glUniformMatrix2fvARB MANGLE(UniformMatrix2fvARB)
+#define glUniformMatrix2fv MANGLE(UniformMatrix2fv)
+#define glUniformMatrix2x3fv MANGLE(UniformMatrix2x3fv)
+#define glUniformMatrix2x4fv MANGLE(UniformMatrix2x4fv)
+#define glUniformMatrix3fvARB MANGLE(UniformMatrix3fvARB)
+#define glUniformMatrix3fv MANGLE(UniformMatrix3fv)
+#define glUniformMatrix3x2fv MANGLE(UniformMatrix3x2fv)
+#define glUniformMatrix3x4fv MANGLE(UniformMatrix3x4fv)
+#define glUniformMatrix4fvARB MANGLE(UniformMatrix4fvARB)
+#define glUniformMatrix4fv MANGLE(UniformMatrix4fv)
+#define glUniformMatrix4x2fv MANGLE(UniformMatrix4x2fv)
+#define glUniformMatrix4x3fv MANGLE(UniformMatrix4x3fv)
+#define glUnlockArraysEXT MANGLE(UnlockArraysEXT)
+#define glUnmapBufferARB MANGLE(UnmapBufferARB)
+#define glUnmapBuffer MANGLE(UnmapBuffer)
+#define glUnmapObjectBufferATI MANGLE(UnmapObjectBufferATI)
+#define glUpdateObjectBufferATI MANGLE(UpdateObjectBufferATI)
+#define glUseProgram MANGLE(UseProgram)
+#define glUseProgramObjectARB MANGLE(UseProgramObjectARB)
+#define glValidateProgramARB MANGLE(ValidateProgramARB)
+#define glValidateProgram MANGLE(ValidateProgram)
+#define glVariantArrayObjectATI MANGLE(VariantArrayObjectATI)
+#define glVariantbvEXT MANGLE(VariantbvEXT)
+#define glVariantdvEXT MANGLE(VariantdvEXT)
+#define glVariantfvEXT MANGLE(VariantfvEXT)
+#define glVariantivEXT MANGLE(VariantivEXT)
+#define glVariantPointerEXT MANGLE(VariantPointerEXT)
+#define glVariantsvEXT MANGLE(VariantsvEXT)
+#define glVariantubvEXT MANGLE(VariantubvEXT)
+#define glVariantuivEXT MANGLE(VariantuivEXT)
+#define glVariantusvEXT MANGLE(VariantusvEXT)
+#define glVertex2d MANGLE(Vertex2d)
+#define glVertex2dv MANGLE(Vertex2dv)
+#define glVertex2f MANGLE(Vertex2f)
+#define glVertex2fv MANGLE(Vertex2fv)
+#define glVertex2hNV MANGLE(Vertex2hNV)
+#define glVertex2hvNV MANGLE(Vertex2hvNV)
+#define glVertex2i MANGLE(Vertex2i)
+#define glVertex2iv MANGLE(Vertex2iv)
+#define glVertex2s MANGLE(Vertex2s)
+#define glVertex2sv MANGLE(Vertex2sv)
+#define glVertex3d MANGLE(Vertex3d)
+#define glVertex3dv MANGLE(Vertex3dv)
+#define glVertex3f MANGLE(Vertex3f)
+#define glVertex3fv MANGLE(Vertex3fv)
+#define glVertex3hNV MANGLE(Vertex3hNV)
+#define glVertex3hvNV MANGLE(Vertex3hvNV)
+#define glVertex3i MANGLE(Vertex3i)
+#define glVertex3iv MANGLE(Vertex3iv)
+#define glVertex3s MANGLE(Vertex3s)
+#define glVertex3sv MANGLE(Vertex3sv)
+#define glVertex4d MANGLE(Vertex4d)
+#define glVertex4dv MANGLE(Vertex4dv)
+#define glVertex4f MANGLE(Vertex4f)
+#define glVertex4fv MANGLE(Vertex4fv)
+#define glVertex4hNV MANGLE(Vertex4hNV)
+#define glVertex4hvNV MANGLE(Vertex4hvNV)
+#define glVertex4i MANGLE(Vertex4i)
+#define glVertex4iv MANGLE(Vertex4iv)
+#define glVertex4s MANGLE(Vertex4s)
+#define glVertex4sv MANGLE(Vertex4sv)
+#define glVertexArrayParameteriAPPLE MANGLE(VertexArrayParameteriAPPLE)
+#define glVertexArrayRangeAPPLE MANGLE(VertexArrayRangeAPPLE)
+#define glVertexArrayRangeNV MANGLE(VertexArrayRangeNV)
+#define glVertexAttrib1dARB MANGLE(VertexAttrib1dARB)
+#define glVertexAttrib1d MANGLE(VertexAttrib1d)
+#define glVertexAttrib1dNV MANGLE(VertexAttrib1dNV)
+#define glVertexAttrib1dvARB MANGLE(VertexAttrib1dvARB)
+#define glVertexAttrib1dv MANGLE(VertexAttrib1dv)
+#define glVertexAttrib1dvNV MANGLE(VertexAttrib1dvNV)
+#define glVertexAttrib1fARB MANGLE(VertexAttrib1fARB)
+#define glVertexAttrib1f MANGLE(VertexAttrib1f)
+#define glVertexAttrib1fNV MANGLE(VertexAttrib1fNV)
+#define glVertexAttrib1fvARB MANGLE(VertexAttrib1fvARB)
+#define glVertexAttrib1fv MANGLE(VertexAttrib1fv)
+#define glVertexAttrib1fvNV MANGLE(VertexAttrib1fvNV)
+#define glVertexAttrib1hNV MANGLE(VertexAttrib1hNV)
+#define glVertexAttrib1hvNV MANGLE(VertexAttrib1hvNV)
+#define glVertexAttrib1sARB MANGLE(VertexAttrib1sARB)
+#define glVertexAttrib1s MANGLE(VertexAttrib1s)
+#define glVertexAttrib1sNV MANGLE(VertexAttrib1sNV)
+#define glVertexAttrib1svARB MANGLE(VertexAttrib1svARB)
+#define glVertexAttrib1sv MANGLE(VertexAttrib1sv)
+#define glVertexAttrib1svNV MANGLE(VertexAttrib1svNV)
+#define glVertexAttrib2dARB MANGLE(VertexAttrib2dARB)
+#define glVertexAttrib2d MANGLE(VertexAttrib2d)
+#define glVertexAttrib2dNV MANGLE(VertexAttrib2dNV)
+#define glVertexAttrib2dvARB MANGLE(VertexAttrib2dvARB)
+#define glVertexAttrib2dv MANGLE(VertexAttrib2dv)
+#define glVertexAttrib2dvNV MANGLE(VertexAttrib2dvNV)
+#define glVertexAttrib2fARB MANGLE(VertexAttrib2fARB)
+#define glVertexAttrib2f MANGLE(VertexAttrib2f)
+#define glVertexAttrib2fNV MANGLE(VertexAttrib2fNV)
+#define glVertexAttrib2fvARB MANGLE(VertexAttrib2fvARB)
+#define glVertexAttrib2fv MANGLE(VertexAttrib2fv)
+#define glVertexAttrib2fvNV MANGLE(VertexAttrib2fvNV)
+#define glVertexAttrib2hNV MANGLE(VertexAttrib2hNV)
+#define glVertexAttrib2hvNV MANGLE(VertexAttrib2hvNV)
+#define glVertexAttrib2sARB MANGLE(VertexAttrib2sARB)
+#define glVertexAttrib2s MANGLE(VertexAttrib2s)
+#define glVertexAttrib2sNV MANGLE(VertexAttrib2sNV)
+#define glVertexAttrib2svARB MANGLE(VertexAttrib2svARB)
+#define glVertexAttrib2sv MANGLE(VertexAttrib2sv)
+#define glVertexAttrib2svNV MANGLE(VertexAttrib2svNV)
+#define glVertexAttrib3dARB MANGLE(VertexAttrib3dARB)
+#define glVertexAttrib3d MANGLE(VertexAttrib3d)
+#define glVertexAttrib3dNV MANGLE(VertexAttrib3dNV)
+#define glVertexAttrib3dvARB MANGLE(VertexAttrib3dvARB)
+#define glVertexAttrib3dv MANGLE(VertexAttrib3dv)
+#define glVertexAttrib3dvNV MANGLE(VertexAttrib3dvNV)
+#define glVertexAttrib3fARB MANGLE(VertexAttrib3fARB)
+#define glVertexAttrib3f MANGLE(VertexAttrib3f)
+#define glVertexAttrib3fNV MANGLE(VertexAttrib3fNV)
+#define glVertexAttrib3fvARB MANGLE(VertexAttrib3fvARB)
+#define glVertexAttrib3fv MANGLE(VertexAttrib3fv)
+#define glVertexAttrib3fvNV MANGLE(VertexAttrib3fvNV)
+#define glVertexAttrib3hNV MANGLE(VertexAttrib3hNV)
+#define glVertexAttrib3hvNV MANGLE(VertexAttrib3hvNV)
+#define glVertexAttrib3sARB MANGLE(VertexAttrib3sARB)
+#define glVertexAttrib3s MANGLE(VertexAttrib3s)
+#define glVertexAttrib3sNV MANGLE(VertexAttrib3sNV)
+#define glVertexAttrib3svARB MANGLE(VertexAttrib3svARB)
+#define glVertexAttrib3sv MANGLE(VertexAttrib3sv)
+#define glVertexAttrib3svNV MANGLE(VertexAttrib3svNV)
+#define glVertexAttrib4bvARB MANGLE(VertexAttrib4bvARB)
+#define glVertexAttrib4bv MANGLE(VertexAttrib4bv)
+#define glVertexAttrib4dARB MANGLE(VertexAttrib4dARB)
+#define glVertexAttrib4d MANGLE(VertexAttrib4d)
+#define glVertexAttrib4dNV MANGLE(VertexAttrib4dNV)
+#define glVertexAttrib4dvARB MANGLE(VertexAttrib4dvARB)
+#define glVertexAttrib4dv MANGLE(VertexAttrib4dv)
+#define glVertexAttrib4dvNV MANGLE(VertexAttrib4dvNV)
+#define glVertexAttrib4fARB MANGLE(VertexAttrib4fARB)
+#define glVertexAttrib4f MANGLE(VertexAttrib4f)
+#define glVertexAttrib4fNV MANGLE(VertexAttrib4fNV)
+#define glVertexAttrib4fvARB MANGLE(VertexAttrib4fvARB)
+#define glVertexAttrib4fv MANGLE(VertexAttrib4fv)
+#define glVertexAttrib4fvNV MANGLE(VertexAttrib4fvNV)
+#define glVertexAttrib4hNV MANGLE(VertexAttrib4hNV)
+#define glVertexAttrib4hvNV MANGLE(VertexAttrib4hvNV)
+#define glVertexAttrib4ivARB MANGLE(VertexAttrib4ivARB)
+#define glVertexAttrib4iv MANGLE(VertexAttrib4iv)
+#define glVertexAttrib4NbvARB MANGLE(VertexAttrib4NbvARB)
+#define glVertexAttrib4Nbv MANGLE(VertexAttrib4Nbv)
+#define glVertexAttrib4NivARB MANGLE(VertexAttrib4NivARB)
+#define glVertexAttrib4Niv MANGLE(VertexAttrib4Niv)
+#define glVertexAttrib4NsvARB MANGLE(VertexAttrib4NsvARB)
+#define glVertexAttrib4Nsv MANGLE(VertexAttrib4Nsv)
+#define glVertexAttrib4NubARB MANGLE(VertexAttrib4NubARB)
+#define glVertexAttrib4Nub MANGLE(VertexAttrib4Nub)
+#define glVertexAttrib4NubvARB MANGLE(VertexAttrib4NubvARB)
+#define glVertexAttrib4Nubv MANGLE(VertexAttrib4Nubv)
+#define glVertexAttrib4NuivARB MANGLE(VertexAttrib4NuivARB)
+#define glVertexAttrib4Nuiv MANGLE(VertexAttrib4Nuiv)
+#define glVertexAttrib4NusvARB MANGLE(VertexAttrib4NusvARB)
+#define glVertexAttrib4Nusv MANGLE(VertexAttrib4Nusv)
+#define glVertexAttrib4sARB MANGLE(VertexAttrib4sARB)
+#define glVertexAttrib4s MANGLE(VertexAttrib4s)
+#define glVertexAttrib4sNV MANGLE(VertexAttrib4sNV)
+#define glVertexAttrib4svARB MANGLE(VertexAttrib4svARB)
+#define glVertexAttrib4sv MANGLE(VertexAttrib4sv)
+#define glVertexAttrib4svNV MANGLE(VertexAttrib4svNV)
+#define glVertexAttrib4ubNV MANGLE(VertexAttrib4ubNV)
+#define glVertexAttrib4ubvARB MANGLE(VertexAttrib4ubvARB)
+#define glVertexAttrib4ubv MANGLE(VertexAttrib4ubv)
+#define glVertexAttrib4ubvNV MANGLE(VertexAttrib4ubvNV)
+#define glVertexAttrib4uivARB MANGLE(VertexAttrib4uivARB)
+#define glVertexAttrib4uiv MANGLE(VertexAttrib4uiv)
+#define glVertexAttrib4usvARB MANGLE(VertexAttrib4usvARB)
+#define glVertexAttrib4usv MANGLE(VertexAttrib4usv)
+#define glVertexAttribArrayObjectATI MANGLE(VertexAttribArrayObjectATI)
+#define glVertexAttribI1iEXT MANGLE(VertexAttribI1iEXT)
+#define glVertexAttribI1ivEXT MANGLE(VertexAttribI1ivEXT)
+#define glVertexAttribI1uiEXT MANGLE(VertexAttribI1uiEXT)
+#define glVertexAttribI1uivEXT MANGLE(VertexAttribI1uivEXT)
+#define glVertexAttribI2iEXT MANGLE(VertexAttribI2iEXT)
+#define glVertexAttribI2ivEXT MANGLE(VertexAttribI2ivEXT)
+#define glVertexAttribI2uiEXT MANGLE(VertexAttribI2uiEXT)
+#define glVertexAttribI2uivEXT MANGLE(VertexAttribI2uivEXT)
+#define glVertexAttribI3iEXT MANGLE(VertexAttribI3iEXT)
+#define glVertexAttribI3ivEXT MANGLE(VertexAttribI3ivEXT)
+#define glVertexAttribI3uiEXT MANGLE(VertexAttribI3uiEXT)
+#define glVertexAttribI3uivEXT MANGLE(VertexAttribI3uivEXT)
+#define glVertexAttribI4bvEXT MANGLE(VertexAttribI4bvEXT)
+#define glVertexAttribI4iEXT MANGLE(VertexAttribI4iEXT)
+#define glVertexAttribI4ivEXT MANGLE(VertexAttribI4ivEXT)
+#define glVertexAttribI4svEXT MANGLE(VertexAttribI4svEXT)
+#define glVertexAttribI4ubvEXT MANGLE(VertexAttribI4ubvEXT)
+#define glVertexAttribI4uiEXT MANGLE(VertexAttribI4uiEXT)
+#define glVertexAttribI4uivEXT MANGLE(VertexAttribI4uivEXT)
+#define glVertexAttribI4usvEXT MANGLE(VertexAttribI4usvEXT)
+#define glVertexAttribIPointerEXT MANGLE(VertexAttribIPointerEXT)
+#define glVertexAttribPointerARB MANGLE(VertexAttribPointerARB)
+#define glVertexAttribPointer MANGLE(VertexAttribPointer)
+#define glVertexAttribPointerNV MANGLE(VertexAttribPointerNV)
+#define glVertexAttribs1dvNV MANGLE(VertexAttribs1dvNV)
+#define glVertexAttribs1fvNV MANGLE(VertexAttribs1fvNV)
+#define glVertexAttribs1hvNV MANGLE(VertexAttribs1hvNV)
+#define glVertexAttribs1svNV MANGLE(VertexAttribs1svNV)
+#define glVertexAttribs2dvNV MANGLE(VertexAttribs2dvNV)
+#define glVertexAttribs2fvNV MANGLE(VertexAttribs2fvNV)
+#define glVertexAttribs2hvNV MANGLE(VertexAttribs2hvNV)
+#define glVertexAttribs2svNV MANGLE(VertexAttribs2svNV)
+#define glVertexAttribs3dvNV MANGLE(VertexAttribs3dvNV)
+#define glVertexAttribs3fvNV MANGLE(VertexAttribs3fvNV)
+#define glVertexAttribs3hvNV MANGLE(VertexAttribs3hvNV)
+#define glVertexAttribs3svNV MANGLE(VertexAttribs3svNV)
+#define glVertexAttribs4dvNV MANGLE(VertexAttribs4dvNV)
+#define glVertexAttribs4fvNV MANGLE(VertexAttribs4fvNV)
+#define glVertexAttribs4hvNV MANGLE(VertexAttribs4hvNV)
+#define glVertexAttribs4svNV MANGLE(VertexAttribs4svNV)
+#define glVertexAttribs4ubvNV MANGLE(VertexAttribs4ubvNV)
+#define glVertexBlendARB MANGLE(VertexBlendARB)
+#define glVertexBlendEnvfATI MANGLE(VertexBlendEnvfATI)
+#define glVertexBlendEnviATI MANGLE(VertexBlendEnviATI)
+#define glVertexPointerEXT MANGLE(VertexPointerEXT)
+#define glVertexPointerListIBM MANGLE(VertexPointerListIBM)
+#define glVertexPointer MANGLE(VertexPointer)
+#define glVertexPointervINTEL MANGLE(VertexPointervINTEL)
+#define glVertexStream1dATI MANGLE(VertexStream1dATI)
+#define glVertexStream1dvATI MANGLE(VertexStream1dvATI)
+#define glVertexStream1fATI MANGLE(VertexStream1fATI)
+#define glVertexStream1fvATI MANGLE(VertexStream1fvATI)
+#define glVertexStream1iATI MANGLE(VertexStream1iATI)
+#define glVertexStream1ivATI MANGLE(VertexStream1ivATI)
+#define glVertexStream1sATI MANGLE(VertexStream1sATI)
+#define glVertexStream1svATI MANGLE(VertexStream1svATI)
+#define glVertexStream2dATI MANGLE(VertexStream2dATI)
+#define glVertexStream2dvATI MANGLE(VertexStream2dvATI)
+#define glVertexStream2fATI MANGLE(VertexStream2fATI)
+#define glVertexStream2fvATI MANGLE(VertexStream2fvATI)
+#define glVertexStream2iATI MANGLE(VertexStream2iATI)
+#define glVertexStream2ivATI MANGLE(VertexStream2ivATI)
+#define glVertexStream2sATI MANGLE(VertexStream2sATI)
+#define glVertexStream2svATI MANGLE(VertexStream2svATI)
+#define glVertexStream3dATI MANGLE(VertexStream3dATI)
+#define glVertexStream3dvATI MANGLE(VertexStream3dvATI)
+#define glVertexStream3fATI MANGLE(VertexStream3fATI)
+#define glVertexStream3fvATI MANGLE(VertexStream3fvATI)
+#define glVertexStream3iATI MANGLE(VertexStream3iATI)
+#define glVertexStream3ivATI MANGLE(VertexStream3ivATI)
+#define glVertexStream3sATI MANGLE(VertexStream3sATI)
+#define glVertexStream3svATI MANGLE(VertexStream3svATI)
+#define glVertexStream4dATI MANGLE(VertexStream4dATI)
+#define glVertexStream4dvATI MANGLE(VertexStream4dvATI)
+#define glVertexStream4fATI MANGLE(VertexStream4fATI)
+#define glVertexStream4fvATI MANGLE(VertexStream4fvATI)
+#define glVertexStream4iATI MANGLE(VertexStream4iATI)
+#define glVertexStream4ivATI MANGLE(VertexStream4ivATI)
+#define glVertexStream4sATI MANGLE(VertexStream4sATI)
+#define glVertexStream4svATI MANGLE(VertexStream4svATI)
+#define glVertexWeightfEXT MANGLE(VertexWeightfEXT)
+#define glVertexWeightfvEXT MANGLE(VertexWeightfvEXT)
+#define glVertexWeighthNV MANGLE(VertexWeighthNV)
+#define glVertexWeighthvNV MANGLE(VertexWeighthvNV)
+#define glVertexWeightPointerEXT MANGLE(VertexWeightPointerEXT)
+#define glViewport MANGLE(Viewport)
+#define glWeightbvARB MANGLE(WeightbvARB)
+#define glWeightdvARB MANGLE(WeightdvARB)
+#define glWeightfvARB MANGLE(WeightfvARB)
+#define glWeightivARB MANGLE(WeightivARB)
+#define glWeightPointerARB MANGLE(WeightPointerARB)
+#define glWeightsvARB MANGLE(WeightsvARB)
+#define glWeightubvARB MANGLE(WeightubvARB)
+#define glWeightuivARB MANGLE(WeightuivARB)
+#define glWeightusvARB MANGLE(WeightusvARB)
+#define glWindowPos2dARB MANGLE(WindowPos2dARB)
+#define glWindowPos2d MANGLE(WindowPos2d)
+#define glWindowPos2dMESA MANGLE(WindowPos2dMESA)
+#define glWindowPos2dvARB MANGLE(WindowPos2dvARB)
+#define glWindowPos2dv MANGLE(WindowPos2dv)
+#define glWindowPos2dvMESA MANGLE(WindowPos2dvMESA)
+#define glWindowPos2fARB MANGLE(WindowPos2fARB)
+#define glWindowPos2f MANGLE(WindowPos2f)
+#define glWindowPos2fMESA MANGLE(WindowPos2fMESA)
+#define glWindowPos2fvARB MANGLE(WindowPos2fvARB)
+#define glWindowPos2fv MANGLE(WindowPos2fv)
+#define glWindowPos2fvMESA MANGLE(WindowPos2fvMESA)
+#define glWindowPos2iARB MANGLE(WindowPos2iARB)
+#define glWindowPos2i MANGLE(WindowPos2i)
+#define glWindowPos2iMESA MANGLE(WindowPos2iMESA)
+#define glWindowPos2ivARB MANGLE(WindowPos2ivARB)
+#define glWindowPos2iv MANGLE(WindowPos2iv)
+#define glWindowPos2ivMESA MANGLE(WindowPos2ivMESA)
+#define glWindowPos2sARB MANGLE(WindowPos2sARB)
+#define glWindowPos2s MANGLE(WindowPos2s)
+#define glWindowPos2sMESA MANGLE(WindowPos2sMESA)
+#define glWindowPos2svARB MANGLE(WindowPos2svARB)
+#define glWindowPos2sv MANGLE(WindowPos2sv)
+#define glWindowPos2svMESA MANGLE(WindowPos2svMESA)
+#define glWindowPos3dARB MANGLE(WindowPos3dARB)
+#define glWindowPos3d MANGLE(WindowPos3d)
+#define glWindowPos3dMESA MANGLE(WindowPos3dMESA)
+#define glWindowPos3dvARB MANGLE(WindowPos3dvARB)
+#define glWindowPos3dv MANGLE(WindowPos3dv)
+#define glWindowPos3dvMESA MANGLE(WindowPos3dvMESA)
+#define glWindowPos3fARB MANGLE(WindowPos3fARB)
+#define glWindowPos3f MANGLE(WindowPos3f)
+#define glWindowPos3fMESA MANGLE(WindowPos3fMESA)
+#define glWindowPos3fvARB MANGLE(WindowPos3fvARB)
+#define glWindowPos3fv MANGLE(WindowPos3fv)
+#define glWindowPos3fvMESA MANGLE(WindowPos3fvMESA)
+#define glWindowPos3iARB MANGLE(WindowPos3iARB)
+#define glWindowPos3i MANGLE(WindowPos3i)
+#define glWindowPos3iMESA MANGLE(WindowPos3iMESA)
+#define glWindowPos3ivARB MANGLE(WindowPos3ivARB)
+#define glWindowPos3iv MANGLE(WindowPos3iv)
+#define glWindowPos3ivMESA MANGLE(WindowPos3ivMESA)
+#define glWindowPos3sARB MANGLE(WindowPos3sARB)
+#define glWindowPos3s MANGLE(WindowPos3s)
+#define glWindowPos3sMESA MANGLE(WindowPos3sMESA)
+#define glWindowPos3svARB MANGLE(WindowPos3svARB)
+#define glWindowPos3sv MANGLE(WindowPos3sv)
+#define glWindowPos3svMESA MANGLE(WindowPos3svMESA)
+#define glWindowPos4dMESA MANGLE(WindowPos4dMESA)
+#define glWindowPos4dvMESA MANGLE(WindowPos4dvMESA)
+#define glWindowPos4fMESA MANGLE(WindowPos4fMESA)
+#define glWindowPos4fvMESA MANGLE(WindowPos4fvMESA)
+#define glWindowPos4iMESA MANGLE(WindowPos4iMESA)
+#define glWindowPos4ivMESA MANGLE(WindowPos4ivMESA)
+#define glWindowPos4sMESA MANGLE(WindowPos4sMESA)
+#define glWindowPos4svMESA MANGLE(WindowPos4svMESA)
+#define glWriteMaskEXT MANGLE(WriteMaskEXT)
#endif /* GL_MANGLE_H */
diff --git a/Mesa/inc/glext.h b/Mesa/inc/glext.h
index 449b70d0b459..eca465997db7 100644
--- a/Mesa/inc/glext.h
+++ b/Mesa/inc/glext.h
@@ -3388,7 +3388,7 @@ extern "C" {
#include <stddef.h>
#ifndef GL_VERSION_2_0
/* GL type for program/shader text */
-typedef char GLchar; /* native character */
+typedef char GLchar; /* native character */
#endif
#ifndef GL_VERSION_1_5
@@ -3405,8 +3405,8 @@ typedef ptrdiff_t GLsizeiptrARB;
#ifndef GL_ARB_shader_objects
/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB; /* native character */
-typedef unsigned int GLhandleARB; /* shader object handle */
+typedef char GLcharARB; /* native character */
+typedef unsigned int GLhandleARB; /* shader object handle */
#endif
/* GL types for "half" precision (s10e5) float data in host memory */
diff --git a/Mesa/inc/glx.h b/Mesa/inc/glx.h
index c91a91823048..c4706cb9de5c 100644
--- a/Mesa/inc/glx.h
+++ b/Mesa/inc/glx.h
@@ -55,10 +55,10 @@ extern "C" {
#endif
-#define GLX_VERSION_1_1 1
-#define GLX_VERSION_1_2 1
-#define GLX_VERSION_1_3 1
-#define GLX_VERSION_1_4 1
+#define GLX_VERSION_1_1 1
+#define GLX_VERSION_1_2 1
+#define GLX_VERSION_1_3 1
+#define GLX_VERSION_1_4 1
#define GLX_EXTENSION_NAME "GLX"
@@ -67,104 +67,104 @@ extern "C" {
/*
* Tokens for glXChooseVisual and glXGetConfig:
*/
-#define GLX_USE_GL 1
-#define GLX_BUFFER_SIZE 2
-#define GLX_LEVEL 3
-#define GLX_RGBA 4
-#define GLX_DOUBLEBUFFER 5
-#define GLX_STEREO 6
-#define GLX_AUX_BUFFERS 7
-#define GLX_RED_SIZE 8
-#define GLX_GREEN_SIZE 9
-#define GLX_BLUE_SIZE 10
-#define GLX_ALPHA_SIZE 11
-#define GLX_DEPTH_SIZE 12
-#define GLX_STENCIL_SIZE 13
-#define GLX_ACCUM_RED_SIZE 14
-#define GLX_ACCUM_GREEN_SIZE 15
-#define GLX_ACCUM_BLUE_SIZE 16
-#define GLX_ACCUM_ALPHA_SIZE 17
+#define GLX_USE_GL 1
+#define GLX_BUFFER_SIZE 2
+#define GLX_LEVEL 3
+#define GLX_RGBA 4
+#define GLX_DOUBLEBUFFER 5
+#define GLX_STEREO 6
+#define GLX_AUX_BUFFERS 7
+#define GLX_RED_SIZE 8
+#define GLX_GREEN_SIZE 9
+#define GLX_BLUE_SIZE 10
+#define GLX_ALPHA_SIZE 11
+#define GLX_DEPTH_SIZE 12
+#define GLX_STENCIL_SIZE 13
+#define GLX_ACCUM_RED_SIZE 14
+#define GLX_ACCUM_GREEN_SIZE 15
+#define GLX_ACCUM_BLUE_SIZE 16
+#define GLX_ACCUM_ALPHA_SIZE 17
/*
* Error codes returned by glXGetConfig:
*/
-#define GLX_BAD_SCREEN 1
-#define GLX_BAD_ATTRIBUTE 2
-#define GLX_NO_EXTENSION 3
-#define GLX_BAD_VISUAL 4
-#define GLX_BAD_CONTEXT 5
-#define GLX_BAD_VALUE 6
-#define GLX_BAD_ENUM 7
+#define GLX_BAD_SCREEN 1
+#define GLX_BAD_ATTRIBUTE 2
+#define GLX_NO_EXTENSION 3
+#define GLX_BAD_VISUAL 4
+#define GLX_BAD_CONTEXT 5
+#define GLX_BAD_VALUE 6
+#define GLX_BAD_ENUM 7
/*
* GLX 1.1 and later:
*/
-#define GLX_VENDOR 1
-#define GLX_VERSION 2
-#define GLX_EXTENSIONS 3
+#define GLX_VENDOR 1
+#define GLX_VERSION 2
+#define GLX_EXTENSIONS 3
/*
* GLX 1.3 and later:
*/
-#define GLX_CONFIG_CAVEAT 0x20
-#define GLX_DONT_CARE 0xFFFFFFFF
-#define GLX_X_VISUAL_TYPE 0x22
-#define GLX_TRANSPARENT_TYPE 0x23
-#define GLX_TRANSPARENT_INDEX_VALUE 0x24
-#define GLX_TRANSPARENT_RED_VALUE 0x25
-#define GLX_TRANSPARENT_GREEN_VALUE 0x26
-#define GLX_TRANSPARENT_BLUE_VALUE 0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
-#define GLX_WINDOW_BIT 0x00000001
-#define GLX_PIXMAP_BIT 0x00000002
-#define GLX_PBUFFER_BIT 0x00000004
-#define GLX_AUX_BUFFERS_BIT 0x00000010
-#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
-#define GLX_DEPTH_BUFFER_BIT 0x00000020
-#define GLX_STENCIL_BUFFER_BIT 0x00000040
-#define GLX_ACCUM_BUFFER_BIT 0x00000080
-#define GLX_NONE 0x8000
-#define GLX_SLOW_CONFIG 0x8001
-#define GLX_TRUE_COLOR 0x8002
-#define GLX_DIRECT_COLOR 0x8003
-#define GLX_PSEUDO_COLOR 0x8004
-#define GLX_STATIC_COLOR 0x8005
-#define GLX_GRAY_SCALE 0x8006
-#define GLX_STATIC_GRAY 0x8007
-#define GLX_TRANSPARENT_RGB 0x8008
-#define GLX_TRANSPARENT_INDEX 0x8009
-#define GLX_VISUAL_ID 0x800B
-#define GLX_SCREEN 0x800C
-#define GLX_NON_CONFORMANT_CONFIG 0x800D
-#define GLX_DRAWABLE_TYPE 0x8010
-#define GLX_RENDER_TYPE 0x8011
-#define GLX_X_RENDERABLE 0x8012
-#define GLX_FBCONFIG_ID 0x8013
-#define GLX_RGBA_TYPE 0x8014
-#define GLX_COLOR_INDEX_TYPE 0x8015
-#define GLX_MAX_PBUFFER_WIDTH 0x8016
-#define GLX_MAX_PBUFFER_HEIGHT 0x8017
-#define GLX_MAX_PBUFFER_PIXELS 0x8018
-#define GLX_PRESERVED_CONTENTS 0x801B
-#define GLX_LARGEST_PBUFFER 0x801C
-#define GLX_WIDTH 0x801D
-#define GLX_HEIGHT 0x801E
-#define GLX_EVENT_MASK 0x801F
-#define GLX_DAMAGED 0x8020
-#define GLX_SAVED 0x8021
-#define GLX_WINDOW 0x8022
-#define GLX_PBUFFER 0x8023
+#define GLX_CONFIG_CAVEAT 0x20
+#define GLX_DONT_CARE 0xFFFFFFFF
+#define GLX_X_VISUAL_TYPE 0x22
+#define GLX_TRANSPARENT_TYPE 0x23
+#define GLX_TRANSPARENT_INDEX_VALUE 0x24
+#define GLX_TRANSPARENT_RED_VALUE 0x25
+#define GLX_TRANSPARENT_GREEN_VALUE 0x26
+#define GLX_TRANSPARENT_BLUE_VALUE 0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
+#define GLX_WINDOW_BIT 0x00000001
+#define GLX_PIXMAP_BIT 0x00000002
+#define GLX_PBUFFER_BIT 0x00000004
+#define GLX_AUX_BUFFERS_BIT 0x00000010
+#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
+#define GLX_DEPTH_BUFFER_BIT 0x00000020
+#define GLX_STENCIL_BUFFER_BIT 0x00000040
+#define GLX_ACCUM_BUFFER_BIT 0x00000080
+#define GLX_NONE 0x8000
+#define GLX_SLOW_CONFIG 0x8001
+#define GLX_TRUE_COLOR 0x8002
+#define GLX_DIRECT_COLOR 0x8003
+#define GLX_PSEUDO_COLOR 0x8004
+#define GLX_STATIC_COLOR 0x8005
+#define GLX_GRAY_SCALE 0x8006
+#define GLX_STATIC_GRAY 0x8007
+#define GLX_TRANSPARENT_RGB 0x8008
+#define GLX_TRANSPARENT_INDEX 0x8009
+#define GLX_VISUAL_ID 0x800B
+#define GLX_SCREEN 0x800C
+#define GLX_NON_CONFORMANT_CONFIG 0x800D
+#define GLX_DRAWABLE_TYPE 0x8010
+#define GLX_RENDER_TYPE 0x8011
+#define GLX_X_RENDERABLE 0x8012
+#define GLX_FBCONFIG_ID 0x8013
+#define GLX_RGBA_TYPE 0x8014
+#define GLX_COLOR_INDEX_TYPE 0x8015
+#define GLX_MAX_PBUFFER_WIDTH 0x8016
+#define GLX_MAX_PBUFFER_HEIGHT 0x8017
+#define GLX_MAX_PBUFFER_PIXELS 0x8018
+#define GLX_PRESERVED_CONTENTS 0x801B
+#define GLX_LARGEST_PBUFFER 0x801C
+#define GLX_WIDTH 0x801D
+#define GLX_HEIGHT 0x801E
+#define GLX_EVENT_MASK 0x801F
+#define GLX_DAMAGED 0x8020
+#define GLX_SAVED 0x8021
+#define GLX_WINDOW 0x8022
+#define GLX_PBUFFER 0x8023
#define GLX_PBUFFER_HEIGHT 0x8040
#define GLX_PBUFFER_WIDTH 0x8041
-#define GLX_RGBA_BIT 0x00000001
-#define GLX_COLOR_INDEX_BIT 0x00000002
-#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
+#define GLX_RGBA_BIT 0x00000001
+#define GLX_COLOR_INDEX_BIT 0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
/*
@@ -475,17 +475,17 @@ extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer
** GLX Events
*/
typedef struct {
- int event_type; /* GLX_DAMAGED or GLX_SAVED */
- int draw_type; /* GLX_WINDOW or GLX_PBUFFER */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came for SendEvent request */
- Display *display; /* display the event was read from */
- GLXDrawable drawable; /* XID of Drawable */
- unsigned int buffer_mask; /* mask indicating which buffers are affected */
- unsigned int aux_buffer; /* which aux buffer was affected */
+ int event_type; /* GLX_DAMAGED or GLX_SAVED */
+ int draw_type; /* GLX_WINDOW or GLX_PBUFFER */
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came for SendEvent request */
+ Display *display; /* display the event was read from */
+ GLXDrawable drawable; /* XID of Drawable */
+ unsigned int buffer_mask; /* mask indicating which buffers are affected */
+ unsigned int aux_buffer; /* which aux buffer was affected */
int x, y;
int width, height;
- int count; /* if nonzero, at least this many more */
+ int count; /* if nonzero, at least this many more */
} GLXPbufferClobberEvent;
typedef union __GLXEvent {
diff --git a/Mesa/inc/glxext.h b/Mesa/inc/glxext.h
index 930289c05073..79e2e90b0a2e 100644
--- a/Mesa/inc/glxext.h
+++ b/Mesa/inc/glxext.h
@@ -366,16 +366,16 @@ typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
typedef XID GLXPbufferSGIX;
typedef struct {
int type;
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came for SendEvent request */
- Display *display; /* display the event was read from */
- GLXDrawable drawable; /* i.d. of Drawable */
- int event_type; /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
- int draw_type; /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
- unsigned int mask; /* mask indicating which buffers are affected*/
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came for SendEvent request */
+ Display *display; /* display the event was read from */
+ GLXDrawable drawable; /* i.d. of Drawable */
+ int event_type; /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
+ int draw_type; /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
+ unsigned int mask; /* mask indicating which buffers are affected*/
int x, y;
int width, height;
- int count; /* if nonzero, at least this many more */
+ int count; /* if nonzero, at least this many more */
} GLXBufferClobberEventSGIX;
#endif
diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h
index aeb32f9f3892..31128dffa98a 100644
--- a/apple_remote/inc/AppleRemote.h
+++ b/apple_remote/inc/AppleRemote.h
@@ -2,13 +2,13 @@
* RemoteControlWrapper.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same license
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -31,10 +31,10 @@
#import <Cocoa/Cocoa.h>
#import "HIDRemoteControlDevice.h"
-/* Interacts with the Apple Remote Control HID device
+/* Interacts with the Apple Remote Control HID device
The class is not thread safe
*/
-@interface AppleRemote : HIDRemoteControlDevice {
+@interface AppleRemote : HIDRemoteControlDevice {
}
@end
diff --git a/apple_remote/inc/GlobalKeyboardDevice.h b/apple_remote/inc/GlobalKeyboardDevice.h
index 8e2aede3f34c..fca23a00ca9a 100644
--- a/apple_remote/inc/GlobalKeyboardDevice.h
+++ b/apple_remote/inc/GlobalKeyboardDevice.h
@@ -2,13 +2,13 @@
* GlobalKeyboardDevice.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same license
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -39,10 +39,10 @@
*/
@interface GlobalKeyboardDevice : RemoteControl {
-
+
NSMutableDictionary* hotKeyRemoteEventMapping;
EventHandlerRef eventHandlerRef;
-
+
}
- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers;
diff --git a/apple_remote/inc/HIDRemoteControlDevice.h b/apple_remote/inc/HIDRemoteControlDevice.h
index 622441fce83c..06e6d6ea5331 100644
--- a/apple_remote/inc/HIDRemoteControlDevice.h
+++ b/apple_remote/inc/HIDRemoteControlDevice.h
@@ -2,13 +2,13 @@
* HIDRemoteControlDevice.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same license
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -39,14 +39,14 @@
@interface HIDRemoteControlDevice : RemoteControl {
IOHIDDeviceInterface** hidDeviceInterface; // see IOKit/hid/IOHIDLib.h
IOHIDQueueInterface** queue; // IOKit/hid/IOHIDLib.h
- NSMutableArray* allCookies;
+ NSMutableArray* allCookies;
NSMutableDictionary* cookieToButtonMapping;
- CFRunLoopSourceRef eventSource;
-
+ CFRunLoopSourceRef eventSource;
+
BOOL fixSecureEventInputBug;
BOOL openInExclusiveMode;
- BOOL processesBacklog;
-
+ BOOL processesBacklog;
+
int supportedButtonEvents;
}
diff --git a/apple_remote/inc/KeyspanFrontRowControl.h b/apple_remote/inc/KeyspanFrontRowControl.h
index a67ce4a96111..be03c27e4e11 100644
--- a/apple_remote/inc/KeyspanFrontRowControl.h
+++ b/apple_remote/inc/KeyspanFrontRowControl.h
@@ -2,13 +2,13 @@
* KeyspanFrontRowControl.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same License
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -32,7 +32,7 @@
#import <Cocoa/Cocoa.h>
#import "HIDRemoteControlDevice.h"
-/* Interacts with the Keyspan FrontRow Remote Control HID device
+/* Interacts with the Keyspan FrontRow Remote Control HID device
The class is not thread safe
*/
@interface KeyspanFrontRowControl : HIDRemoteControlDevice {
diff --git a/apple_remote/inc/MultiClickRemoteBehavior.h b/apple_remote/inc/MultiClickRemoteBehavior.h
index 9cffa35fae2f..f4179da6bf29 100644
--- a/apple_remote/inc/MultiClickRemoteBehavior.h
+++ b/apple_remote/inc/MultiClickRemoteBehavior.h
@@ -2,13 +2,13 @@
* MultiClickRemoteBehavior.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same License
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -38,19 +38,19 @@
*/
@interface MultiClickRemoteBehavior : NSObject {
id delegate;
-
+
// state for simulating plus/minus hold
- BOOL simulateHoldEvents;
+ BOOL simulateHoldEvents;
BOOL lastEventSimulatedHold;
RemoteControlEventIdentifier lastHoldEvent;
- NSTimeInterval lastHoldEventTime;
-
+ NSTimeInterval lastHoldEventTime;
+
// state for multi click
unsigned int clickCountEnabledButtons;
NSTimeInterval maxClickTimeDifference;
- NSTimeInterval lastClickCountEventTime;
+ NSTimeInterval lastClickCountEventTime;
RemoteControlEventIdentifier lastClickCountEvent;
- unsigned int eventClickCount;
+ unsigned int eventClickCount;
}
- (id) init;
@@ -83,7 +83,7 @@
@end
-/*
+/*
* Method definitions for the delegate of the MultiClickRemoteBehavior class
*/
@interface NSObject(MultiClickRemoteBehaviorDelegate)
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
index cbf8fd856235..c73677568cd3 100644
--- a/apple_remote/inc/RemoteControl.h
+++ b/apple_remote/inc/RemoteControl.h
@@ -2,13 +2,13 @@
* RemoteControl.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same License
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,17 +20,17 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
*****************************************************************************/
-
+
#import <Cocoa/Cocoa.h>
-// notifaction names that are being used to signal that an application wants to
+// notifaction names that are being used to signal that an application wants to
// have access to the remote control device or if the application has finished
// using the remote control device
extern NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION;
@@ -42,29 +42,29 @@ extern NSString* kApplicationIdentifier;
extern NSString* kTargetApplicationIdentifier;
// we have a 6 bit offset to make a hold event out of a normal event
-#define EVENT_TO_HOLD_EVENT_OFFSET 6
+#define EVENT_TO_HOLD_EVENT_OFFSET 6
@class RemoteControl;
typedef enum _RemoteControlEventIdentifier {
// normal events
- kRemoteButtonPlus =1<<1,
- kRemoteButtonMinus =1<<2,
- kRemoteButtonMenu =1<<3,
- kRemoteButtonPlay =1<<4,
- kRemoteButtonRight =1<<5,
- kRemoteButtonLeft =1<<6,
-
+ kRemoteButtonPlus =1<<1,
+ kRemoteButtonMinus =1<<2,
+ kRemoteButtonMenu =1<<3,
+ kRemoteButtonPlay =1<<4,
+ kRemoteButtonRight =1<<5,
+ kRemoteButtonLeft =1<<6,
+
// hold events
- kRemoteButtonPlus_Hold =1<<7,
- kRemoteButtonMinus_Hold =1<<8,
- kRemoteButtonMenu_Hold =1<<9,
- kRemoteButtonPlay_Hold =1<<10,
- kRemoteButtonRight_Hold =1<<11,
- kRemoteButtonLeft_Hold =1<<12,
-
- // special events (not supported by all devices)
- kRemoteControl_Switched =1<<13,
+ kRemoteButtonPlus_Hold =1<<7,
+ kRemoteButtonMinus_Hold =1<<8,
+ kRemoteButtonMenu_Hold =1<<9,
+ kRemoteButtonPlay_Hold =1<<10,
+ kRemoteButtonRight_Hold =1<<11,
+ kRemoteButtonLeft_Hold =1<<12,
+
+ // special events (not supported by all devices)
+ kRemoteControl_Switched =1<<13,
} RemoteControlEventIdentifier;
@interface NSObject(RemoteControlDelegate)
diff --git a/apple_remote/inc/RemoteControlContainer.h b/apple_remote/inc/RemoteControlContainer.h
index f6cd40ba1178..c66472ef491a 100644
--- a/apple_remote/inc/RemoteControlContainer.h
+++ b/apple_remote/inc/RemoteControlContainer.h
@@ -2,13 +2,13 @@
* RemoteControlContainer.h
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same License
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/apple_remote/inc/RemoteMainController.h b/apple_remote/inc/RemoteMainController.h
index 7143f1f1eda9..9db22d7790ad 100644
--- a/apple_remote/inc/RemoteMainController.h
+++ b/apple_remote/inc/RemoteMainController.h
@@ -2,13 +2,13 @@
* RemoteMainController.h
*
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same License
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -20,7 +20,7 @@
*
* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index f99c1b1edf43..20a8c7c8b72d 100644
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
@@ -2,10 +2,10 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
-
+
Derived by beppec56@openoffice.org from various examples
in SampleICC library, the original copyright retained.
-
+
Copyright: see below
*/
@@ -13,7 +13,7 @@
* The ICC Software License, Version 0.1
*
*
- * Copyright (c) 2003-2006 The International Color Consortium. All rights
+ * Copyright (c) 2003-2006 The International Color Consortium. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -21,7 +21,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -29,7 +29,7 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* The International Color Consortium (www.color.org)"
* Alternately, this acknowledgment may appear in the software itself,
@@ -57,17 +57,17 @@
* ====================================================================
*
* This software consists of voluntary contributions made by many
- * individuals on behalf of the The International Color Consortium.
+ * individuals on behalf of the The International Color Consortium.
*
*
* Membership in the ICC is encouraged when this software is used for
- * commercial purposes.
- *
+ * commercial purposes.
*
+ *
* For more information on The International Color Consortium, please
* see <http://www.color.org/>.
- *
- *
+ *
+ *
*/
#include <math.h>
@@ -187,9 +187,9 @@ void dumpTag(FILE *outfile, CIccProfile *pIcc, icTagSignature sig)
if (pTag)
{
- fprintf(outfile, "\nContents of %s tag (%s)\n", Fmt.GetTagSigName(sig), icGetSig(buf, sig));
+ fprintf(outfile, "\nContents of %s tag (%s)\n", Fmt.GetTagSigName(sig), icGetSig(buf, sig));
fprintf(outfile,"Type: ");
-
+
if (pTag->IsArrayType()) fprintf(outfile, "Array of ");
fprintf(outfile, "%s\n", Fmt.GetTagTypeSigName(pTag->GetType()));
@@ -255,7 +255,7 @@ void dumpProfile(FILE *outfile, const char * profileName)
for (n=0, i=pIcc->m_Tags->begin(); i!=pIcc->m_Tags->end(); i++, n++)
{
fprintf(outfile,"%25s %s %8ld\t%8ld\n", Fmt.GetTagSigName(i->TagInfo.sig),
- icGetSig(buf, i->TagInfo.sig, false),
+ icGetSig(buf, i->TagInfo.sig, false),
i->TagInfo.offset, i->TagInfo.size);
}
@@ -297,7 +297,7 @@ int main(int argc, char* argv[])
// Required tags for a three-component matrix-based display profile, as laid
// out by specification ICC.1:1998-09 (clause 6.3) are:
- //
+ //
// copyrightTag
// profileDescriptionTag
// redMatrixColumnTag
@@ -318,7 +318,7 @@ int main(int argc, char* argv[])
// viewingConditionsTag
// luminanceTag
// measurementTag
- //
+ //
// are optionals, added for completeness
// the element below are sorted in the same order as
@@ -367,7 +367,7 @@ int main(int argc, char* argv[])
(*whitePointTag)[0].X = icDtoF(0.9505);
(*whitePointTag)[0].Y = icDtoF(1.0);
(*whitePointTag)[0].Z = icDtoF(1.0891);
- profile.AttachTag(icSigMediaWhitePointTag, whitePointTag);
+ profile.AttachTag(icSigMediaWhitePointTag, whitePointTag);
//device signature (technologytag)
CIccTagSignature* deviceSign = new CIccTagSignature;
@@ -398,11 +398,11 @@ int main(int argc, char* argv[])
// viewingConditionsTag
CIccTagViewingConditions* viewingConditionsTag = new CIccTagViewingConditions;
- // Illuminant tristimulus value
+ // Illuminant tristimulus value
(*viewingConditionsTag).m_XYZIllum.X = icDtoF(19.6445);
(*viewingConditionsTag).m_XYZIllum.Y = icDtoF(20.3718);
(*viewingConditionsTag).m_XYZIllum.Z = icDtoF(16.8089);
- // surround tristimulus value
+ // surround tristimulus value
(*viewingConditionsTag).m_XYZSurround.X = icDtoF(3.9289);
(*viewingConditionsTag).m_XYZSurround.Y = icDtoF(4.0744);
(*viewingConditionsTag).m_XYZSurround.Z = icDtoF(3.3618);
@@ -432,10 +432,10 @@ int main(int argc, char* argv[])
// compute the LUT curves, they are equal for all three colors
// so only one LUT is computed and stored
- int N = 1024; // number of points in LUTs
+ int N = 1024; // number of points in LUTs
CIccTagCurve* colorTRCTag = new CIccTagCurve(N);
// apply conversion from RGB to XYZ, stepping the RGB value linearly from 0 to 100%
- // 1024 steps are computed
+ // 1024 steps are computed
for (int i = 0; i < N; ++i)
(*colorTRCTag)[i] = computeIEC_RGBtoXYZ( (icFloatNumber)i/(N-1));
@@ -451,17 +451,17 @@ int main(int argc, char* argv[])
{
case icValidateOK:
break;
-
+
case icValidateWarning:
clog << "Profile validation warning" << endl
<< validationReport;
break;
-
+
case icValidateNonCompliant:
clog << "Profile non compliancy" << endl
<< validationReport;
break;
-
+
case icValidateCriticalError:
default:
clog << "Profile Error" << endl
@@ -495,7 +495,7 @@ int main(int argc, char* argv[])
fprintf(headerfile,"%s\n",the_string);
{
-// spit out the data structure (an array of unsigned char)
+// spit out the data structure (an array of unsigned char)
FILE *infile;
int achar, number = 1;
@@ -522,7 +522,7 @@ int main(int argc, char* argv[])
} while(achar != EOF );
fprintf(headerfile,"\n};\n\n");
- fclose(infile);
+ fclose(infile);
}
// append the file contents, in human readable form, as comment in the header
// get the functions from iccDump
@@ -534,7 +534,7 @@ int main(int argc, char* argv[])
dumpProfile(headerfile, out_file_pathname );
fprintf(headerfile,"\n*****************/\n");
- //now append the tail
+ //now append the tail
idx = 0;
while((the_string = TheTail[idx++]) != NULL )
fprintf(headerfile,"%s\n",the_string);
diff --git a/libegg/source/eggtrayicon-impl.h b/libegg/source/eggtrayicon-impl.h
index 53d0e1d3e9b5..36af985bff37 100644
--- a/libegg/source/eggtrayicon-impl.h
+++ b/libegg/source/eggtrayicon-impl.h
@@ -29,13 +29,13 @@
G_BEGIN_DECLS
-#define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ())
-#define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-#define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-#define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-#define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-#define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-
+#define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ())
+#define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
+#define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
+#define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
+#define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
+#define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
+
typedef struct _EggTrayIconClass EggTrayIconClass;
struct _EggTrayIcon
@@ -43,7 +43,7 @@ struct _EggTrayIcon
GtkPlug parent_instance;
guint stamp;
-
+
#ifdef GDK_WINDOWING_X11
Atom selection_atom;
Atom manager_atom;
@@ -70,7 +70,7 @@ guint egg_tray_icon_send_message (EggTrayIcon *icon,
gint len);
GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
-
+
G_END_DECLS
#endif /* __EGG_TRAY_ICON_IMPL_H__ */
diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c
index a03bbd00b9ea..9c68113e5d50 100644
--- a/libegg/source/eggtrayicon.c
+++ b/libegg/source/eggtrayicon.c
@@ -53,7 +53,7 @@ enum {
PROP_0,
PROP_ORIENTATION
};
-
+
static GtkPlugClass *parent_class = NULL;
static void egg_tray_icon_init (EggTrayIcon *icon);
@@ -121,7 +121,7 @@ egg_tray_icon_init (EggTrayIcon *icon)
{
icon->stamp = 1;
icon->orientation = GTK_ORIENTATION_HORIZONTAL;
-
+
gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}
@@ -188,7 +188,7 @@ egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
int error, result;
g_assert (icon->manager_window != None);
-
+
xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
gdk_error_trap_push ();
@@ -253,7 +253,7 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
return GDK_FILTER_CONTINUE;
}
-#endif
+#endif
static void
egg_tray_icon_unrealize (GtkWidget *widget)
@@ -293,7 +293,7 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon,
{
XClientMessageEvent ev;
Display *display;
-
+
ev.type = ClientMessage;
ev.window = window;
ev.message_type = icon->system_tray_opcode_atom;
@@ -305,7 +305,7 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon,
ev.data.l[4] = data3;
display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-
+
gdk_error_trap_push ();
XSendEvent (display,
icon->manager_window, False, NoEventMask, (XEvent *)&ev);
@@ -328,14 +328,14 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon,
gboolean dock_if_realized)
{
Display *xdisplay;
-
+
if (icon->manager_window != None)
return;
xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-
+
XGrabServer (xdisplay);
-
+
icon->manager_window = XGetSelectionOwner (xdisplay,
icon->selection_atom);
@@ -345,14 +345,14 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon,
XUngrabServer (xdisplay);
XFlush (xdisplay);
-
+
if (icon->manager_window != None)
{
GdkWindow *gdkwin;
gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
icon->manager_window);
-
+
gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
@@ -366,12 +366,12 @@ static void
egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
{
GdkWindow *gdkwin;
-
+
g_return_if_fail (icon->manager_window != None);
gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
icon->manager_window);
-
+
gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
icon->manager_window = None;
@@ -413,7 +413,7 @@ make_transparent (GtkWidget *widget, gpointer user_data)
G_CALLBACK (transparent_expose_event), NULL);
g_signal_connect_after (widget, "style_set",
G_CALLBACK (make_transparent_again), NULL);
-}
+}
static void
egg_tray_icon_realize (GtkWidget *widget)
@@ -441,9 +441,9 @@ egg_tray_icon_realize (GtkWidget *widget)
gdk_screen_get_number (screen));
icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-
+
icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-
+
icon->system_tray_opcode_atom = XInternAtom (xdisplay,
"_NET_SYSTEM_TRAY_OPCODE",
False);
@@ -456,7 +456,7 @@ egg_tray_icon_realize (GtkWidget *widget)
egg_tray_icon_send_dock_request (icon);
root_window = gdk_screen_get_root_window (screen);
-
+
/* Add a root window filter so that we get changes on MANAGER */
gdk_window_add_filter (root_window,
egg_tray_icon_manager_filter, icon);
@@ -494,11 +494,11 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
gint len)
{
guint stamp;
-
+
g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
g_return_val_if_fail (timeout >= 0, 0);
g_return_val_if_fail (message != NULL, 0);
-
+
#ifdef GDK_WINDOWING_X11
if (icon->manager_window == None)
return 0;
@@ -508,7 +508,7 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
len = strlen (message);
stamp = icon->stamp++;
-
+
#ifdef GDK_WINDOWING_X11
/* Get ready to send the message */
egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
@@ -523,7 +523,7 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
Display *xdisplay;
xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-
+
ev.type = ClientMessage;
ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
ev.format = 8;
@@ -557,7 +557,7 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
{
g_return_if_fail (EGG_IS_TRAY_ICON (icon));
g_return_if_fail (id > 0);
-#ifdef GDK_WINDOWING_X11
+#ifdef GDK_WINDOWING_X11
egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
(Window)gtk_plug_get_id (GTK_PLUG (icon)),
id, 0, 0);
diff --git a/libwpd/libwpd-0.8.8.diff b/libwpd/libwpd-0.8.8.diff
deleted file mode 100644
index 79840efc639c..000000000000
--- a/libwpd/libwpd-0.8.8.diff
+++ /dev/null
@@ -1,908 +0,0 @@
-*** misc/libwpd-0.8.8/configure Tue Jan 9 10:35:10 2007
---- misc/build/libwpd-0.8.8/configure Thu Feb 21 11:37:54 2008
-***************
-*** 8089,8095 ****
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
---- 8089,8095 ----
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-***************
-*** 11808,11814 ****
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
---- 11808,11814 ----
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-***************
-*** 14978,14984 ****
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
---- 14978,14984 ----
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-***************
-*** 17346,17352 ****
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
---- 17346,17352 ----
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-*** misc/libwpd-0.8.8/src/lib/WP1Heuristics.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP1Heuristics.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 27,32 ****
---- 27,33 ----
- #include "WP1Heuristics.h"
- #include "WP1FileStructure.h"
- #include "libwpd_internal.h"
-+ #include <limits>
-
- WPDConfidence WP1Heuristics::isWP1FileFormat(WPXInputStream *input, bool partialContent)
- {
-***************
-*** 74,81 ****
- // <function code>{function length}...{function length}<function code>
- // that we observed in variable length WP1 functions
-
-! long functionLength = readU32(input, true);
-! long closingFunctionLength = 0;
- WPD_DEBUG_MSG(("WP1Heuristics functionLength = 0x%.8x\n", (unsigned int)functionLength));
-
- input->seek(functionLength, WPX_SEEK_CUR);
---- 75,84 ----
- // <function code>{function length}...{function length}<function code>
- // that we observed in variable length WP1 functions
-
-! unsigned long functionLength = readU32(input, true);
-! if (functionLength > ((std::numeric_limits<uint32_t>::max)() / 2))
-! return WPD_CONFIDENCE_NONE;
-! unsigned long closingFunctionLength = 0;
- WPD_DEBUG_MSG(("WP1Heuristics functionLength = 0x%.8x\n", (unsigned int)functionLength));
-
- input->seek(functionLength, WPX_SEEK_CUR);
-*** misc/libwpd-0.8.8/src/lib/WP1Part.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 46,51 ****
---- 46,58 ----
- }
- else if (WP1_FUNCTION_GROUP_SIZE[readVal-0xC0] == -1)
- {
-+ // Should not happen because the heuristics would not recognize this file as a well formed WP1 file,
-+ // Nonetheless if we ever change the parts using the heuristics, this will be a check useful to have
-+ if (!WP1VariableLengthGroup::isGroupConsistent(input, readVal))
-+ {
-+ WPD_DEBUG_MSG(("WordPerfect: Consistency Check (variable length) failed; ignoring this byte\n"));
-+ return 0;
-+ }
- WPD_DEBUG_MSG(("WordPerfect: constructVariableLengthGroup\n"));
- return WP1VariableLengthGroup::constructVariableLengthGroup(input, readVal);
- }
-*** misc/libwpd-0.8.8/src/lib/WP1SetTabsGroup.cpp Fri Jan 5 10:21:16 2007
---- misc/build/libwpd-0.8.8/src/lib/WP1SetTabsGroup.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 39,45 ****
- void WP1SetTabsGroup::_readContents(WPXInputStream *input)
- {
- // Skip first the old condensed tab table
-! while (readU8(input) != 0xff)
- input->seek(2, WPX_SEEK_CUR);
-
- // Now read the new condensed tab table
---- 39,45 ----
- void WP1SetTabsGroup::_readContents(WPXInputStream *input)
- {
- // Skip first the old condensed tab table
-! while (readU8(input) != 0xff && !input->atEOS())
- input->seek(2, WPX_SEEK_CUR);
-
- // Now read the new condensed tab table
-***************
-*** 47,54 ****
- float tmpTabPosition = 0.0f;
- WPXTabStop tmpTabStop = WPXTabStop();
-
-! while ((tmpTabType = read8(input)) & 0xff != 0xff)
- {
- tmpTabPosition = (float)((double)readU16(input, true) / 72.0f);
-
- if (tmpTabType < 0)
---- 47,56 ----
- float tmpTabPosition = 0.0f;
- WPXTabStop tmpTabStop = WPXTabStop();
-
-! while (((tmpTabType = read8(input)) & 0xff) != 0xff)
- {
-+ if (input->atEOS())
-+ throw FileException();
- tmpTabPosition = (float)((double)readU16(input, true) / 72.0f);
-
- if (tmpTabType < 0)
-*** misc/libwpd-0.8.8/src/lib/WP1SubDocument.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP1SubDocument.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 26,32 ****
- #include "WP1Parser.h"
- #include "libwpd_internal.h"
-
-! WP1SubDocument::WP1SubDocument(WPXInputStream *input, const int dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
---- 26,32 ----
- #include "WP1Parser.h"
- #include "libwpd_internal.h"
-
-! WP1SubDocument::WP1SubDocument(WPXInputStream *input, const unsigned dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
-*** misc/libwpd-0.8.8/src/lib/WP1SubDocument.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP1SubDocument.h Thu Feb 21 11:37:54 2008
-***************
-*** 32,38 ****
- class WP1SubDocument : public WPXSubDocument
- {
- public:
-! WP1SubDocument(WPXInputStream *input, const int dataSize);
- void parse(WP1Listener *listener) const;
-
- };
---- 32,38 ----
- class WP1SubDocument : public WPXSubDocument
- {
- public:
-! WP1SubDocument(WPXInputStream *input, const unsigned dataSize);
- void parse(WP1Listener *listener) const;
-
- };
-*** misc/libwpd-0.8.8/src/lib/WP1VariableLengthGroup.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP1VariableLengthGroup.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 31,36 ****
---- 31,37 ----
- #include "WP1FootnoteEndnoteGroup.h"
- #include "WP1FileStructure.h"
- #include "libwpd_internal.h"
-+ #include <limits>
-
- WP1VariableLengthGroup::WP1VariableLengthGroup(uint8_t group)
- : m_group(group)
-***************
-*** 60,65 ****
---- 61,68 ----
- try
- {
- uint32_t size = readU32(input, true);
-+ if (size > ((std::numeric_limits<uint32_t>::max)() / 2))
-+ return false;
-
- if (input->seek(size, WPX_SEEK_CUR) || input->atEOS())
- {
-***************
-*** 94,104 ****
---- 97,114 ----
- WPD_DEBUG_MSG(("WordPerfect: handling a variable length group\n"));
-
- m_size = readU32(input, true); // the length is the number of data bytes minus 4 (ie. the function codes)
-+
-+ if (m_size + startPosition < startPosition)
-+ throw FileException();
-
- WPD_DEBUG_MSG(("WordPerfect: Read variable group header (start_position: %i, size: %i)\n", startPosition, m_size));
-
- _readContents(input);
-
-+ if ((m_size + startPosition + 4 < m_size + startPosition) ||
-+ (m_size + startPosition + 4) > ((std::numeric_limits<uint32_t>::max)() / 2))
-+ throw FileException();
-+
- input->seek(startPosition + m_size + 4, WPX_SEEK_SET);
-
- if (m_size != readU32(input, true))
-***************
-*** 112,117 ****
---- 122,130 ----
- throw FileException();
- }
-
-+ if ((m_size + startPosition + 9 < m_size + startPosition) ||
-+ (m_size + startPosition + 9) > ((std::numeric_limits<uint32_t>::max)() / 2))
-+ throw FileException();
- input->seek(startPosition + m_size + 9, WPX_SEEK_SET);
-
- }
-*** misc/libwpd-0.8.8/src/lib/WP3PageFormatGroup.cpp Fri Jan 5 10:21:13 2007
---- misc/build/libwpd-0.8.8/src/lib/WP3PageFormatGroup.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 91,98 ****
-
- m_isRelative = (readU8(input) & 0x01);
-
-! while ((tmpTabType = read8(input)) & 0xff != 0xff)
- {
- tmpTabPosition = fixedPointToFloat(readU32(input, true)) / 72.0f;
-
- if (tmpTabType < 0)
---- 91,100 ----
-
- m_isRelative = (readU8(input) & 0x01);
-
-! while (((tmpTabType = read8(input)) & 0xff) != 0xff)
- {
-+ if (input->atEOS())
-+ throw FileException();
- tmpTabPosition = fixedPointToFloat(readU32(input, true)) / 72.0f;
-
- if (tmpTabType < 0)
-*** misc/libwpd-0.8.8/src/lib/WP3SubDocument.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP3SubDocument.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 26,32 ****
- #include "WP3Parser.h"
- #include "libwpd_internal.h"
-
-! WP3SubDocument::WP3SubDocument(WPXInputStream *input, const int dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
---- 26,32 ----
- #include "WP3Parser.h"
- #include "libwpd_internal.h"
-
-! WP3SubDocument::WP3SubDocument(WPXInputStream *input, const unsigned dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
-*** misc/libwpd-0.8.8/src/lib/WP3SubDocument.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP3SubDocument.h Thu Feb 21 11:37:54 2008
-***************
-*** 32,38 ****
- class WP3SubDocument : public WPXSubDocument
- {
- public:
-! WP3SubDocument(WPXInputStream *input, const int dataSize);
- void parse(WP3Listener *listener) const;
-
- };
---- 32,38 ----
- class WP3SubDocument : public WPXSubDocument
- {
- public:
-! WP3SubDocument(WPXInputStream *input, const unsigned dataSize);
- void parse(WP3Listener *listener) const;
-
- };
-*** misc/libwpd-0.8.8/src/lib/WP3TablesGroup.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP3TablesGroup.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 50,59 ****
- {
- // this group can contain different kinds of data, thus we need to read
- // the contents accordingly
-! uint8_t i;
- switch (getSubGroup())
- {
- case WP3_TABLES_GROUP_TABLE_FUNCTION:
- input->seek(71, WPX_SEEK_CUR);
- m_tableMode = readU8(input);
- m_offsetFromLeftEdge = readU32(input, true);
---- 50,61 ----
- {
- // this group can contain different kinds of data, thus we need to read
- // the contents accordingly
-! uint8_t i=0;
-! long startPosition = 0;
- switch (getSubGroup())
- {
- case WP3_TABLES_GROUP_TABLE_FUNCTION:
-+ startPosition = input->tell();
- input->seek(71, WPX_SEEK_CUR);
- m_tableMode = readU8(input);
- m_offsetFromLeftEdge = readU32(input, true);
-***************
-*** 63,70 ****
---- 65,76 ----
- m_rightGutterSpacing = readU32(input, true);
- input->seek(3, WPX_SEEK_CUR);
- m_numColumns = readU8(input);
-+ if ((m_numColumns > 32) || ((input->tell() - startPosition + m_numColumns*10) > (getSize() - 4)))
-+ throw FileException();
- for (i=0; i<m_numColumns; i++)
- {
-+ if (input->atEOS())
-+ throw FileException();
- m_columnMode[i] = readU8(input);
- m_numberFormat[i] = readU8(input);
- m_columnWidth[i] = readU32(input, true);
-***************
-*** 120,126 ****
- {
- case WP3_TABLES_GROUP_TABLE_FUNCTION:
- listener->defineTable(m_tableMode, fixedPointToWPUs(m_offsetFromLeftEdge));
-! for (i=0; i<m_numColumns; i++)
- listener->addTableColumnDefinition(fixedPointToWPUs(m_columnWidth[i]), fixedPointToWPUs(m_leftGutterSpacing),
- fixedPointToWPUs(m_rightGutterSpacing), 0, LEFT);
- listener->startTable();
---- 126,132 ----
- {
- case WP3_TABLES_GROUP_TABLE_FUNCTION:
- listener->defineTable(m_tableMode, fixedPointToWPUs(m_offsetFromLeftEdge));
-! for (i=0; i<m_numColumns && i <= 32; i++)
- listener->addTableColumnDefinition(fixedPointToWPUs(m_columnWidth[i]), fixedPointToWPUs(m_leftGutterSpacing),
- fixedPointToWPUs(m_rightGutterSpacing), 0, LEFT);
- listener->startTable();
-*** misc/libwpd-0.8.8/src/lib/WP3VariableLengthGroup.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP3VariableLengthGroup.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 36,41 ****
---- 36,42 ----
- #include "WP3FootnoteEndnoteGroup.h"
- #include "WP3TablesGroup.h"
- #include "libwpd_internal.h"
-+ #include <limits>
-
- WP3VariableLengthGroup::WP3VariableLengthGroup()
- {
-***************
-*** 72,82 ****
---- 73,90 ----
- bool WP3VariableLengthGroup::isGroupConsistent(WPXInputStream *input, const uint8_t group)
- {
- uint32_t startPosition = input->tell();
-+ if (startPosition > ((std::numeric_limits<unsigned long>::max)() / 2))
-+ return false;
-
- try
- {
- uint8_t subGroup = readU8(input);
- uint16_t size = readU16(input, true);
-+ if (startPosition + size < startPosition)
-+ {
-+ input->seek(startPosition, WPX_SEEK_SET);
-+ return false;
-+ }
-
- if (input->seek((startPosition + size - 1 - input->tell()), WPX_SEEK_CUR) || input->atEOS())
- {
-*** misc/libwpd-0.8.8/src/lib/WP42SubDocument.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP42SubDocument.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 26,37 ****
- #include "WP42Parser.h"
- #include "libwpd_internal.h"
-
-! WP42SubDocument::WP42SubDocument(uint8_t * streamData, const int dataSize) :
- WPXSubDocument(streamData, dataSize)
- {
- }
-
-! WP42SubDocument::WP42SubDocument(WPXInputStream *input, const int dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
---- 26,37 ----
- #include "WP42Parser.h"
- #include "libwpd_internal.h"
-
-! WP42SubDocument::WP42SubDocument(uint8_t * streamData, const unsigned dataSize) :
- WPXSubDocument(streamData, dataSize)
- {
- }
-
-! WP42SubDocument::WP42SubDocument(WPXInputStream *input, const unsigned dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
-*** misc/libwpd-0.8.8/src/lib/WP42SubDocument.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP42SubDocument.h Thu Feb 21 11:37:54 2008
-***************
-*** 32,39 ****
- class WP42SubDocument : public WPXSubDocument
- {
- public:
-! WP42SubDocument(uint8_t * streamData, const int dataSize);
-! WP42SubDocument(WPXInputStream *input, const int dataSize);
- void parse(WP42Listener *listener) const;
-
- };
---- 32,39 ----
- class WP42SubDocument : public WPXSubDocument
- {
- public:
-! WP42SubDocument(uint8_t * streamData, const unsigned dataSize);
-! WP42SubDocument(WPXInputStream *input, const unsigned dataSize);
- void parse(WP42Listener *listener) const;
-
- };
-*** misc/libwpd-0.8.8/src/lib/WP5DefinitionGroup.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP5DefinitionGroup.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 26,32 ****
- #include "WP5Listener.h"
- #include "libwpd_internal.h"
-
-! WP5DefinitionGroup_DefineTablesSubGroup::WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input) :
- WP5VariableLengthGroup_SubGroup(),
- m_position(0),
- m_numColumns(0),
---- 26,32 ----
- #include "WP5Listener.h"
- #include "libwpd_internal.h"
-
-! WP5DefinitionGroup_DefineTablesSubGroup::WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input, uint16_t subGroupSize) :
- WP5VariableLengthGroup_SubGroup(),
- m_position(0),
- m_numColumns(0),
-***************
-*** 34,39 ****
---- 34,40 ----
- m_leftGutter(0),
- m_rightGutter(0)
- {
-+ long startPosition = input->tell();
- // Skip useless old values to read the old column number
- input->seek(2, WPX_SEEK_CUR);
- m_numColumns = readU16(input);
-***************
-*** 50,61 ****
---- 51,76 ----
- input->seek(10, WPX_SEEK_CUR);
- m_leftOffset = readU16(input);
- int i;
-+ if ((m_numColumns > 32) || ((input->tell() - startPosition + m_numColumns*5) > (subGroupSize - 4)))
-+ throw FileException();
- for (i=0; i < m_numColumns; i++)
-+ {
-+ if (input->atEOS())
-+ throw FileException();
- m_columnWidth[i] = readU16(input);
-+ }
- for (i=0; i < m_numColumns; i++)
-+ {
-+ if (input->atEOS())
-+ throw FileException();
- m_attributeBits[i] = readU16(input);
-+ }
- for (i=0; i < m_numColumns; i++)
-+ {
-+ if (input->atEOS())
-+ throw FileException();
- m_columnAlignment[i] = readU8(input);
-+ }
- }
-
- void WP5DefinitionGroup_DefineTablesSubGroup::parse(WP5Listener *listener)
-***************
-*** 88,94 ****
- switch(getSubGroup())
- {
- case WP5_TOP_DEFINITION_GROUP_DEFINE_TABLES:
-! m_subGroupData = new WP5DefinitionGroup_DefineTablesSubGroup(input);
- break;
- default:
- break;
---- 103,109 ----
- switch(getSubGroup())
- {
- case WP5_TOP_DEFINITION_GROUP_DEFINE_TABLES:
-! m_subGroupData = new WP5DefinitionGroup_DefineTablesSubGroup(input, getSize());
- break;
- default:
- break;
-*** misc/libwpd-0.8.8/src/lib/WP5DefinitionGroup.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP5DefinitionGroup.h Thu Feb 21 11:37:54 2008
-***************
-*** 31,37 ****
- class WP5DefinitionGroup_DefineTablesSubGroup : public WP5VariableLengthGroup_SubGroup
- {
- public:
-! WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input);
- void parse(WP5Listener *listener);
-
- private:
---- 31,37 ----
- class WP5DefinitionGroup_DefineTablesSubGroup : public WP5VariableLengthGroup_SubGroup
- {
- public:
-! WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input, uint16_t subGroupSize);
- void parse(WP5Listener *listener);
-
- private:
-***************
-*** 58,64 ****
-
- private:
- WP5VariableLengthGroup_SubGroup * m_subGroupData;
--
- };
-
- #endif /* WP5DEFINITIONGROUP_H */
---- 58,63 ----
-*** misc/libwpd-0.8.8/src/lib/WP5SubDocument.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP5SubDocument.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 26,32 ****
- #include "WP5Parser.h"
- #include "libwpd_internal.h"
-
-! WP5SubDocument::WP5SubDocument(WPXInputStream *input, const int dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
---- 26,32 ----
- #include "WP5Parser.h"
- #include "libwpd_internal.h"
-
-! WP5SubDocument::WP5SubDocument(WPXInputStream *input, const unsigned dataSize) :
- WPXSubDocument(input, dataSize)
- {
- }
-*** misc/libwpd-0.8.8/src/lib/WP5SubDocument.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP5SubDocument.h Thu Feb 21 11:37:54 2008
-***************
-*** 32,38 ****
- class WP5SubDocument : public WPXSubDocument
- {
- public:
-! WP5SubDocument(WPXInputStream *input, const int dataSize);
- void parse(WP5Listener *listener) const;
-
- };
---- 32,38 ----
- class WP5SubDocument : public WPXSubDocument
- {
- public:
-! WP5SubDocument(WPXInputStream *input, const unsigned dataSize);
- void parse(WP5Listener *listener) const;
-
- };
-*** misc/libwpd-0.8.8/src/lib/WP6ExtendedDocumentSummaryPacket.cpp Fri Jan 5 10:30:07 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6ExtendedDocumentSummaryPacket.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 24,29 ****
---- 24,30 ----
- * Corel Corporation or Corel Corporation Limited."
- */
- #include <string.h>
-+ #include <limits>
-
- #include "WP6ExtendedDocumentSummaryPacket.h"
- #include "libwpd_internal.h"
-***************
-*** 47,52 ****
---- 48,55 ----
- {
- if (m_dataSize <= 0)
- return;
-+ if (m_dataSize > ((std::numeric_limits<uint32_t>::max)() / 2))
-+ m_dataSize = ((std::numeric_limits<uint32_t>::max)() / 2);
- uint8_t *streamData = new uint8_t[m_dataSize];
- for(unsigned i=0; i<(unsigned)m_dataSize; i++)
- streamData[i] = readU8(input);
-*** misc/libwpd-0.8.8/src/lib/WP6FontDescriptorPacket.cpp Thu Jan 4 11:52:35 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6FontDescriptorPacket.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 23,29 ****
- * Corel Corporation or Corel Corporation Limited."
- */
- #include <string.h>
-!
- #include "WP6FontDescriptorPacket.h"
- #include "libwpd_internal.h"
-
---- 23,29 ----
- * Corel Corporation or Corel Corporation Limited."
- */
- #include <string.h>
-! #include <limits>
- #include "WP6FontDescriptorPacket.h"
- #include "libwpd_internal.h"
-
-***************
-*** 69,77 ****
-
- m_fontNameLength = readU16(input);
-
-! // TODO: re-do sanity checking
-! //if(m_fontNameLength < WP_FONT_NAME_MAX_LENGTH)
-! //{
- if (m_fontNameLength == 0)
- {
- m_fontName = new char[1];
---- 69,77 ----
-
- m_fontNameLength = readU16(input);
-
-!
-! if (m_fontNameLength > ((std::numeric_limits<uint16_t>::max)() / 2))
-! m_fontNameLength = ((std::numeric_limits<uint16_t>::max)() / 2);
- if (m_fontNameLength == 0)
- {
- m_fontName = new char[1];
-*** misc/libwpd-0.8.8/src/lib/WP6GeneralTextPacket.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6GeneralTextPacket.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 43,48 ****
---- 43,49 ----
-
- void WP6GeneralTextPacket::_readContents(WPXInputStream *input)
- {
-+ long startPosition = input->tell();
- uint16_t numTextBlocks = readU16(input);
- input->seek(4, WPX_SEEK_CUR);
-
-***************
-*** 53,65 ****
- }
-
- uint32_t *blockSizes = new uint32_t[numTextBlocks];
-! int totalSize = 0;
-! unsigned int i;
-
- for(i=0; i<numTextBlocks; i++)
- {
- blockSizes[i] = readU32(input);
-! totalSize += blockSizes[i];
- }
-
- if (totalSize <= 0)
---- 54,71 ----
- }
-
- uint32_t *blockSizes = new uint32_t[numTextBlocks];
-! unsigned int totalSize = 0;
-! unsigned int i = 0;
-
- for(i=0; i<numTextBlocks; i++)
- {
-+ if ((input->tell() - startPosition + 4) > getDataSize() || input->atEOS())
-+ throw FileException();
- blockSizes[i] = readU32(input);
-! unsigned int newTotalSize = totalSize + blockSizes[i];
-! if (newTotalSize < totalSize)
-! throw FileException();
-! totalSize = newTotalSize;
- }
-
- if (totalSize <= 0)
-***************
-*** 73,78 ****
---- 79,86 ----
- int streamPos = 0;
- for(i=0; i<numTextBlocks; i++)
- {
-+ if ((input->tell() - startPosition + blockSizes[i]) > getDataSize() || input->atEOS())
-+ throw FileException();
- for (unsigned int j=0; j<blockSizes[i]; j++)
- {
- streamData[streamPos] = readU8(input);
-*** misc/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 35,41 ****
- #include "libwpd.h"
- #include "libwpd_internal.h"
-
-! WP6PrefixDataPacket::WP6PrefixDataPacket(WPXInputStream * /* input */)
- {
- }
-
---- 35,42 ----
- #include "libwpd.h"
- #include "libwpd_internal.h"
-
-! WP6PrefixDataPacket::WP6PrefixDataPacket(WPXInputStream * /* input */) :
-! m_dataSize(0)
- {
- }
-
-***************
-*** 74,80 ****
-
- void WP6PrefixDataPacket::_read(WPXInputStream *input, uint32_t dataOffset, uint32_t dataSize)
- {
-! if (!dataSize)
- return;
-
- input->seek(dataOffset, WPX_SEEK_SET);
---- 75,83 ----
-
- void WP6PrefixDataPacket::_read(WPXInputStream *input, uint32_t dataOffset, uint32_t dataSize)
- {
-! m_dataSize = dataSize;
-!
-! if (!m_dataSize)
- return;
-
- input->seek(dataOffset, WPX_SEEK_SET);
-*** misc/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.h Thu Feb 21 11:37:54 2008
-***************
-*** 39,50 ****
---- 39,54 ----
- virtual ~WP6PrefixDataPacket() {}
- virtual void parse(WP6Listener * /* listener */) const {}
- virtual WP6SubDocument * getSubDocument() const { return 0; }
-+ const uint32_t getDataSize() const { return m_dataSize; }
-
- static WP6PrefixDataPacket * constructPrefixDataPacket(WPXInputStream * input, WP6PrefixIndice *prefixIndice);
-
- protected:
- virtual void _readContents(WPXInputStream *input) = 0;
- void _read(WPXInputStream *input, uint32_t dataOffset, uint32_t dataSize);
-+
-+ private:
-+ uint32_t m_dataSize;
- };
-
- #endif /* WP6PREFIXDATAPACKET_H */
-*** misc/libwpd-0.8.8/src/lib/WP6SubDocument.cpp Wed Jan 3 13:07:55 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6SubDocument.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 26,32 ****
- #include "WP6Parser.h"
- #include "libwpd_internal.h"
-
-! WP6SubDocument::WP6SubDocument(uint8_t * streamData, const int dataSize) :
- WPXSubDocument(streamData, dataSize)
- {
- }
---- 26,32 ----
- #include "WP6Parser.h"
- #include "libwpd_internal.h"
-
-! WP6SubDocument::WP6SubDocument(uint8_t * streamData, const unsigned dataSize) :
- WPXSubDocument(streamData, dataSize)
- {
- }
-*** misc/libwpd-0.8.8/src/lib/WP6SubDocument.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WP6SubDocument.h Thu Feb 21 11:37:54 2008
-***************
-*** 32,38 ****
- class WP6SubDocument : public WPXSubDocument
- {
- public:
-! WP6SubDocument(uint8_t * streamData, const int dataSize);
- void parse(WP6Listener *listener) const;
- };
- #endif /* WP6SUBDOCUMENT_H */
---- 32,38 ----
- class WP6SubDocument : public WPXSubDocument
- {
- public:
-! WP6SubDocument(uint8_t * streamData, const unsigned dataSize);
- void parse(WP6Listener *listener) const;
- };
- #endif /* WP6SUBDOCUMENT_H */
-*** misc/libwpd-0.8.8/src/lib/WPXHeader.cpp Wed Jan 3 16:40:14 2007
---- misc/build/libwpd-0.8.8/src/lib/WPXHeader.cpp Thu Feb 21 11:40:46 2008
-***************
-*** 31,36 ****
---- 31,37 ----
- #include "WP61Header.h"
- #include "WPXFileStructure.h"
- #include "libwpd_internal.h"
-+ #include <string.h>
-
- WPXHeader::WPXHeader(WPXInputStream * /* input */, uint32_t documentOffset, uint8_t productType,
- uint8_t fileType, uint8_t majorVersion, uint8_t minorVersion, uint16_t documentEncryption) :
-*** misc/libwpd-0.8.8/src/lib/WPXSubDocument.cpp Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WPXSubDocument.cpp Thu Feb 21 11:37:54 2008
-***************
-*** 32,49 ****
- {
- }
-
-! WPXSubDocument::WPXSubDocument(WPXInputStream *input, const int dataSize) :
- m_stream(0)
- {
- uint8_t *streamData = new uint8_t[dataSize];
- for (int i=0; i<dataSize; i++)
- {
- streamData[i] = readU8(input);
- }
- m_stream = new WPXMemoryInputStream(streamData, dataSize);
- }
-
-! WPXSubDocument::WPXSubDocument(uint8_t * streamData, const int dataSize) :
- m_stream(0)
- {
- m_stream = new WPXMemoryInputStream(streamData, dataSize);
---- 32,51 ----
- {
- }
-
-! WPXSubDocument::WPXSubDocument(WPXInputStream *input, const unsigned dataSize) :
- m_stream(0)
- {
- uint8_t *streamData = new uint8_t[dataSize];
- for (int i=0; i<dataSize; i++)
- {
-+ if (input->atEOS())
-+ throw FileException();
- streamData[i] = readU8(input);
- }
- m_stream = new WPXMemoryInputStream(streamData, dataSize);
- }
-
-! WPXSubDocument::WPXSubDocument(uint8_t * streamData, const unsigned dataSize) :
- m_stream(0)
- {
- m_stream = new WPXMemoryInputStream(streamData, dataSize);
-*** misc/libwpd-0.8.8/src/lib/WPXSubDocument.h Wed Jan 3 13:07:56 2007
---- misc/build/libwpd-0.8.8/src/lib/WPXSubDocument.h Thu Feb 21 11:37:54 2008
-***************
-*** 33,40 ****
- {
- public:
- WPXSubDocument();
-! WPXSubDocument(WPXInputStream *input, const int dataSize);
-! WPXSubDocument(uint8_t * streamData, const int dataSize);
- virtual ~WPXSubDocument();
- WPXMemoryInputStream *getStream() const { return m_stream;}
-
---- 33,40 ----
- {
- public:
- WPXSubDocument();
-! WPXSubDocument(WPXInputStream *input, const unsigned dataSize);
-! WPXSubDocument(uint8_t * streamData, const unsigned dataSize);
- virtual ~WPXSubDocument();
- WPXMemoryInputStream *getStream() const { return m_stream;}
-
-*** misc/libwpd-0.8.8/src/lib/makefile.mk Tue Nov 14 14:45:50 2006
---- misc/build/libwpd-0.8.8/src/lib/makefile.mk Thu Feb 21 11:37:54 2008
-***************
-*** 7,15 ****
- ENABLE_EXCEPTIONS=TRUE
- LIBTARGET=NO
-
-- .INCLUDE : svpre.mk
- .INCLUDE : settings.mk
-- .INCLUDE : sv.mk
-
- .IF "$(GUI)"=="WNT"
- CFLAGS+=-GR
---- 7,13 ----
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index f30a317e0aa4..6ea63b1cf016 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -41,8 +41,8 @@ TARGET=wpd
@echo "Using system libwpd..."
.ENDIF
-TARFILE_NAME=libwpd-0.9.0
-TARFILE_MD5=86e390f015e505dd71a66f0123c62f09
+TARFILE_NAME=libwpd-0.9.1
+TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
diff --git a/np_sdk/mozsrc/jri.h b/np_sdk/mozsrc/jri.h
index 04e237f2d144..1d54785a016f 100644
--- a/np_sdk/mozsrc/jri.h
+++ b/np_sdk/mozsrc/jri.h
@@ -14,7 +14,7 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
@@ -53,343 +53,343 @@ extern "C" {
******************************************************************************/
/* The type of the JRIEnv interface. */
-typedef struct JRIEnvInterface JRIEnvInterface;
+typedef struct JRIEnvInterface JRIEnvInterface;
/* The type of a JRIEnv instance. */
-typedef const JRIEnvInterface* JRIEnv;
+typedef const JRIEnvInterface* JRIEnv;
/*******************************************************************************
* JRIEnv Operations
******************************************************************************/
-#define JRI_DefineClass(env, classLoader, buf, bufLen) \
+#define JRI_DefineClass(env, classLoader, buf, bufLen) \
(((*(env))->DefineClass)(env, JRI_DefineClass_op, classLoader, buf, bufLen))
-#define JRI_FindClass(env, name) \
+#define JRI_FindClass(env, name) \
(((*(env))->FindClass)(env, JRI_FindClass_op, name))
-#define JRI_Throw(env, obj) \
+#define JRI_Throw(env, obj) \
(((*(env))->Throw)(env, JRI_Throw_op, obj))
-#define JRI_ThrowNew(env, clazz, message) \
+#define JRI_ThrowNew(env, clazz, message) \
(((*(env))->ThrowNew)(env, JRI_ThrowNew_op, clazz, message))
-#define JRI_ExceptionOccurred(env) \
+#define JRI_ExceptionOccurred(env) \
(((*(env))->ExceptionOccurred)(env, JRI_ExceptionOccurred_op))
-#define JRI_ExceptionDescribe(env) \
+#define JRI_ExceptionDescribe(env) \
(((*(env))->ExceptionDescribe)(env, JRI_ExceptionDescribe_op))
-#define JRI_ExceptionClear(env) \
+#define JRI_ExceptionClear(env) \
(((*(env))->ExceptionClear)(env, JRI_ExceptionClear_op))
-#define JRI_NewGlobalRef(env, ref) \
+#define JRI_NewGlobalRef(env, ref) \
(((*(env))->NewGlobalRef)(env, JRI_NewGlobalRef_op, ref))
-#define JRI_DisposeGlobalRef(env, gref) \
+#define JRI_DisposeGlobalRef(env, gref) \
(((*(env))->DisposeGlobalRef)(env, JRI_DisposeGlobalRef_op, gref))
-#define JRI_GetGlobalRef(env, gref) \
+#define JRI_GetGlobalRef(env, gref) \
(((*(env))->GetGlobalRef)(env, JRI_GetGlobalRef_op, gref))
-#define JRI_SetGlobalRef(env, gref, ref) \
+#define JRI_SetGlobalRef(env, gref, ref) \
(((*(env))->SetGlobalRef)(env, JRI_SetGlobalRef_op, gref, ref))
-#define JRI_IsSameObject(env, a, b) \
+#define JRI_IsSameObject(env, a, b) \
(((*(env))->IsSameObject)(env, JRI_IsSameObject_op, a, b))
-#define JRI_NewObject(env) ((*(env))->NewObject)
-#define JRI_NewObjectV(env, clazz, methodID, args) \
+#define JRI_NewObject(env) ((*(env))->NewObject)
+#define JRI_NewObjectV(env, clazz, methodID, args) \
(((*(env))->NewObjectV)(env, JRI_NewObject_op_va_list, clazz, methodID, args))
-#define JRI_NewObjectA(env, clazz, method, args) \
+#define JRI_NewObjectA(env, clazz, method, args) \
(((*(env))->NewObjectA)(env, JRI_NewObject_op_array, clazz, methodID, args))
-#define JRI_GetObjectClass(env, obj) \
+#define JRI_GetObjectClass(env, obj) \
(((*(env))->GetObjectClass)(env, JRI_GetObjectClass_op, obj))
-#define JRI_IsInstanceOf(env, obj, clazz) \
+#define JRI_IsInstanceOf(env, obj, clazz) \
(((*(env))->IsInstanceOf)(env, JRI_IsInstanceOf_op, obj, clazz))
-#define JRI_GetMethodID(env, clazz, name, sig) \
+#define JRI_GetMethodID(env, clazz, name, sig) \
(((*(env))->GetMethodID)(env, JRI_GetMethodID_op, clazz, name, sig))
-#define JRI_CallMethod(env) ((*(env))->CallMethod)
-#define JRI_CallMethodV(env, obj, methodID, args) \
+#define JRI_CallMethod(env) ((*(env))->CallMethod)
+#define JRI_CallMethodV(env, obj, methodID, args) \
(((*(env))->CallMethodV)(env, JRI_CallMethod_op_va_list, obj, methodID, args))
-#define JRI_CallMethodA(env, obj, methodID, args) \
+#define JRI_CallMethodA(env, obj, methodID, args) \
(((*(env))->CallMethodA)(env, JRI_CallMethod_op_array, obj, methodID, args))
-#define JRI_CallMethodBoolean(env) ((*(env))->CallMethodBoolean)
-#define JRI_CallMethodBooleanV(env, obj, methodID, args) \
+#define JRI_CallMethodBoolean(env) ((*(env))->CallMethodBoolean)
+#define JRI_CallMethodBooleanV(env, obj, methodID, args) \
(((*(env))->CallMethodBooleanV)(env, JRI_CallMethodBoolean_op_va_list, obj, methodID, args))
-#define JRI_CallMethodBooleanA(env, obj, methodID, args) \
+#define JRI_CallMethodBooleanA(env, obj, methodID, args) \
(((*(env))->CallMethodBooleanA)(env, JRI_CallMethodBoolean_op_array, obj, methodID, args))
-#define JRI_CallMethodByte(env) ((*(env))->CallMethodByte)
-#define JRI_CallMethodByteV(env, obj, methodID, args) \
+#define JRI_CallMethodByte(env) ((*(env))->CallMethodByte)
+#define JRI_CallMethodByteV(env, obj, methodID, args) \
(((*(env))->CallMethodByteV)(env, JRI_CallMethodByte_op_va_list, obj, methodID, args))
-#define JRI_CallMethodByteA(env, obj, methodID, args) \
+#define JRI_CallMethodByteA(env, obj, methodID, args) \
(((*(env))->CallMethodByteA)(env, JRI_CallMethodByte_op_array, obj, methodID, args))
-#define JRI_CallMethodChar(env) ((*(env))->CallMethodChar)
-#define JRI_CallMethodCharV(env, obj, methodID, args) \
+#define JRI_CallMethodChar(env) ((*(env))->CallMethodChar)
+#define JRI_CallMethodCharV(env, obj, methodID, args) \
(((*(env))->CallMethodCharV)(env, JRI_CallMethodChar_op_va_list, obj, methodID, args))
-#define JRI_CallMethodCharA(env, obj, methodID, args) \
+#define JRI_CallMethodCharA(env, obj, methodID, args) \
(((*(env))->CallMethodCharA)(env, JRI_CallMethodChar_op_array, obj, methodID, args))
-#define JRI_CallMethodShort(env) ((*(env))->CallMethodShort)
-#define JRI_CallMethodShortV(env, obj, methodID, args) \
+#define JRI_CallMethodShort(env) ((*(env))->CallMethodShort)
+#define JRI_CallMethodShortV(env, obj, methodID, args) \
(((*(env))->CallMethodShortV)(env, JRI_CallMethodShort_op_va_list, obj, methodID, args))
-#define JRI_CallMethodShortA(env, obj, methodID, args) \
+#define JRI_CallMethodShortA(env, obj, methodID, args) \
(((*(env))->CallMethodShortA)(env, JRI_CallMethodShort_op_array, obj, methodID, args))
-#define JRI_CallMethodInt(env) ((*(env))->CallMethodInt)
-#define JRI_CallMethodIntV(env, obj, methodID, args) \
+#define JRI_CallMethodInt(env) ((*(env))->CallMethodInt)
+#define JRI_CallMethodIntV(env, obj, methodID, args) \
(((*(env))->CallMethodIntV)(env, JRI_CallMethodInt_op_va_list, obj, methodID, args))
-#define JRI_CallMethodIntA(env, obj, methodID, args) \
+#define JRI_CallMethodIntA(env, obj, methodID, args) \
(((*(env))->CallMethodIntA)(env, JRI_CallMethodInt_op_array, obj, methodID, args))
-#define JRI_CallMethodLong(env) ((*(env))->CallMethodLong)
-#define JRI_CallMethodLongV(env, obj, methodID, args) \
+#define JRI_CallMethodLong(env) ((*(env))->CallMethodLong)
+#define JRI_CallMethodLongV(env, obj, methodID, args) \
(((*(env))->CallMethodLongV)(env, JRI_CallMethodLong_op_va_list, obj, methodID, args))
-#define JRI_CallMethodLongA(env, obj, methodID, args) \
+#define JRI_CallMethodLongA(env, obj, methodID, args) \
(((*(env))->CallMethodLongA)(env, JRI_CallMethodLong_op_array, obj, methodID, args))
-#define JRI_CallMethodFloat(env) ((*(env))->CallMethodFloat)
-#define JRI_CallMethodFloatV(env, obj, methodID, args) \
+#define JRI_CallMethodFloat(env) ((*(env))->CallMethodFloat)
+#define JRI_CallMethodFloatV(env, obj, methodID, args) \
(((*(env))->CallMethodFloatV)(env, JRI_CallMethodFloat_op_va_list, obj, methodID, args))
-#define JRI_CallMethodFloatA(env, obj, methodID, args) \
+#define JRI_CallMethodFloatA(env, obj, methodID, args) \
(((*(env))->CallMethodFloatA)(env, JRI_CallMethodFloat_op_array, obj, methodID, args))
-#define JRI_CallMethodDouble(env) ((*(env))->CallMethodDouble)
-#define JRI_CallMethodDoubleV(env, obj, methodID, args) \
+#define JRI_CallMethodDouble(env) ((*(env))->CallMethodDouble)
+#define JRI_CallMethodDoubleV(env, obj, methodID, args) \
(((*(env))->CallMethodDoubleV)(env, JRI_CallMethodDouble_op_va_list, obj, methodID, args))
-#define JRI_CallMethodDoubleA(env, obj, methodID, args) \
+#define JRI_CallMethodDoubleA(env, obj, methodID, args) \
(((*(env))->CallMethodDoubleA)(env, JRI_CallMethodDouble_op_array, obj, methodID, args))
-#define JRI_GetFieldID(env, clazz, name, sig) \
+#define JRI_GetFieldID(env, clazz, name, sig) \
(((*(env))->GetFieldID)(env, JRI_GetFieldID_op, clazz, name, sig))
-#define JRI_GetField(env, obj, fieldID) \
+#define JRI_GetField(env, obj, fieldID) \
(((*(env))->GetField)(env, JRI_GetField_op, obj, fieldID))
-#define JRI_GetFieldBoolean(env, obj, fieldID) \
+#define JRI_GetFieldBoolean(env, obj, fieldID) \
(((*(env))->GetFieldBoolean)(env, JRI_GetFieldBoolean_op, obj, fieldID))
-#define JRI_GetFieldByte(env, obj, fieldID) \
+#define JRI_GetFieldByte(env, obj, fieldID) \
(((*(env))->GetFieldByte)(env, JRI_GetFieldByte_op, obj, fieldID))
-#define JRI_GetFieldChar(env, obj, fieldID) \
+#define JRI_GetFieldChar(env, obj, fieldID) \
(((*(env))->GetFieldChar)(env, JRI_GetFieldChar_op, obj, fieldID))
-#define JRI_GetFieldShort(env, obj, fieldID) \
+#define JRI_GetFieldShort(env, obj, fieldID) \
(((*(env))->GetFieldShort)(env, JRI_GetFieldShort_op, obj, fieldID))
-#define JRI_GetFieldInt(env, obj, fieldID) \
+#define JRI_GetFieldInt(env, obj, fieldID) \
(((*(env))->GetFieldInt)(env, JRI_GetFieldInt_op, obj, fieldID))
-#define JRI_GetFieldLong(env, obj, fieldID) \
+#define JRI_GetFieldLong(env, obj, fieldID) \
(((*(env))->GetFieldLong)(env, JRI_GetFieldLong_op, obj, fieldID))
-#define JRI_GetFieldFloat(env, obj, fieldID) \
+#define JRI_GetFieldFloat(env, obj, fieldID) \
(((*(env))->GetFieldFloat)(env, JRI_GetFieldFloat_op, obj, fieldID))
-#define JRI_GetFieldDouble(env, obj, fieldID) \
+#define JRI_GetFieldDouble(env, obj, fieldID) \
(((*(env))->GetFieldDouble)(env, JRI_GetFieldDouble_op, obj, fieldID))
-#define JRI_SetField(env, obj, fieldID, value) \
+#define JRI_SetField(env, obj, fieldID, value) \
(((*(env))->SetField)(env, JRI_SetField_op, obj, fieldID, value))
-#define JRI_SetFieldBoolean(env, obj, fieldID, value) \
+#define JRI_SetFieldBoolean(env, obj, fieldID, value) \
(((*(env))->SetFieldBoolean)(env, JRI_SetFieldBoolean_op, obj, fieldID, value))
-#define JRI_SetFieldByte(env, obj, fieldID, value) \
+#define JRI_SetFieldByte(env, obj, fieldID, value) \
(((*(env))->SetFieldByte)(env, JRI_SetFieldByte_op, obj, fieldID, value))
-#define JRI_SetFieldChar(env, obj, fieldID, value) \
+#define JRI_SetFieldChar(env, obj, fieldID, value) \
(((*(env))->SetFieldChar)(env, JRI_SetFieldChar_op, obj, fieldID, value))
-#define JRI_SetFieldShort(env, obj, fieldID, value) \
+#define JRI_SetFieldShort(env, obj, fieldID, value) \
(((*(env))->SetFieldShort)(env, JRI_SetFieldShort_op, obj, fieldID, value))
-#define JRI_SetFieldInt(env, obj, fieldID, value) \
+#define JRI_SetFieldInt(env, obj, fieldID, value) \
(((*(env))->SetFieldInt)(env, JRI_SetFieldInt_op, obj, fieldID, value))
-#define JRI_SetFieldLong(env, obj, fieldID, value) \
+#define JRI_SetFieldLong(env, obj, fieldID, value) \
(((*(env))->SetFieldLong)(env, JRI_SetFieldLong_op, obj, fieldID, value))
-#define JRI_SetFieldFloat(env, obj, fieldID, value) \
+#define JRI_SetFieldFloat(env, obj, fieldID, value) \
(((*(env))->SetFieldFloat)(env, JRI_SetFieldFloat_op, obj, fieldID, value))
-#define JRI_SetFieldDouble(env, obj, fieldID, value) \
+#define JRI_SetFieldDouble(env, obj, fieldID, value) \
(((*(env))->SetFieldDouble)(env, JRI_SetFieldDouble_op, obj, fieldID, value))
-#define JRI_IsSubclassOf(env, a, b) \
+#define JRI_IsSubclassOf(env, a, b) \
(((*(env))->IsSubclassOf)(env, JRI_IsSubclassOf_op, a, b))
-#define JRI_GetStaticMethodID(env, clazz, name, sig) \
+#define JRI_GetStaticMethodID(env, clazz, name, sig) \
(((*(env))->GetStaticMethodID)(env, JRI_GetStaticMethodID_op, clazz, name, sig))
-#define JRI_CallStaticMethod(env) ((*(env))->CallStaticMethod)
-#define JRI_CallStaticMethodV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethod(env) ((*(env))->CallStaticMethod)
+#define JRI_CallStaticMethodV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodV)(env, JRI_CallStaticMethod_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodA)(env, JRI_CallStaticMethod_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodBoolean(env) ((*(env))->CallStaticMethodBoolean)
-#define JRI_CallStaticMethodBooleanV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodBoolean(env) ((*(env))->CallStaticMethodBoolean)
+#define JRI_CallStaticMethodBooleanV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodBooleanV)(env, JRI_CallStaticMethodBoolean_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodBooleanA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodBooleanA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodBooleanA)(env, JRI_CallStaticMethodBoolean_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodByte(env) ((*(env))->CallStaticMethodByte)
-#define JRI_CallStaticMethodByteV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodByte(env) ((*(env))->CallStaticMethodByte)
+#define JRI_CallStaticMethodByteV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodByteV)(env, JRI_CallStaticMethodByte_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodByteA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodByteA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodByteA)(env, JRI_CallStaticMethodByte_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodChar(env) ((*(env))->CallStaticMethodChar)
-#define JRI_CallStaticMethodCharV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodChar(env) ((*(env))->CallStaticMethodChar)
+#define JRI_CallStaticMethodCharV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodCharV)(env, JRI_CallStaticMethodChar_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodCharA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodCharA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodCharA)(env, JRI_CallStaticMethodChar_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodShort(env) ((*(env))->CallStaticMethodShort)
-#define JRI_CallStaticMethodShortV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodShort(env) ((*(env))->CallStaticMethodShort)
+#define JRI_CallStaticMethodShortV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodShortV)(env, JRI_CallStaticMethodShort_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodShortA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodShortA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodShortA)(env, JRI_CallStaticMethodShort_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodInt(env) ((*(env))->CallStaticMethodInt)
-#define JRI_CallStaticMethodIntV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodInt(env) ((*(env))->CallStaticMethodInt)
+#define JRI_CallStaticMethodIntV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodIntV)(env, JRI_CallStaticMethodInt_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodIntA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodIntA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodIntA)(env, JRI_CallStaticMethodInt_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodLong(env) ((*(env))->CallStaticMethodLong)
-#define JRI_CallStaticMethodLongV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodLong(env) ((*(env))->CallStaticMethodLong)
+#define JRI_CallStaticMethodLongV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodLongV)(env, JRI_CallStaticMethodLong_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodLongA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodLongA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodLongA)(env, JRI_CallStaticMethodLong_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodFloat(env) ((*(env))->CallStaticMethodFloat)
-#define JRI_CallStaticMethodFloatV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodFloat(env) ((*(env))->CallStaticMethodFloat)
+#define JRI_CallStaticMethodFloatV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodFloatV)(env, JRI_CallStaticMethodFloat_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodFloatA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodFloatA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodFloatA)(env, JRI_CallStaticMethodFloat_op_array, clazz, methodID, args))
-#define JRI_CallStaticMethodDouble(env) ((*(env))->CallStaticMethodDouble)
-#define JRI_CallStaticMethodDoubleV(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodDouble(env) ((*(env))->CallStaticMethodDouble)
+#define JRI_CallStaticMethodDoubleV(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodDoubleV)(env, JRI_CallStaticMethodDouble_op_va_list, clazz, methodID, args))
-#define JRI_CallStaticMethodDoubleA(env, clazz, methodID, args) \
+#define JRI_CallStaticMethodDoubleA(env, clazz, methodID, args) \
(((*(env))->CallStaticMethodDoubleA)(env, JRI_CallStaticMethodDouble_op_array, clazz, methodID, args))
-#define JRI_GetStaticFieldID(env, clazz, name, sig) \
+#define JRI_GetStaticFieldID(env, clazz, name, sig) \
(((*(env))->GetStaticFieldID)(env, JRI_GetStaticFieldID_op, clazz, name, sig))
-#define JRI_GetStaticField(env, clazz, fieldID) \
+#define JRI_GetStaticField(env, clazz, fieldID) \
(((*(env))->GetStaticField)(env, JRI_GetStaticField_op, clazz, fieldID))
-#define JRI_GetStaticFieldBoolean(env, clazz, fieldID) \
+#define JRI_GetStaticFieldBoolean(env, clazz, fieldID) \
(((*(env))->GetStaticFieldBoolean)(env, JRI_GetStaticFieldBoolean_op, clazz, fieldID))
-#define JRI_GetStaticFieldByte(env, clazz, fieldID) \
+#define JRI_GetStaticFieldByte(env, clazz, fieldID) \
(((*(env))->GetStaticFieldByte)(env, JRI_GetStaticFieldByte_op, clazz, fieldID))
-#define JRI_GetStaticFieldChar(env, clazz, fieldID) \
+#define JRI_GetStaticFieldChar(env, clazz, fieldID) \
(((*(env))->GetStaticFieldChar)(env, JRI_GetStaticFieldChar_op, clazz, fieldID))
-#define JRI_GetStaticFieldShort(env, clazz, fieldID) \
+#define JRI_GetStaticFieldShort(env, clazz, fieldID) \
(((*(env))->GetStaticFieldShort)(env, JRI_GetStaticFieldShort_op, clazz, fieldID))
-#define JRI_GetStaticFieldInt(env, clazz, fieldID) \
+#define JRI_GetStaticFieldInt(env, clazz, fieldID) \
(((*(env))->GetStaticFieldInt)(env, JRI_GetStaticFieldInt_op, clazz, fieldID))
-#define JRI_GetStaticFieldLong(env, clazz, fieldID) \
+#define JRI_GetStaticFieldLong(env, clazz, fieldID) \
(((*(env))->GetStaticFieldLong)(env, JRI_GetStaticFieldLong_op, clazz, fieldID))
-#define JRI_GetStaticFieldFloat(env, clazz, fieldID) \
+#define JRI_GetStaticFieldFloat(env, clazz, fieldID) \
(((*(env))->GetStaticFieldFloat)(env, JRI_GetStaticFieldFloat_op, clazz, fieldID))
-#define JRI_GetStaticFieldDouble(env, clazz, fieldID) \
+#define JRI_GetStaticFieldDouble(env, clazz, fieldID) \
(((*(env))->GetStaticFieldDouble)(env, JRI_GetStaticFieldDouble_op, clazz, fieldID))
-#define JRI_SetStaticField(env, clazz, fieldID, value) \
+#define JRI_SetStaticField(env, clazz, fieldID, value) \
(((*(env))->SetStaticField)(env, JRI_SetStaticField_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldBoolean(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldBoolean(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldBoolean)(env, JRI_SetStaticFieldBoolean_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldByte(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldByte(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldByte)(env, JRI_SetStaticFieldByte_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldChar(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldChar(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldChar)(env, JRI_SetStaticFieldChar_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldShort(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldShort(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldShort)(env, JRI_SetStaticFieldShort_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldInt(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldInt(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldInt)(env, JRI_SetStaticFieldInt_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldLong(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldLong(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldLong)(env, JRI_SetStaticFieldLong_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldFloat(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldFloat(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldFloat)(env, JRI_SetStaticFieldFloat_op, clazz, fieldID, value))
-#define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \
+#define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \
(((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value))
-#define JRI_NewString(env, unicode, len) \
+#define JRI_NewString(env, unicode, len) \
(((*(env))->NewString)(env, JRI_NewString_op, unicode, len))
-#define JRI_GetStringLength(env, string) \
+#define JRI_GetStringLength(env, string) \
(((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string))
-#define JRI_GetStringChars(env, string) \
+#define JRI_GetStringChars(env, string) \
(((*(env))->GetStringChars)(env, JRI_GetStringChars_op, string))
-#define JRI_NewStringUTF(env, utf, len) \
+#define JRI_NewStringUTF(env, utf, len) \
(((*(env))->NewStringUTF)(env, JRI_NewStringUTF_op, utf, len))
-#define JRI_GetStringUTFLength(env, string) \
+#define JRI_GetStringUTFLength(env, string) \
(((*(env))->GetStringUTFLength)(env, JRI_GetStringUTFLength_op, string))
-#define JRI_GetStringUTFChars(env, string) \
+#define JRI_GetStringUTFChars(env, string) \
(((*(env))->GetStringUTFChars)(env, JRI_GetStringUTFChars_op, string))
-#define JRI_NewScalarArray(env, length, elementSig, initialElements) \
+#define JRI_NewScalarArray(env, length, elementSig, initialElements) \
(((*(env))->NewScalarArray)(env, JRI_NewScalarArray_op, length, elementSig, initialElements))
-#define JRI_GetScalarArrayLength(env, array) \
+#define JRI_GetScalarArrayLength(env, array) \
(((*(env))->GetScalarArrayLength)(env, JRI_GetScalarArrayLength_op, array))
-#define JRI_GetScalarArrayElements(env, array) \
+#define JRI_GetScalarArrayElements(env, array) \
(((*(env))->GetScalarArrayElements)(env, JRI_GetScalarArrayElements_op, array))
-#define JRI_NewObjectArray(env, length, elementClass, initialElement) \
+#define JRI_NewObjectArray(env, length, elementClass, initialElement) \
(((*(env))->NewObjectArray)(env, JRI_NewObjectArray_op, length, elementClass, initialElement))
-#define JRI_GetObjectArrayLength(env, array) \
+#define JRI_GetObjectArrayLength(env, array) \
(((*(env))->GetObjectArrayLength)(env, JRI_GetObjectArrayLength_op, array))
-#define JRI_GetObjectArrayElement(env, array, index) \
+#define JRI_GetObjectArrayElement(env, array, index) \
(((*(env))->GetObjectArrayElement)(env, JRI_GetObjectArrayElement_op, array, index))
-#define JRI_SetObjectArrayElement(env, array, index, value) \
+#define JRI_SetObjectArrayElement(env, array, index, value) \
(((*(env))->SetObjectArrayElement)(env, JRI_SetObjectArrayElement_op, array, index, value))
-#define JRI_RegisterNatives(env, clazz, nameAndSigArray, nativeProcArray) \
+#define JRI_RegisterNatives(env, clazz, nameAndSigArray, nativeProcArray) \
(((*(env))->RegisterNatives)(env, JRI_RegisterNatives_op, clazz, nameAndSigArray, nativeProcArray))
-#define JRI_UnregisterNatives(env, clazz) \
+#define JRI_UnregisterNatives(env, clazz) \
(((*(env))->UnregisterNatives)(env, JRI_UnregisterNatives_op, clazz))
-#define JRI_NewStringPlatform(env, string, len, encoding, encodingLength) \
+#define JRI_NewStringPlatform(env, string, len, encoding, encodingLength) \
(((*(env))->NewStringPlatform)(env, JRI_NewStringPlatform_op, string, len, encoding, encodingLength))
-#define JRI_GetStringPlatformChars(env, string, encoding, encodingLength) \
+#define JRI_GetStringPlatformChars(env, string, encoding, encodingLength) \
(((*(env))->GetStringPlatformChars)(env, JRI_GetStringPlatformChars_op, string, encoding, encodingLength))
@@ -404,139 +404,139 @@ struct java_lang_Object;
struct java_lang_String;
struct JRIEnvInterface {
- void* reserved0;
- void* reserved1;
- void* reserved2;
- void* reserved3;
- struct java_lang_Class* (*FindClass)(JRIEnv* env, jint op, const char* a);
- void (*Throw)(JRIEnv* env, jint op, struct java_lang_Throwable* a);
- void (*ThrowNew)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b);
- struct java_lang_Throwable* (*ExceptionOccurred)(JRIEnv* env, jint op);
- void (*ExceptionDescribe)(JRIEnv* env, jint op);
- void (*ExceptionClear)(JRIEnv* env, jint op);
- jglobal (*NewGlobalRef)(JRIEnv* env, jint op, void* a);
- void (*DisposeGlobalRef)(JRIEnv* env, jint op, jglobal a);
- void* (*GetGlobalRef)(JRIEnv* env, jint op, jglobal a);
- void (*SetGlobalRef)(JRIEnv* env, jint op, jglobal a, void* b);
- jbool (*IsSameObject)(JRIEnv* env, jint op, void* a, void* b);
- void* (*NewObject)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- void* (*NewObjectV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- void* (*NewObjectA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- struct java_lang_Class* (*GetObjectClass)(JRIEnv* env, jint op, void* a);
- jbool (*IsInstanceOf)(JRIEnv* env, jint op, void* a, struct java_lang_Class* b);
- jint (*GetMethodID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
- void* (*CallMethod)(JRIEnv* env, jint op, void* a, jint b, ...);
- void* (*CallMethodV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- void* (*CallMethodA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jbool (*CallMethodBoolean)(JRIEnv* env, jint op, void* a, jint b, ...);
- jbool (*CallMethodBooleanV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jbool (*CallMethodBooleanA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jbyte (*CallMethodByte)(JRIEnv* env, jint op, void* a, jint b, ...);
- jbyte (*CallMethodByteV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jbyte (*CallMethodByteA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jchar (*CallMethodChar)(JRIEnv* env, jint op, void* a, jint b, ...);
- jchar (*CallMethodCharV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jchar (*CallMethodCharA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jshort (*CallMethodShort)(JRIEnv* env, jint op, void* a, jint b, ...);
- jshort (*CallMethodShortV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jshort (*CallMethodShortA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jint (*CallMethodInt)(JRIEnv* env, jint op, void* a, jint b, ...);
- jint (*CallMethodIntV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jint (*CallMethodIntA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jlong (*CallMethodLong)(JRIEnv* env, jint op, void* a, jint b, ...);
- jlong (*CallMethodLongV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jlong (*CallMethodLongA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jfloat (*CallMethodFloat)(JRIEnv* env, jint op, void* a, jint b, ...);
- jfloat (*CallMethodFloatV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jfloat (*CallMethodFloatA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jdouble (*CallMethodDouble)(JRIEnv* env, jint op, void* a, jint b, ...);
- jdouble (*CallMethodDoubleV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
- jdouble (*CallMethodDoubleA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
- jint (*GetFieldID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
- void* (*GetField)(JRIEnv* env, jint op, void* a, jint b);
- jbool (*GetFieldBoolean)(JRIEnv* env, jint op, void* a, jint b);
- jbyte (*GetFieldByte)(JRIEnv* env, jint op, void* a, jint b);
- jchar (*GetFieldChar)(JRIEnv* env, jint op, void* a, jint b);
- jshort (*GetFieldShort)(JRIEnv* env, jint op, void* a, jint b);
- jint (*GetFieldInt)(JRIEnv* env, jint op, void* a, jint b);
- jlong (*GetFieldLong)(JRIEnv* env, jint op, void* a, jint b);
- jfloat (*GetFieldFloat)(JRIEnv* env, jint op, void* a, jint b);
- jdouble (*GetFieldDouble)(JRIEnv* env, jint op, void* a, jint b);
- void (*SetField)(JRIEnv* env, jint op, void* a, jint b, void* c);
- void (*SetFieldBoolean)(JRIEnv* env, jint op, void* a, jint b, jbool c);
- void (*SetFieldByte)(JRIEnv* env, jint op, void* a, jint b, jbyte c);
- void (*SetFieldChar)(JRIEnv* env, jint op, void* a, jint b, jchar c);
- void (*SetFieldShort)(JRIEnv* env, jint op, void* a, jint b, jshort c);
- void (*SetFieldInt)(JRIEnv* env, jint op, void* a, jint b, jint c);
- void (*SetFieldLong)(JRIEnv* env, jint op, void* a, jint b, jlong c);
- void (*SetFieldFloat)(JRIEnv* env, jint op, void* a, jint b, jfloat c);
- void (*SetFieldDouble)(JRIEnv* env, jint op, void* a, jint b, jdouble c);
- jbool (*IsSubclassOf)(JRIEnv* env, jint op, struct java_lang_Class* a, struct java_lang_Class* b);
- jint (*GetStaticMethodID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
- void* (*CallStaticMethod)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- void* (*CallStaticMethodV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- void* (*CallStaticMethodA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jbool (*CallStaticMethodBoolean)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jbool (*CallStaticMethodBooleanV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jbool (*CallStaticMethodBooleanA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jbyte (*CallStaticMethodByte)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jbyte (*CallStaticMethodByteV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jbyte (*CallStaticMethodByteA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jchar (*CallStaticMethodChar)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jchar (*CallStaticMethodCharV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jchar (*CallStaticMethodCharA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jshort (*CallStaticMethodShort)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jshort (*CallStaticMethodShortV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jshort (*CallStaticMethodShortA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jint (*CallStaticMethodInt)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jint (*CallStaticMethodIntV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jint (*CallStaticMethodIntA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jlong (*CallStaticMethodLong)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jlong (*CallStaticMethodLongV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jlong (*CallStaticMethodLongA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jfloat (*CallStaticMethodFloat)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jfloat (*CallStaticMethodFloatV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jfloat (*CallStaticMethodFloatA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jdouble (*CallStaticMethodDouble)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
- jdouble (*CallStaticMethodDoubleV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
- jdouble (*CallStaticMethodDoubleA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
- jint (*GetStaticFieldID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
- void* (*GetStaticField)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jbool (*GetStaticFieldBoolean)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jbyte (*GetStaticFieldByte)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jchar (*GetStaticFieldChar)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jshort (*GetStaticFieldShort)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jint (*GetStaticFieldInt)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jlong (*GetStaticFieldLong)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jfloat (*GetStaticFieldFloat)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- jdouble (*GetStaticFieldDouble)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
- void (*SetStaticField)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, void* c);
- void (*SetStaticFieldBoolean)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jbool c);
- void (*SetStaticFieldByte)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jbyte c);
- void (*SetStaticFieldChar)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jchar c);
- void (*SetStaticFieldShort)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jshort c);
- void (*SetStaticFieldInt)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jint c);
- void (*SetStaticFieldLong)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jlong c);
- void (*SetStaticFieldFloat)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jfloat c);
- void (*SetStaticFieldDouble)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jdouble c);
- struct java_lang_String* (*NewString)(JRIEnv* env, jint op, const jchar* a, jint b);
- jint (*GetStringLength)(JRIEnv* env, jint op, struct java_lang_String* a);
- const jchar* (*GetStringChars)(JRIEnv* env, jint op, struct java_lang_String* a);
- struct java_lang_String* (*NewStringUTF)(JRIEnv* env, jint op, const jbyte* a, jint b);
- jint (*GetStringUTFLength)(JRIEnv* env, jint op, struct java_lang_String* a);
- const jbyte* (*GetStringUTFChars)(JRIEnv* env, jint op, struct java_lang_String* a);
- void* (*NewScalarArray)(JRIEnv* env, jint op, jint a, const char* b, const jbyte* c);
- jint (*GetScalarArrayLength)(JRIEnv* env, jint op, void* a);
- jbyte* (*GetScalarArrayElements)(JRIEnv* env, jint op, void* a);
- void* (*NewObjectArray)(JRIEnv* env, jint op, jint a, struct java_lang_Class* b, void* c);
- jint (*GetObjectArrayLength)(JRIEnv* env, jint op, void* a);
- void* (*GetObjectArrayElement)(JRIEnv* env, jint op, void* a, jint b);
- void (*SetObjectArrayElement)(JRIEnv* env, jint op, void* a, jint b, void* c);
- void (*RegisterNatives)(JRIEnv* env, jint op, struct java_lang_Class* a, char** b, void** c);
- void (*UnregisterNatives)(JRIEnv* env, jint op, struct java_lang_Class* a);
- struct java_lang_Class* (*DefineClass)(JRIEnv* env, jint op, struct java_lang_ClassLoader* a, jbyte* b, jsize bLen);
- struct java_lang_String* (*NewStringPlatform)(JRIEnv* env, jint op, const jbyte* a, jint b, const jbyte* c, jint d);
- const jbyte* (*GetStringPlatformChars)(JRIEnv* env, jint op, struct java_lang_String* a, const jbyte* b, jint c);
+ void* reserved0;
+ void* reserved1;
+ void* reserved2;
+ void* reserved3;
+ struct java_lang_Class* (*FindClass)(JRIEnv* env, jint op, const char* a);
+ void (*Throw)(JRIEnv* env, jint op, struct java_lang_Throwable* a);
+ void (*ThrowNew)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b);
+ struct java_lang_Throwable* (*ExceptionOccurred)(JRIEnv* env, jint op);
+ void (*ExceptionDescribe)(JRIEnv* env, jint op);
+ void (*ExceptionClear)(JRIEnv* env, jint op);
+ jglobal (*NewGlobalRef)(JRIEnv* env, jint op, void* a);
+ void (*DisposeGlobalRef)(JRIEnv* env, jint op, jglobal a);
+ void* (*GetGlobalRef)(JRIEnv* env, jint op, jglobal a);
+ void (*SetGlobalRef)(JRIEnv* env, jint op, jglobal a, void* b);
+ jbool (*IsSameObject)(JRIEnv* env, jint op, void* a, void* b);
+ void* (*NewObject)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ void* (*NewObjectV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ void* (*NewObjectA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ struct java_lang_Class* (*GetObjectClass)(JRIEnv* env, jint op, void* a);
+ jbool (*IsInstanceOf)(JRIEnv* env, jint op, void* a, struct java_lang_Class* b);
+ jint (*GetMethodID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
+ void* (*CallMethod)(JRIEnv* env, jint op, void* a, jint b, ...);
+ void* (*CallMethodV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ void* (*CallMethodA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jbool (*CallMethodBoolean)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jbool (*CallMethodBooleanV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jbool (*CallMethodBooleanA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jbyte (*CallMethodByte)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jbyte (*CallMethodByteV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jbyte (*CallMethodByteA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jchar (*CallMethodChar)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jchar (*CallMethodCharV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jchar (*CallMethodCharA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jshort (*CallMethodShort)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jshort (*CallMethodShortV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jshort (*CallMethodShortA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jint (*CallMethodInt)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jint (*CallMethodIntV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jint (*CallMethodIntA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jlong (*CallMethodLong)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jlong (*CallMethodLongV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jlong (*CallMethodLongA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jfloat (*CallMethodFloat)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jfloat (*CallMethodFloatV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jfloat (*CallMethodFloatA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jdouble (*CallMethodDouble)(JRIEnv* env, jint op, void* a, jint b, ...);
+ jdouble (*CallMethodDoubleV)(JRIEnv* env, jint op, void* a, jint b, va_list c);
+ jdouble (*CallMethodDoubleA)(JRIEnv* env, jint op, void* a, jint b, JRIValue* c);
+ jint (*GetFieldID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
+ void* (*GetField)(JRIEnv* env, jint op, void* a, jint b);
+ jbool (*GetFieldBoolean)(JRIEnv* env, jint op, void* a, jint b);
+ jbyte (*GetFieldByte)(JRIEnv* env, jint op, void* a, jint b);
+ jchar (*GetFieldChar)(JRIEnv* env, jint op, void* a, jint b);
+ jshort (*GetFieldShort)(JRIEnv* env, jint op, void* a, jint b);
+ jint (*GetFieldInt)(JRIEnv* env, jint op, void* a, jint b);
+ jlong (*GetFieldLong)(JRIEnv* env, jint op, void* a, jint b);
+ jfloat (*GetFieldFloat)(JRIEnv* env, jint op, void* a, jint b);
+ jdouble (*GetFieldDouble)(JRIEnv* env, jint op, void* a, jint b);
+ void (*SetField)(JRIEnv* env, jint op, void* a, jint b, void* c);
+ void (*SetFieldBoolean)(JRIEnv* env, jint op, void* a, jint b, jbool c);
+ void (*SetFieldByte)(JRIEnv* env, jint op, void* a, jint b, jbyte c);
+ void (*SetFieldChar)(JRIEnv* env, jint op, void* a, jint b, jchar c);
+ void (*SetFieldShort)(JRIEnv* env, jint op, void* a, jint b, jshort c);
+ void (*SetFieldInt)(JRIEnv* env, jint op, void* a, jint b, jint c);
+ void (*SetFieldLong)(JRIEnv* env, jint op, void* a, jint b, jlong c);
+ void (*SetFieldFloat)(JRIEnv* env, jint op, void* a, jint b, jfloat c);
+ void (*SetFieldDouble)(JRIEnv* env, jint op, void* a, jint b, jdouble c);
+ jbool (*IsSubclassOf)(JRIEnv* env, jint op, struct java_lang_Class* a, struct java_lang_Class* b);
+ jint (*GetStaticMethodID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
+ void* (*CallStaticMethod)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ void* (*CallStaticMethodV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ void* (*CallStaticMethodA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jbool (*CallStaticMethodBoolean)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jbool (*CallStaticMethodBooleanV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jbool (*CallStaticMethodBooleanA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jbyte (*CallStaticMethodByte)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jbyte (*CallStaticMethodByteV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jbyte (*CallStaticMethodByteA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jchar (*CallStaticMethodChar)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jchar (*CallStaticMethodCharV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jchar (*CallStaticMethodCharA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jshort (*CallStaticMethodShort)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jshort (*CallStaticMethodShortV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jshort (*CallStaticMethodShortA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jint (*CallStaticMethodInt)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jint (*CallStaticMethodIntV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jint (*CallStaticMethodIntA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jlong (*CallStaticMethodLong)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jlong (*CallStaticMethodLongV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jlong (*CallStaticMethodLongA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jfloat (*CallStaticMethodFloat)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jfloat (*CallStaticMethodFloatV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jfloat (*CallStaticMethodFloatA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jdouble (*CallStaticMethodDouble)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, ...);
+ jdouble (*CallStaticMethodDoubleV)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, va_list c);
+ jdouble (*CallStaticMethodDoubleA)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, JRIValue* c);
+ jint (*GetStaticFieldID)(JRIEnv* env, jint op, struct java_lang_Class* a, const char* b, const char* c);
+ void* (*GetStaticField)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jbool (*GetStaticFieldBoolean)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jbyte (*GetStaticFieldByte)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jchar (*GetStaticFieldChar)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jshort (*GetStaticFieldShort)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jint (*GetStaticFieldInt)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jlong (*GetStaticFieldLong)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jfloat (*GetStaticFieldFloat)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ jdouble (*GetStaticFieldDouble)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b);
+ void (*SetStaticField)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, void* c);
+ void (*SetStaticFieldBoolean)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jbool c);
+ void (*SetStaticFieldByte)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jbyte c);
+ void (*SetStaticFieldChar)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jchar c);
+ void (*SetStaticFieldShort)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jshort c);
+ void (*SetStaticFieldInt)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jint c);
+ void (*SetStaticFieldLong)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jlong c);
+ void (*SetStaticFieldFloat)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jfloat c);
+ void (*SetStaticFieldDouble)(JRIEnv* env, jint op, struct java_lang_Class* a, jint b, jdouble c);
+ struct java_lang_String* (*NewString)(JRIEnv* env, jint op, const jchar* a, jint b);
+ jint (*GetStringLength)(JRIEnv* env, jint op, struct java_lang_String* a);
+ const jchar* (*GetStringChars)(JRIEnv* env, jint op, struct java_lang_String* a);
+ struct java_lang_String* (*NewStringUTF)(JRIEnv* env, jint op, const jbyte* a, jint b);
+ jint (*GetStringUTFLength)(JRIEnv* env, jint op, struct java_lang_String* a);
+ const jbyte* (*GetStringUTFChars)(JRIEnv* env, jint op, struct java_lang_String* a);
+ void* (*NewScalarArray)(JRIEnv* env, jint op, jint a, const char* b, const jbyte* c);
+ jint (*GetScalarArrayLength)(JRIEnv* env, jint op, void* a);
+ jbyte* (*GetScalarArrayElements)(JRIEnv* env, jint op, void* a);
+ void* (*NewObjectArray)(JRIEnv* env, jint op, jint a, struct java_lang_Class* b, void* c);
+ jint (*GetObjectArrayLength)(JRIEnv* env, jint op, void* a);
+ void* (*GetObjectArrayElement)(JRIEnv* env, jint op, void* a, jint b);
+ void (*SetObjectArrayElement)(JRIEnv* env, jint op, void* a, jint b, void* c);
+ void (*RegisterNatives)(JRIEnv* env, jint op, struct java_lang_Class* a, char** b, void** c);
+ void (*UnregisterNatives)(JRIEnv* env, jint op, struct java_lang_Class* a);
+ struct java_lang_Class* (*DefineClass)(JRIEnv* env, jint op, struct java_lang_ClassLoader* a, jbyte* b, jsize bLen);
+ struct java_lang_String* (*NewStringPlatform)(JRIEnv* env, jint op, const jbyte* a, jint b, const jbyte* c, jint d);
+ const jbyte* (*GetStringPlatformChars)(JRIEnv* env, jint op, struct java_lang_String* a, const jbyte* b, jint c);
};
/*
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h
index 393299f386f5..0bc2e902a604 100644
--- a/np_sdk/mozsrc/jri_md.h
+++ b/np_sdk/mozsrc/jri_md.h
@@ -14,7 +14,7 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
@@ -38,7 +38,7 @@
/*******************************************************************************
* Java Runtime Interface - Machine Dependent Types
******************************************************************************/
-
+
#ifndef JRI_MD_H
#define JRI_MD_H
@@ -50,19 +50,19 @@ extern "C" {
/*******************************************************************************
* WHAT'S UP WITH THIS FILE?
- *
+ *
* This is where we define the mystical JRI_PUBLIC_API macro that works on all
- * platforms. If you're running with Visual C++, Symantec C, or Borland's
+ * platforms. If you're running with Visual C++, Symantec C, or Borland's
* development environment on the PC, you're all set. Or if you're on the Mac
* with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't
* matter.
*
* On UNIX though you probably care about a couple of other symbols though:
- * IS_LITTLE_ENDIAN must be defined for little-endian systems
- * HAVE_LONG_LONG must be defined on systems that have 'long long' integers
- * HAVE_ALIGNED_LONGLONGS must be defined if long-longs must be 8 byte aligned
- * HAVE_ALIGNED_DOUBLES must be defined if doubles must be 8 byte aligned
- * IS_64 must be defined on 64-bit machines (like Dec Alpha)
+ * IS_LITTLE_ENDIAN must be defined for little-endian systems
+ * HAVE_LONG_LONG must be defined on systems that have 'long long' integers
+ * HAVE_ALIGNED_LONGLONGS must be defined if long-longs must be 8 byte aligned
+ * HAVE_ALIGNED_DOUBLES must be defined if doubles must be 8 byte aligned
+ * IS_64 must be defined on 64-bit machines (like Dec Alpha)
******************************************************************************/
/* DLL Entry modifiers... */
@@ -70,100 +70,100 @@ extern "C" {
/* PC */
#if defined(XP_OS2)
# ifdef XP_OS2_VACPP
-# define JRI_PUBLIC_API(ResultType) ResultType _Optlink
-# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_API(ResultType) ResultType _Optlink
+# define JRI_PUBLIC_VAR(VarType) VarType
# define JRI_CALLBACK
# else
-# define JRI_PUBLIC_API(ResultType) ResultType
-# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_API(ResultType) ResultType
+# define JRI_PUBLIC_VAR(VarType) VarType
# define JRI_CALLBACK
# endif
#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
-# include <windows.h>
-# if defined(_MSC_VER) || defined(__MINGW32__)
-# if defined(WIN32) || defined(_WIN32)
-# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) _declspec(dllexport) VarType
-# define JRI_PUBLIC_VAR_IMP(VarType) _declspec(dllimport) VarType
-# define JRI_NATIVE_STUB(ResultType) _declspec(dllexport) ResultType
-# define JRI_CALLBACK
-# else /* !_WIN32 */
-# if defined(_WINDLL)
-# define JRI_PUBLIC_API(ResultType) ResultType __cdecl __export __loadds
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_VAR(VarType)
-# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_VAR(VarType)
-# define JRI_NATIVE_STUB(ResultType) ResultType __cdecl __loadds
-# define JRI_CALLBACK __loadds
-# else /* !WINDLL */
-# define JRI_PUBLIC_API(ResultType) ResultType __cdecl __export
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_VAR(VarType)
-# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_VAR(VarType)
-# define JRI_NATIVE_STUB(ResultType) ResultType __cdecl __export
-# define JRI_CALLBACK __export
+# include <windows.h>
+# if defined(_MSC_VER) || defined(__MINGW32__)
+# if defined(WIN32) || defined(_WIN32)
+# define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType
+# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_VAR_EXP(VarType) _declspec(dllexport) VarType
+# define JRI_PUBLIC_VAR_IMP(VarType) _declspec(dllimport) VarType
+# define JRI_NATIVE_STUB(ResultType) _declspec(dllexport) ResultType
+# define JRI_CALLBACK
+# else /* !_WIN32 */
+# if defined(_WINDLL)
+# define JRI_PUBLIC_API(ResultType) ResultType __cdecl __export __loadds
+# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_VAR(VarType)
+# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_VAR(VarType)
+# define JRI_NATIVE_STUB(ResultType) ResultType __cdecl __loadds
+# define JRI_CALLBACK __loadds
+# else /* !WINDLL */
+# define JRI_PUBLIC_API(ResultType) ResultType __cdecl __export
+# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_VAR(VarType)
+# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_VAR(VarType)
+# define JRI_NATIVE_STUB(ResultType) ResultType __cdecl __export
+# define JRI_CALLBACK __export
# endif /* !WINDLL */
-# endif /* !_WIN32 */
-# elif defined(__BORLANDC__)
-# if defined(WIN32) || defined(_WIN32)
-# define JRI_PUBLIC_API(ResultType) __export ResultType
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) __export VarType
-# define JRI_PUBLIC_VAR_IMP(VarType) __import VarType
-# define JRI_NATIVE_STUB(ResultType) __export ResultType
-# define JRI_CALLBACK
-# else /* !_WIN32 */
-# define JRI_PUBLIC_API(ResultType) ResultType _cdecl _export _loadds
-# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) __cdecl __export VarType
-# define JRI_PUBLIC_VAR_IMP(VarType) __cdecl __import VarType
-# define JRI_NATIVE_STUB(ResultType) ResultType _cdecl _loadds
-# define JRI_CALLBACK _loadds
-# endif
-# else
-# error Unsupported PC development environment.
-# endif
-# ifndef IS_LITTLE_ENDIAN
-# define IS_LITTLE_ENDIAN
-# endif
+# endif /* !_WIN32 */
+# elif defined(__BORLANDC__)
+# if defined(WIN32) || defined(_WIN32)
+# define JRI_PUBLIC_API(ResultType) __export ResultType
+# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_VAR_EXP(VarType) __export VarType
+# define JRI_PUBLIC_VAR_IMP(VarType) __import VarType
+# define JRI_NATIVE_STUB(ResultType) __export ResultType
+# define JRI_CALLBACK
+# else /* !_WIN32 */
+# define JRI_PUBLIC_API(ResultType) ResultType _cdecl _export _loadds
+# define JRI_PUBLIC_VAR(VarType) VarType
+# define JRI_PUBLIC_VAR_EXP(VarType) __cdecl __export VarType
+# define JRI_PUBLIC_VAR_IMP(VarType) __cdecl __import VarType
+# define JRI_NATIVE_STUB(ResultType) ResultType _cdecl _loadds
+# define JRI_CALLBACK _loadds
+# endif
+# else
+# error Unsupported PC development environment.
+# endif
+# ifndef IS_LITTLE_ENDIAN
+# define IS_LITTLE_ENDIAN
+# endif
/* Mac */
#elif defined (macintosh) || Macintosh || THINK_C
-# if defined(__MWERKS__) /* Metrowerks */
-# if !__option(enumsalwaysint)
-# error You need to define 'Enums Always Int' for your project.
-# endif
-# if defined(TARGET_CPU_68K) && !TARGET_RT_MAC_CFM
-# if !__option(fourbyteints)
-# error You need to define 'Struct Alignment: 68k' for your project.
-# endif
-# endif /* !GENERATINGCFM */
-# define JRI_PUBLIC_API(ResultType) __declspec(export) ResultType
-# define JRI_PUBLIC_VAR(VarType) JRI_PUBLIC_API(VarType)
-# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_API(VarType)
-# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_API(VarType)
-# define JRI_NATIVE_STUB(ResultType) JRI_PUBLIC_API(ResultType)
-# elif defined(__SC__) /* Symantec */
-# error What are the Symantec defines? (warren@netscape.com)
-# elif macintosh && applec /* MPW */
-# error Please upgrade to the latest MPW compiler (SC).
-# else
-# error Unsupported Mac development environment.
-# endif
-# define JRI_CALLBACK
+# if defined(__MWERKS__) /* Metrowerks */
+# if !__option(enumsalwaysint)
+# error You need to define 'Enums Always Int' for your project.
+# endif
+# if defined(TARGET_CPU_68K) && !TARGET_RT_MAC_CFM
+# if !__option(fourbyteints)
+# error You need to define 'Struct Alignment: 68k' for your project.
+# endif
+# endif /* !GENERATINGCFM */
+# define JRI_PUBLIC_API(ResultType) __declspec(export) ResultType
+# define JRI_PUBLIC_VAR(VarType) JRI_PUBLIC_API(VarType)
+# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_API(VarType)
+# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_API(VarType)
+# define JRI_NATIVE_STUB(ResultType) JRI_PUBLIC_API(ResultType)
+# elif defined(__SC__) /* Symantec */
+# error What are the Symantec defines? (warren@netscape.com)
+# elif macintosh && applec /* MPW */
+# error Please upgrade to the latest MPW compiler (SC).
+# else
+# error Unsupported Mac development environment.
+# endif
+# define JRI_CALLBACK
/* Unix or else */
#else
-# define JRI_PUBLIC_API(ResultType) ResultType
+# define JRI_PUBLIC_API(ResultType) ResultType
# define JRI_PUBLIC_VAR(VarType) VarType
-# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_VAR(VarType)
-# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_VAR(VarType)
-# define JRI_NATIVE_STUB(ResultType) ResultType
-# define JRI_CALLBACK
+# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_VAR(VarType)
+# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_VAR(VarType)
+# define JRI_NATIVE_STUB(ResultType) ResultType
+# define JRI_CALLBACK
#endif
-#ifndef FAR /* for non-Win16 */
+#ifndef FAR /* for non-Win16 */
#define FAR
#endif
@@ -178,22 +178,22 @@ typedef class _jobject *jref;
typedef struct _jobject *jref;
#endif
-typedef unsigned char jbool;
-typedef char jbyte;
-typedef short jchar;
-typedef short jshort;
+typedef unsigned char jbool;
+typedef char jbyte;
+typedef short jchar;
+typedef short jshort;
#ifdef IS_64 /* XXX ok for alpha, but not right on all 64-bit architectures */
-typedef unsigned int juint;
-typedef int jint;
+typedef unsigned int juint;
+typedef int jint;
#else
-typedef unsigned long juint;
-typedef long jint;
+typedef unsigned long juint;
+typedef long jint;
#endif
-typedef float jfloat;
-typedef double jdouble;
+typedef float jfloat;
+typedef double jdouble;
-typedef juint jsize;
+typedef juint jsize;
/*******************************************************************************
@@ -203,8 +203,8 @@ typedef juint jsize;
/*
** Bit masking macros. (n must be <= 31 to be portable)
*/
-#define JRI_BIT(n) ((juint)1 << (n))
-#define JRI_BITMASK(n) (JRI_BIT(n) - 1)
+#define JRI_BIT(n) ((juint)1 << (n))
+#define JRI_BITMASK(n) (JRI_BIT(n) - 1)
#ifdef HAVE_LONG_LONG
@@ -235,40 +235,40 @@ typedef unsigned long long julong;
#endif
-#define jlong_IS_ZERO(a) ((a) == 0)
-#define jlong_EQ(a, b) ((a) == (b))
-#define jlong_NE(a, b) ((a) != (b))
-#define jlong_GE_ZERO(a) ((a) >= 0)
-#define jlong_CMP(a, op, b) ((a) op (b))
-
-#define jlong_AND(r, a, b) ((r) = (a) & (b))
-#define jlong_OR(r, a, b) ((r) = (a) | (b))
-#define jlong_XOR(r, a, b) ((r) = (a) ^ (b))
-#define jlong_OR2(r, a) ((r) = (r) | (a))
-#define jlong_NOT(r, a) ((r) = ~(a))
-
-#define jlong_NEG(r, a) ((r) = -(a))
-#define jlong_ADD(r, a, b) ((r) = (a) + (b))
-#define jlong_SUB(r, a, b) ((r) = (a) - (b))
-
-#define jlong_MUL(r, a, b) ((r) = (a) * (b))
-#define jlong_DIV(r, a, b) ((r) = (a) / (b))
-#define jlong_MOD(r, a, b) ((r) = (a) % (b))
-
-#define jlong_SHL(r, a, b) ((r) = (a) << (b))
-#define jlong_SHR(r, a, b) ((r) = (a) >> (b))
-#define jlong_USHR(r, a, b) ((r) = (julong)(a) >> (b))
-#define jlong_ISHL(r, a, b) ((r) = ((jlong)(a)) << (b))
-
-#define jlong_L2I(i, l) ((i) = (int)(l))
-#define jlong_L2UI(ui, l) ((ui) =(unsigned int)(l))
-#define jlong_L2F(f, l) ((f) = (l))
-#define jlong_L2D(d, l) ((d) = (l))
-
-#define jlong_I2L(l, i) ((l) = (i))
-#define jlong_UI2L(l, ui) ((l) = (ui))
-#define jlong_F2L(l, f) ((l) = (f))
-#define jlong_D2L(l, d) ((l) = (d))
+#define jlong_IS_ZERO(a) ((a) == 0)
+#define jlong_EQ(a, b) ((a) == (b))
+#define jlong_NE(a, b) ((a) != (b))
+#define jlong_GE_ZERO(a) ((a) >= 0)
+#define jlong_CMP(a, op, b) ((a) op (b))
+
+#define jlong_AND(r, a, b) ((r) = (a) & (b))
+#define jlong_OR(r, a, b) ((r) = (a) | (b))
+#define jlong_XOR(r, a, b) ((r) = (a) ^ (b))
+#define jlong_OR2(r, a) ((r) = (r) | (a))
+#define jlong_NOT(r, a) ((r) = ~(a))
+
+#define jlong_NEG(r, a) ((r) = -(a))
+#define jlong_ADD(r, a, b) ((r) = (a) + (b))
+#define jlong_SUB(r, a, b) ((r) = (a) - (b))
+
+#define jlong_MUL(r, a, b) ((r) = (a) * (b))
+#define jlong_DIV(r, a, b) ((r) = (a) / (b))
+#define jlong_MOD(r, a, b) ((r) = (a) % (b))
+
+#define jlong_SHL(r, a, b) ((r) = (a) << (b))
+#define jlong_SHR(r, a, b) ((r) = (a) >> (b))
+#define jlong_USHR(r, a, b) ((r) = (julong)(a) >> (b))
+#define jlong_ISHL(r, a, b) ((r) = ((jlong)(a)) << (b))
+
+#define jlong_L2I(i, l) ((i) = (int)(l))
+#define jlong_L2UI(ui, l) ((ui) =(unsigned int)(l))
+#define jlong_L2F(f, l) ((f) = (l))
+#define jlong_L2D(d, l) ((d) = (l))
+
+#define jlong_I2L(l, i) ((l) = (i))
+#define jlong_UI2L(l, ui) ((l) = (ui))
+#define jlong_F2L(l, f) ((l) = (f))
+#define jlong_D2L(l, d) ((l) = (d))
#define jlong_UDIVMOD(qp, rp, a, b) \
(*(qp) = ((julong)(a) / (b)), \
@@ -283,35 +283,35 @@ typedef struct {
juint hi, lo;
#endif
} jlong;
-typedef jlong julong;
+typedef jlong julong;
extern jlong jlong_MAXINT, jlong_MININT, jlong_ZERO;
-#define jlong_IS_ZERO(a) (((a).hi == 0) && ((a).lo == 0))
-#define jlong_EQ(a, b) (((a).hi == (b).hi) && ((a).lo == (b).lo))
-#define jlong_NE(a, b) (((a).hi != (b).hi) || ((a).lo != (b).lo))
-#define jlong_GE_ZERO(a) (((a).hi >> 31) == 0)
+#define jlong_IS_ZERO(a) (((a).hi == 0) && ((a).lo == 0))
+#define jlong_EQ(a, b) (((a).hi == (b).hi) && ((a).lo == (b).lo))
+#define jlong_NE(a, b) (((a).hi != (b).hi) || ((a).lo != (b).lo))
+#define jlong_GE_ZERO(a) (((a).hi >> 31) == 0)
/*
* NB: jlong_CMP and jlong_UCMP work only for strict relationals (<, >).
*/
-#define jlong_CMP(a, op, b) (((int32)(a).hi op (int32)(b).hi) || \
+#define jlong_CMP(a, op, b) (((int32)(a).hi op (int32)(b).hi) || \
(((a).hi == (b).hi) && ((a).lo op (b).lo)))
-#define jlong_UCMP(a, op, b) (((a).hi op (b).hi) || \
+#define jlong_UCMP(a, op, b) (((a).hi op (b).hi) || \
(((a).hi == (b).hi) && ((a).lo op (b).lo)))
-#define jlong_AND(r, a, b) ((r).lo = (a).lo & (b).lo, \
+#define jlong_AND(r, a, b) ((r).lo = (a).lo & (b).lo, \
(r).hi = (a).hi & (b).hi)
-#define jlong_OR(r, a, b) ((r).lo = (a).lo | (b).lo, \
+#define jlong_OR(r, a, b) ((r).lo = (a).lo | (b).lo, \
(r).hi = (a).hi | (b).hi)
-#define jlong_XOR(r, a, b) ((r).lo = (a).lo ^ (b).lo, \
+#define jlong_XOR(r, a, b) ((r).lo = (a).lo ^ (b).lo, \
(r).hi = (a).hi ^ (b).hi)
-#define jlong_OR2(r, a) ((r).lo = (r).lo | (a).lo, \
+#define jlong_OR2(r, a) ((r).lo = (r).lo | (a).lo, \
(r).hi = (r).hi | (a).hi)
-#define jlong_NOT(r, a) ((r).lo = ~(a).lo, \
+#define jlong_NOT(r, a) ((r).lo = ~(a).lo, \
(r).hi = ~(a).hi)
-#define jlong_NEG(r, a) ((r).lo = -(int32)(a).lo, \
+#define jlong_NEG(r, a) ((r).lo = -(int32)(a).lo, \
(r).hi = -(int32)(a).hi - ((r).lo != 0))
#define jlong_ADD(r, a, b) { \
jlong _a, _b; \
@@ -340,8 +340,8 @@ extern jlong jlong_MAXINT, jlong_MININT, jlong_ZERO;
}
/* XXX _jlong_lo16(a) = ((a) << 16 >> 16) is better on some archs (not on mips) */
-#define _jlong_lo16(a) ((a) & JRI_BITMASK(16))
-#define _jlong_hi16(a) ((a) >> 16)
+#define _jlong_lo16(a) ((a) & JRI_BITMASK(16))
+#define _jlong_hi16(a) ((a) >> 16)
/*
* Multiply 32-bit operands a and b to get 64-bit result r.
@@ -367,7 +367,7 @@ extern jlong jlong_MAXINT, jlong_MININT, jlong_ZERO;
* to the 64-bit unsigned quotient, and *rp to the 64-bit unsigned remainder.
* Minimize effort if one of qp and rp is null.
*/
-#define jlong_UDIVMOD(qp, rp, a, b) jlong_udivmod(qp, rp, a, b)
+#define jlong_UDIVMOD(qp, rp, a, b) jlong_udivmod(qp, rp, a, b)
extern JRI_PUBLIC_API(void)
jlong_udivmod(julong *qp, julong *rp, julong a, julong b);
@@ -479,9 +479,9 @@ jlong_udivmod(julong *qp, julong *rp, julong a, julong b);
} \
}
-#define jlong_L2I(i, l) ((i) = (l).lo)
-#define jlong_L2UI(ui, l) ((ui) = (l).lo)
-#define jlong_L2F(f, l) { double _d; jlong_L2D(_d, l); (f) = (float) _d; }
+#define jlong_L2I(i, l) ((i) = (l).lo)
+#define jlong_L2UI(ui, l) ((ui) = (l).lo)
+#define jlong_L2F(f, l) { double _d; jlong_L2D(_d, l); (f) = (float) _d; }
#define jlong_L2D(d, l) { \
int32 _negative; \
@@ -498,9 +498,9 @@ jlong_udivmod(julong *qp, julong *rp, julong a, julong b);
(d) = -(d); \
}
-#define jlong_I2L(l, i) ((l).hi = (i) >> 31, (l).lo = (i))
-#define jlong_UI2L(l, ui) ((l).hi = 0, (l).lo = (ui))
-#define jlong_F2L(l, f) { double _d = (double) f; jlong_D2L(l, _d); }
+#define jlong_I2L(l, i) ((l).hi = (i) >> 31, (l).lo = (i))
+#define jlong_UI2L(l, ui) ((l).hi = 0, (l).lo = (ui))
+#define jlong_F2L(l, f) { double _d = (double) f; jlong_D2L(l, _d); }
#define jlong_D2L(l, d) { \
int _negative; \
diff --git a/np_sdk/mozsrc/jritypes.h b/np_sdk/mozsrc/jritypes.h
index 03a7a9dcfe41..8735f1078c3f 100644
--- a/np_sdk/mozsrc/jritypes.h
+++ b/np_sdk/mozsrc/jritypes.h
@@ -14,7 +14,7 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
@@ -57,42 +57,42 @@ extern "C" {
struct JRIEnvInterface;
-typedef void* JRIRef;
-typedef void* JRIGlobalRef;
+typedef void* JRIRef;
+typedef void* JRIGlobalRef;
-typedef jint JRIFieldID;
-typedef jint JRIMethodID;
+typedef jint JRIFieldID;
+typedef jint JRIMethodID;
/* synonyms: */
-typedef JRIGlobalRef jglobal;
+typedef JRIGlobalRef jglobal;
typedef union JRIValue {
- jbool z;
- jbyte b;
- jchar c;
- jshort s;
- jint i;
- jlong l;
- jfloat f;
- jdouble d;
- jref r;
+ jbool z;
+ jbyte b;
+ jchar c;
+ jshort s;
+ jint i;
+ jlong l;
+ jfloat f;
+ jdouble d;
+ jref r;
} JRIValue;
typedef enum JRIBoolean {
- JRIFalse = 0,
- JRITrue = 1
+ JRIFalse = 0,
+ JRITrue = 1
} JRIBoolean;
typedef enum JRIConstant {
- JRIUninitialized = -1
+ JRIUninitialized = -1
} JRIConstant;
/* convenience types (these must be distinct struct types for c++ overloading): */
-typedef struct jstringArrayStruct* jstringArray;
-typedef struct jarrayArrayStruct* jarrayArray;
+typedef struct jstringArrayStruct* jstringArray;
+typedef struct jarrayArrayStruct* jarrayArray;
-#define JRIConstructorMethodName "<init>"
+#define JRIConstructorMethodName "<init>"
/*******************************************************************************
* Signature Construction Macros
@@ -103,29 +103,29 @@ typedef struct jarrayArrayStruct* jarrayArray;
** are a little easier to remember than the single character they correspond to.
** For example, to specify the signature of the method:
**
-** public int read(byte b[], int off, int len);
+** public int read(byte b[], int off, int len);
**
** you could write something like this in C:
**
-** char* readSig = JRISigMethod(JRISigArray(JRISigByte)
-** JRISigInt
-** JRISigInt) JRISigInt;
+** char* readSig = JRISigMethod(JRISigArray(JRISigByte)
+** JRISigInt
+** JRISigInt) JRISigInt;
**
** Of course, don't put commas between the types.
*/
-#define JRISigArray(T) "[" T
-#define JRISigByte "B"
-#define JRISigChar "C"
-#define JRISigClass(name) "L" name ";"
-#define JRISigFloat "F"
-#define JRISigDouble "D"
-#define JRISigMethod(args) "(" args ")"
-#define JRISigNoArgs ""
-#define JRISigInt "I"
-#define JRISigLong "J"
-#define JRISigShort "S"
-#define JRISigVoid "V"
-#define JRISigBoolean "Z"
+#define JRISigArray(T) "[" T
+#define JRISigByte "B"
+#define JRISigChar "C"
+#define JRISigClass(name) "L" name ";"
+#define JRISigFloat "F"
+#define JRISigDouble "D"
+#define JRISigMethod(args) "(" args ")"
+#define JRISigNoArgs ""
+#define JRISigInt "I"
+#define JRISigLong "J"
+#define JRISigShort "S"
+#define JRISigVoid "V"
+#define JRISigBoolean "Z"
/*******************************************************************************
* Environments
@@ -146,53 +146,53 @@ JRI_GetCurrentEnv(void);
** passing them to a native method.
*/
-#define JRI_NewByteArray(env, length, initialValues) \
+#define JRI_NewByteArray(env, length, initialValues) \
JRI_NewScalarArray(env, length, JRISigByte, (jbyte*)(initialValues))
-#define JRI_GetByteArrayLength(env, array) \
+#define JRI_GetByteArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetByteArrayElements(env, array) \
+#define JRI_GetByteArrayElements(env, array) \
JRI_GetScalarArrayElements(env, array)
-#define JRI_NewCharArray(env, length, initialValues) \
+#define JRI_NewCharArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jchar)), JRISigChar, (jbyte*)(initialValues))
-#define JRI_GetCharArrayLength(env, array) \
+#define JRI_GetCharArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetCharArrayElements(env, array) \
+#define JRI_GetCharArrayElements(env, array) \
((jchar*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewShortArray(env, length, initialValues) \
+#define JRI_NewShortArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jshort)), JRISigShort, (jbyte*)(initialValues))
-#define JRI_GetShortArrayLength(env, array) \
+#define JRI_GetShortArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetShortArrayElements(env, array) \
+#define JRI_GetShortArrayElements(env, array) \
((jshort*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewIntArray(env, length, initialValues) \
+#define JRI_NewIntArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jint)), JRISigInt, (jbyte*)(initialValues))
-#define JRI_GetIntArrayLength(env, array) \
+#define JRI_GetIntArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetIntArrayElements(env, array) \
+#define JRI_GetIntArrayElements(env, array) \
((jint*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewLongArray(env, length, initialValues) \
+#define JRI_NewLongArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jlong)), JRISigLong, (jbyte*)(initialValues))
-#define JRI_GetLongArrayLength(env, array) \
+#define JRI_GetLongArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetLongArrayElements(env, array) \
+#define JRI_GetLongArrayElements(env, array) \
((jlong*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewFloatArray(env, length, initialValues) \
+#define JRI_NewFloatArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jfloat)), JRISigFloat, (jbyte*)(initialValues))
-#define JRI_GetFloatArrayLength(env, array) \
+#define JRI_GetFloatArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetFloatArrayElements(env, array) \
+#define JRI_GetFloatArrayElements(env, array) \
((jfloat*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewDoubleArray(env, length, initialValues) \
+#define JRI_NewDoubleArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jdouble)), JRISigDouble, (jbyte*)(initialValues))
-#define JRI_GetDoubleArrayLength(env, array) \
+#define JRI_GetDoubleArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetDoubleArrayElements(env, array) \
+#define JRI_GetDoubleArrayElements(env, array) \
((jdouble*)JRI_GetScalarArrayElements(env, array))
/******************************************************************************/
@@ -212,7 +212,7 @@ typedef union JRI_JDK_stack_item {
unsigned char *addr;
#ifdef IS_64
double d;
- long l; /* == 64bits! */
+ long l; /* == 64bits! */
#endif
} JRI_JDK_stack_item;
diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h
index ef2b21a6223f..af64042804cc 100644
--- a/np_sdk/mozsrc/npapi.h
+++ b/np_sdk/mozsrc/npapi.h
@@ -14,7 +14,7 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -52,30 +52,30 @@
#include "jri.h" /* Java Runtime Interface */
#if defined (__OS2__ ) || defined (OS2)
-# ifndef XP_OS2
-# define XP_OS2 1
-# endif /* XP_OS2 */
+# ifndef XP_OS2
+# define XP_OS2 1
+# endif /* XP_OS2 */
#endif /* __OS2__ */
#ifdef _WINDOWS
-# ifndef XP_WIN
-# define XP_WIN 1
-# endif /* XP_WIN */
+# ifndef XP_WIN
+# define XP_WIN 1
+# endif /* XP_WIN */
#endif /* _WINDOWS */
#ifdef __MWERKS__
-# define _declspec __declspec
-# ifdef macintosh
-# ifndef XP_MAC
-# define XP_MAC 1
-# endif /* XP_MAC */
-# endif /* macintosh */
-# ifdef __INTEL__
-# undef NULL
-# ifndef XP_WIN
-# define XP_WIN 1
-# endif /* __INTEL__ */
-# endif /* XP_PC */
+# define _declspec __declspec
+# ifdef macintosh
+# ifndef XP_MAC
+# define XP_MAC 1
+# endif /* XP_MAC */
+# endif /* macintosh */
+# ifdef __INTEL__
+# undef NULL
+# ifndef XP_WIN
+# define XP_WIN 1
+# endif /* __INTEL__ */
+# endif /* XP_PC */
#endif /* __MWERKS__ */
#ifdef XP_MAC
@@ -188,10 +188,10 @@ typedef long int32;
#define NULL (0L)
#endif
-typedef unsigned char NPBool;
-typedef int16 NPError;
-typedef int16 NPReason;
-typedef char* NPMIMEType;
+typedef unsigned char NPBool;
+typedef int16 NPError;
+typedef int16 NPReason;
+typedef char* NPMIMEType;
@@ -208,8 +208,8 @@ typedef char* NPMIMEType;
*/
typedef struct _NPP
{
- void* pdata; /* plug-in private data */
- void* ndata; /* netscape private data */
+ void* pdata; /* plug-in private data */
+ void* ndata; /* netscape private data */
} NPP_t;
typedef NPP_t* NPP;
@@ -236,8 +236,8 @@ typedef struct _NPByteRange
typedef struct _NPSavedData
{
- int32 len;
- void* buf;
+ int32 len;
+ void* buf;
} NPSavedData;
@@ -249,11 +249,11 @@ typedef struct _NPRect
uint16 right;
} NPRect;
-typedef struct _NPSize
-{
- int32 width;
- int32 height;
-} NPSize;
+typedef struct _NPSize
+{
+ int32 width;
+ int32 height;
+} NPSize;
#ifdef XP_UNIX
/*
@@ -344,11 +344,11 @@ typedef struct _NPWindow
/* OS/2: x - Position of bottom left corner */
/* OS/2: y - relative to visible netscape window */
int32 x; /* Position of top left corner relative */
- int32 y; /* to a netscape page. */
+ int32 y; /* to a netscape page. */
uint32 width; /* Maximum window size */
uint32 height;
NPRect clipRect; /* Clipping rectangle in port coordinates */
- /* Used by MAC only. */
+ /* Used by MAC only. */
#ifdef XP_UNIX
void * ws_info; /* Platform-dependent additonal data */
#endif /* XP_UNIX */
@@ -359,7 +359,7 @@ typedef struct _NPWindow
typedef struct _NPFullPrint
{
NPBool pluginPrinted;/* Set TRUE if plugin handled fullscreen printing */
- NPBool printOne; /* TRUE if plugin should print one copy to default printer */
+ NPBool printOne; /* TRUE if plugin should print one copy to default printer */
void* platformPrint; /* Platform-specific printing info */
} NPFullPrint;
@@ -380,7 +380,7 @@ typedef struct _NPPrint
} NPPrint;
#ifdef XP_MAC
-typedef EventRecord NPEvent;
+typedef EventRecord NPEvent;
#elif defined(XP_WIN)
typedef struct _NPEvent
{
@@ -398,7 +398,7 @@ typedef struct _NPEvent
#elif defined (XP_UNIX) && !defined(NO_X11)
typedef XEvent NPEvent;
#else
-typedef void* NPEvent;
+typedef void* NPEvent;
#endif /* XP_MAC */
#ifdef XP_MAC
@@ -458,7 +458,7 @@ enum NPEventType {
#define NP_ASFILE 3
#define NP_ASFILEONLY 4
-#define NP_MAXREADY (((unsigned)(~0)<<1)>>1)
+#define NP_MAXREADY (((unsigned)(~0)<<1)>>1)
#ifdef XP_MAC
#pragma options align=reset
@@ -466,7 +466,7 @@ enum NPEventType {
/*----------------------------------------------------------------------*/
-/* Error and Reason Code definitions */
+/* Error and Reason Code definitions */
/*----------------------------------------------------------------------*/
/*
@@ -585,7 +585,7 @@ NPError NP_LOADDS NPN_NewStream(NPP instance, NPMIMEType type,
int32 NP_LOADDS NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer);
NPError NP_LOADDS NPN_DestroyStream(NPP instance, NPStream* stream, NPReason reason);
void NP_LOADDS NPN_Status(NPP instance, const char* message);
-const char* NP_LOADDS NPN_UserAgent(NPP instance);
+const char* NP_LOADDS NPN_UserAgent(NPP instance);
void* NP_LOADDS NPN_MemAlloc(uint32 size);
void NP_LOADDS NPN_MemFree(void* ptr);
uint32 NP_LOADDS NPN_MemFlush(uint32 size);
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index 55d0fa5316d2..cb92d8562a3c 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -244,7 +244,7 @@ NPN_ForceRedraw(NPP instance)
* Wrapper functions : Netscape Navigator -> plugin
*
* These functions let the plugin developer just create the APIs
- * as documented and defined in npapi.h, without needing to
+ * as documented and defined in npapi.h, without needing to
* install those functions in the function table or worry about
* setting up globals for 68K plugins.
*
@@ -257,7 +257,7 @@ Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
NPError ret;
PLUGINDEBUGSTR("New");
ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
- return ret;
+ return ret;
}
NPError
@@ -325,7 +325,7 @@ Private_DestroyStream(NPP instance, NPStream* stream, NPError reason)
void
Private_URLNotify(NPP instance, const char* url,
NPReason reason, void* notifyData)
-
+
{
PLUGINDEBUGSTR("URLNotify");
NPP_URLNotify(instance, url, reason, notifyData);
@@ -353,7 +353,7 @@ Private_GetJavaClass(void)
}
#endif
-/***********************************************************************
+/***********************************************************************
*
* These functions are located automagically by netscape.
*
@@ -406,12 +406,12 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
NPError err = NPERR_NO_ERROR;
PLUGINDEBUGSTR("NP_Initialize");
-
+
/* validate input parameters */
if ((nsTable == NULL) || (pluginFuncs == NULL))
err = NPERR_INVALID_FUNCTABLE_ERROR;
-
+
/*
* Check the major version passed in Netscape's function table.
* We won't load if the major version is newer than what we expect.
@@ -426,11 +426,11 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
err = NPERR_INCOMPATIBLE_VERSION_ERROR;
if (nsTable->size < sizeof(NPNetscapeFuncs))
err = NPERR_INVALID_FUNCTABLE_ERROR;
- if (pluginFuncs->size < sizeof(NPPluginFuncs))
+ if (pluginFuncs->size < sizeof(NPPluginFuncs))
err = NPERR_INVALID_FUNCTABLE_ERROR;
}
-
-
+
+
if (err == NPERR_NO_ERROR) {
/*
* Copy all the fields of Netscape function table into our
@@ -485,7 +485,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
err = NPP_Initialize();
}
-
+
return err;
}
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h
index 6d433f1afb00..9cf63e12c571 100644
--- a/np_sdk/mozsrc/npupp.h
+++ b/np_sdk/mozsrc/npupp.h
@@ -14,7 +14,7 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -79,21 +79,21 @@ typedef UniversalProcPtr NPP_InitializeUPP;
enum {
uppNPP_InitializeProcInfo = kThinkCStackBased
- | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPP_InitializeProc(FUNC) \
+#define NewNPP_InitializeProc(FUNC) \
(NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
-#define CallNPP_InitializeProc(FUNC) \
+#define CallNPP_InitializeProc(FUNC) \
(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
-
+
#else
typedef void (* NP_LOADDS NPP_InitializeUPP)(void);
-#define NewNPP_InitializeProc(FUNC) \
+#define NewNPP_InitializeProc(FUNC) \
((NPP_InitializeUPP) (FUNC))
-#define CallNPP_InitializeProc(FUNC) \
+#define CallNPP_InitializeProc(FUNC) \
(*(FUNC))()
#endif
@@ -106,21 +106,21 @@ typedef UniversalProcPtr NPP_ShutdownUPP;
enum {
uppNPP_ShutdownProcInfo = kThinkCStackBased
- | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
+ | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPP_ShutdownProc(FUNC) \
+#define NewNPP_ShutdownProc(FUNC) \
(NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
-#define CallNPP_ShutdownProc(FUNC) \
+#define CallNPP_ShutdownProc(FUNC) \
(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
-
+
#else
typedef void (* NP_LOADDS NPP_ShutdownUPP)(void);
-#define NewNPP_ShutdownProc(FUNC) \
+#define NewNPP_ShutdownProc(FUNC) \
((NPP_ShutdownUPP) (FUNC))
-#define CallNPP_ShutdownProc(FUNC) \
+#define CallNPP_ShutdownProc(FUNC) \
(*(FUNC))()
#endif
@@ -143,17 +143,17 @@ enum {
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_NewProc(FUNC) \
+#define NewNPP_NewProc(FUNC) \
(NPP_NewUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewProcInfo, GetCurrentArchitecture())
#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewProcInfo, \
(ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
#else
-typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
-#define NewNPP_NewProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_NewUPP)(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
+#define NewNPP_NewProc(FUNC) \
((NPP_NewUPP) (FUNC))
-#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
+#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
(*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
#endif
@@ -170,16 +170,16 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPSavedData **)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_DestroyProc(FUNC) \
+#define NewNPP_DestroyProc(FUNC) \
(NPP_DestroyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyProcInfo, GetCurrentArchitecture())
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
+#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyProcInfo, (ARG1), (ARG2))
#else
-typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save);
-#define NewNPP_DestroyProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_DestroyUPP)(NPP instance, NPSavedData** save);
+#define NewNPP_DestroyProc(FUNC) \
((NPP_DestroyUPP) (FUNC))
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
+#define CallNPP_DestroyProc(FUNC, ARG1, ARG2) \
(*(FUNC))((ARG1), (ARG2))
#endif
@@ -196,17 +196,17 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPWindow *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_SetWindowProc(FUNC) \
+#define NewNPP_SetWindowProc(FUNC) \
(NPP_SetWindowUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetWindowProcInfo, GetCurrentArchitecture())
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
+#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetWindowProcInfo, (ARG1), (ARG2))
#else
-typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window);
-#define NewNPP_SetWindowProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_SetWindowUPP)(NPP instance, NPWindow* window);
+#define NewNPP_SetWindowProc(FUNC) \
((NPP_SetWindowUPP) (FUNC))
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
+#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2) \
(*(FUNC))((ARG1), (ARG2))
#endif
@@ -226,14 +226,14 @@ enum {
| STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(uint16 *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_NewStreamProc(FUNC) \
+#define NewNPP_NewStreamProc(FUNC) \
(NPP_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewStreamProcInfo, GetCurrentArchitecture())
-#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
+#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_NewStreamProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
#else
-typedef NPError (* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
-#define NewNPP_NewStreamProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_NewStreamUPP)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
+#define NewNPP_NewStreamProc(FUNC) \
((NPP_NewStreamUPP) (FUNC))
#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
(*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
@@ -252,17 +252,17 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_DestroyStreamProc(FUNC) \
+#define NewNPP_DestroyStreamProc(FUNC) \
(NPP_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, GetCurrentArchitecture())
-#define CallNPP_DestroyStreamProc(FUNC, NPParg, NPStreamPtr, NPReasonArg) \
+#define CallNPP_DestroyStreamProc(FUNC, NPParg, NPStreamPtr, NPReasonArg) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, (NPParg), (NPStreamPtr), (NPReasonArg))
#else
-typedef NPError (* NP_LOADDS NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPP_DestroyStreamProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
+#define NewNPP_DestroyStreamProc(FUNC) \
((NPP_DestroyStreamUPP) (FUNC))
-#define CallNPP_DestroyStreamProc(FUNC, NPParg, NPStreamPtr, NPReasonArg) \
+#define CallNPP_DestroyStreamProc(FUNC, NPParg, NPStreamPtr, NPReasonArg) \
(*(FUNC))((NPParg), (NPStreamPtr), (NPReasonArg))
#endif
@@ -279,17 +279,17 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
| RESULT_SIZE(SIZE_CODE(sizeof(int32)))
};
-#define NewNPP_WriteReadyProc(FUNC) \
+#define NewNPP_WriteReadyProc(FUNC) \
(NPP_WriteReadyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, GetCurrentArchitecture())
-#define CallNPP_WriteReadyProc(FUNC, NPParg, NPStreamPtr) \
+#define CallNPP_WriteReadyProc(FUNC, NPParg, NPStreamPtr) \
(int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, (NPParg), (NPStreamPtr))
#else
typedef int32 (* NP_LOADDS NPP_WriteReadyUPP)(NPP instance, NPStream* stream);
-#define NewNPP_WriteReadyProc(FUNC) \
+#define NewNPP_WriteReadyProc(FUNC) \
((NPP_WriteReadyUPP) (FUNC))
-#define CallNPP_WriteReadyProc(FUNC, NPParg, NPStreamPtr) \
+#define CallNPP_WriteReadyProc(FUNC, NPParg, NPStreamPtr) \
(*(FUNC))((NPParg), (NPStreamPtr))
#endif
@@ -309,17 +309,17 @@ enum {
| STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(void*)))
| RESULT_SIZE(SIZE_CODE(sizeof(int32)))
};
-#define NewNPP_WriteProc(FUNC) \
+#define NewNPP_WriteProc(FUNC) \
(NPP_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteProcInfo, GetCurrentArchitecture())
-#define CallNPP_WriteProc(FUNC, NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr) \
+#define CallNPP_WriteProc(FUNC, NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr) \
(int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_WriteProcInfo, (NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
#else
typedef int32 (* NP_LOADDS NPP_WriteUPP)(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
-#define NewNPP_WriteProc(FUNC) \
+#define NewNPP_WriteProc(FUNC) \
((NPP_WriteUPP) (FUNC))
-#define CallNPP_WriteProc(FUNC, NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr) \
+#define CallNPP_WriteProc(FUNC, NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr) \
(*(FUNC))((NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
#endif
@@ -337,17 +337,17 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char *)))
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPP_StreamAsFileProc(FUNC) \
+#define NewNPP_StreamAsFileProc(FUNC) \
(NPP_StreamAsFileUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, GetCurrentArchitecture())
-#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3) \
(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, (ARG1), (ARG2), (ARG3))
#else
typedef void (* NP_LOADDS NPP_StreamAsFileUPP)(NPP instance, NPStream* stream, const char* fname);
-#define NewNPP_StreamAsFileProc(FUNC) \
+#define NewNPP_StreamAsFileProc(FUNC) \
((NPP_StreamAsFileUPP) (FUNC))
-#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPP_StreamAsFileProc(FUNC, ARG1, ARG2, ARG3) \
(*(FUNC))((ARG1), (ARG2), (ARG3))
#endif
@@ -363,17 +363,17 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPrint *)))
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPP_PrintProc(FUNC) \
+#define NewNPP_PrintProc(FUNC) \
(NPP_PrintUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_PrintProcInfo, GetCurrentArchitecture())
-#define CallNPP_PrintProc(FUNC, NPParg, voidPtr) \
+#define CallNPP_PrintProc(FUNC, NPParg, voidPtr) \
(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_PrintProcInfo, (NPParg), (voidPtr))
#else
typedef void (* NP_LOADDS NPP_PrintUPP)(NPP instance, NPPrint* platformPrint);
-#define NewNPP_PrintProc(FUNC) \
+#define NewNPP_PrintProc(FUNC) \
((NPP_PrintUPP) (FUNC))
-#define CallNPP_PrintProc(FUNC, NPParg, NPPrintArg) \
+#define CallNPP_PrintProc(FUNC, NPParg, NPPrintArg) \
(*(FUNC))((NPParg), (NPPrintArg))
#endif
@@ -390,17 +390,17 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(void *)))
| RESULT_SIZE(SIZE_CODE(sizeof(int16)))
};
-#define NewNPP_HandleEventProc(FUNC) \
+#define NewNPP_HandleEventProc(FUNC) \
(NPP_HandleEventUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_HandleEventProcInfo, GetCurrentArchitecture())
-#define CallNPP_HandleEventProc(FUNC, NPParg, voidPtr) \
+#define CallNPP_HandleEventProc(FUNC, NPParg, voidPtr) \
(int16)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_HandleEventProcInfo, (NPParg), (voidPtr))
#else
typedef int16 (* NP_LOADDS NPP_HandleEventUPP)(NPP instance, void* event);
-#define NewNPP_HandleEventProc(FUNC) \
+#define NewNPP_HandleEventProc(FUNC) \
((NPP_HandleEventUPP) (FUNC))
-#define CallNPP_HandleEventProc(FUNC, NPParg, voidPtr) \
+#define CallNPP_HandleEventProc(FUNC, NPParg, voidPtr) \
(*(FUNC))((NPParg), (voidPtr))
#endif
@@ -419,17 +419,17 @@ enum {
| STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
| RESULT_SIZE(SIZE_CODE(SIZE_CODE(0)))
};
-#define NewNPP_URLNotifyProc(FUNC) \
+#define NewNPP_URLNotifyProc(FUNC) \
(NPP_URLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, GetCurrentArchitecture())
-#define CallNPP_URLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
+#define CallNPP_URLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4))
#else
typedef void (* NP_LOADDS NPP_URLNotifyUPP)(NPP instance, const char* url, NPReason reason, void* notifyData);
-#define NewNPP_URLNotifyProc(FUNC) \
+#define NewNPP_URLNotifyProc(FUNC) \
((NPP_URLNotifyUPP) (FUNC))
-#define CallNPP_URLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
+#define CallNPP_URLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
(*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
#endif
@@ -447,16 +447,16 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_GetValueProc(FUNC) \
+#define NewNPP_GetValueProc(FUNC) \
(NPP_GetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_GetValueProcInfo, GetCurrentArchitecture())
#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_GetValueProcInfo, (ARG1), (ARG2), (ARG3))
#else
-typedef NPError (* NP_LOADDS NPP_GetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-#define NewNPP_GetValueProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_GetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
+#define NewNPP_GetValueProc(FUNC) \
((NPP_GetValueUPP) (FUNC))
-#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
(*(FUNC))((ARG1), (ARG2), (ARG3))
#endif
@@ -473,16 +473,16 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_SetValueProc(FUNC) \
+#define NewNPP_SetValueProc(FUNC) \
(NPP_SetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetValueProcInfo, GetCurrentArchitecture())
#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_SetValueProcInfo, (ARG1), (ARG2), (ARG3))
#else
-typedef NPError (* NP_LOADDS NPP_SetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-#define NewNPP_SetValueProc(FUNC) \
+typedef NPError (* NP_LOADDS NPP_SetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
+#define NewNPP_SetValueProc(FUNC) \
((NPP_SetValueUPP) (FUNC))
-#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
(*(FUNC))((ARG1), (ARG2), (ARG3))
#endif
@@ -506,16 +506,16 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_GetValueProc(FUNC) \
+#define NewNPN_GetValueProc(FUNC) \
(NPN_GetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetValueProcInfo, GetCurrentArchitecture())
#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetValueProcInfo, (ARG1), (ARG2), (ARG3))
#else
-typedef NPError (* NP_LOADDS NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-#define NewNPN_GetValueProc(FUNC) \
+typedef NPError (* NP_LOADDS NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
+#define NewNPN_GetValueProc(FUNC) \
((NPN_GetValueUPP) (FUNC))
-#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
(*(FUNC))((ARG1), (ARG2), (ARG3))
#endif
@@ -532,16 +532,16 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_SetValueProc(FUNC) \
+#define NewNPN_SetValueProc(FUNC) \
(NPN_SetValueUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_SetValueProcInfo, GetCurrentArchitecture())
#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_SetValueProcInfo, (ARG1), (ARG2), (ARG3))
#else
-typedef NPError (* NP_LOADDS NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-#define NewNPN_SetValueProc(FUNC) \
+typedef NPError (* NP_LOADDS NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
+#define NewNPN_SetValueProc(FUNC) \
((NPN_SetValueUPP) (FUNC))
-#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
(*(FUNC))((ARG1), (ARG2), (ARG3))
#endif
@@ -559,16 +559,16 @@ enum {
| STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_GetURLNotifyProc(FUNC) \
+#define NewNPN_GetURLNotifyProc(FUNC) \
(NPN_GetURLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetURLNotifyProcInfo, GetCurrentArchitecture())
#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetURLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4))
#else
-typedef NPError (* NP_LOADDS NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
-#define NewNPN_GetURLNotifyProc(FUNC) \
+typedef NPError (* NP_LOADDS NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
+#define NewNPN_GetURLNotifyProc(FUNC) \
((NPN_GetURLNotifyUPP) (FUNC))
-#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
+#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
(*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
#endif
@@ -589,14 +589,14 @@ enum {
| STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(void*)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_PostURLNotifyProc(FUNC) \
+#define NewNPN_PostURLNotifyProc(FUNC) \
(NPN_PostURLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_PostURLNotifyProcInfo, GetCurrentArchitecture())
#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_PostURLNotifyProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
#else
typedef NPError (* NP_LOADDS NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData);
-#define NewNPN_PostURLNotifyProc(FUNC) \
+#define NewNPN_PostURLNotifyProc(FUNC) \
((NPN_PostURLNotifyUPP) (FUNC))
#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
(*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
@@ -615,16 +615,16 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_GetURLProc(FUNC) \
+#define NewNPN_GetURLProc(FUNC) \
(NPN_GetURLUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetURLProcInfo, GetCurrentArchitecture())
#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetURLProcInfo, (ARG1), (ARG2), (ARG3))
#else
-typedef NPError (* NP_LOADDS NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
-#define NewNPN_GetURLProc(FUNC) \
+typedef NPError (* NP_LOADDS NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
+#define NewNPN_GetURLProc(FUNC) \
((NPN_GetURLUPP) (FUNC))
-#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
+#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
(*(FUNC))((ARG1), (ARG2), (ARG3))
#endif
@@ -644,14 +644,14 @@ enum {
| STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(NPBool)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_PostURLProc(FUNC) \
+#define NewNPN_PostURLProc(FUNC) \
(NPN_PostURLUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_PostURLProcInfo, GetCurrentArchitecture())
#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_PostURLProcInfo, (ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
#else
typedef NPError (* NP_LOADDS NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file);
-#define NewNPN_PostURLProc(FUNC) \
+#define NewNPN_PostURLProc(FUNC) \
((NPN_PostURLUPP) (FUNC))
#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
(*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
@@ -669,17 +669,17 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPByteRange *)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_RequestReadProc(FUNC) \
+#define NewNPN_RequestReadProc(FUNC) \
(NPN_RequestReadUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_RequestReadProcInfo, GetCurrentArchitecture())
-#define CallNPN_RequestReadProc(FUNC, stream, range) \
+#define CallNPN_RequestReadProc(FUNC, stream, range) \
(NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_RequestReadProcInfo, (stream), (range))
#else
-typedef NPError (* NP_LOADDS NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
-#define NewNPN_RequestReadProc(FUNC) \
+typedef NPError (* NP_LOADDS NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
+#define NewNPN_RequestReadProc(FUNC) \
((NPN_RequestReadUPP) (FUNC))
-#define CallNPN_RequestReadProc(FUNC, stream, range) \
+#define CallNPN_RequestReadProc(FUNC, stream, range) \
(*(FUNC))((stream), (range))
#endif
@@ -698,17 +698,17 @@ enum {
| STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPStream **)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_NewStreamProc(FUNC) \
+#define NewNPN_NewStreamProc(FUNC) \
(NPN_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_NewStreamProcInfo, GetCurrentArchitecture())
-#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \
- (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream))
+#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \
+ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_NewStreamProcInfo, (npp), (type), (window), (stream))
#else
-typedef NPError (* NP_LOADDS NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
-#define NewNPN_NewStreamProc(FUNC) \
+typedef NPError (* NP_LOADDS NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
+#define NewNPN_NewStreamProc(FUNC) \
((NPN_NewStreamUPP) (FUNC))
-#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \
+#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \
(*(FUNC))((npp), (type), (window), (stream))
#endif
@@ -727,17 +727,17 @@ enum {
| STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
| RESULT_SIZE(SIZE_CODE(sizeof(int32)))
};
-#define NewNPN_WriteProc(FUNC) \
+#define NewNPN_WriteProc(FUNC) \
(NPN_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_WriteProcInfo, GetCurrentArchitecture())
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \
- (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))
+#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \
+ (int32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_WriteProcInfo, (npp), (stream), (len), (buffer))
#else
typedef int32 (* NP_LOADDS NPN_WriteUPP)(NPP instance, NPStream* stream, int32 len, void* buffer);
-#define NewNPN_WriteProc(FUNC) \
+#define NewNPN_WriteProc(FUNC) \
((NPN_WriteUPP) (FUNC))
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \
+#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \
(*(FUNC))((npp), (stream), (len), (buffer))
#endif
@@ -755,17 +755,17 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPN_DestroyStreamProc(FUNC) \
+#define NewNPN_DestroyStreamProc(FUNC) \
(NPN_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, GetCurrentArchitecture())
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \
- (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason))
+#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \
+ (NPError)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_DestroyStreamProcInfo, (npp), (stream), (reason))
#else
typedef NPError (* NP_LOADDS NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPN_DestroyStreamProc(FUNC) \
+#define NewNPN_DestroyStreamProc(FUNC) \
((NPN_DestroyStreamUPP) (FUNC))
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \
+#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \
(*(FUNC))((npp), (stream), (reason))
#endif
@@ -782,18 +782,18 @@ enum {
| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
};
-#define NewNPN_StatusProc(FUNC) \
+#define NewNPN_StatusProc(FUNC) \
(NPN_StatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_StatusProcInfo, GetCurrentArchitecture())
-#define CallNPN_StatusProc(FUNC, npp, msg) \
- (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))
+#define CallNPN_StatusProc(FUNC, npp, msg) \
+ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))
#else
typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message);
-#define NewNPN_StatusProc(FUNC) \
+#define NewNPN_StatusProc(FUNC) \
((NPN_StatusUPP) (FUNC))
-#define CallNPN_StatusProc(FUNC, npp, msg) \
- (*(FUNC))((npp), (msg))
+#define CallNPN_StatusProc(FUNC, npp, msg) \
+ (*(FUNC))((npp), (msg))
#endif
@@ -815,7 +815,7 @@ enum {
#else
-typedef const char* (* NP_LOADDS NPN_UserAgentUPP)(NPP instance);
+typedef const char* (* NP_LOADDS NPN_UserAgentUPP)(NPP instance);
#define NewNPN_UserAgentProc(FUNC) \
((NPN_UserAgentUPP) (FUNC))
#define CallNPN_UserAgentProc(FUNC, ARG1) \
@@ -834,18 +834,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(sizeof(void *)))
};
-#define NewNPN_MemAllocProc(FUNC) \
+#define NewNPN_MemAllocProc(FUNC) \
(NPN_MemAllocUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemAllocProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemAllocProc(FUNC, ARG1) \
- (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1))
+#define CallNPN_MemAllocProc(FUNC, ARG1) \
+ (void*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemAllocProcInfo, (ARG1))
#else
typedef void* (* NP_LOADDS NPN_MemAllocUPP)(uint32 size);
-#define NewNPN_MemAllocProc(FUNC) \
+#define NewNPN_MemAllocProc(FUNC) \
((NPN_MemAllocUPP) (FUNC))
-#define CallNPN_MemAllocProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+#define CallNPN_MemAllocProc(FUNC, ARG1) \
+ (*(FUNC))((ARG1))
#endif
@@ -860,18 +860,18 @@ enum {
| STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(void *)))
};
-#define NewNPN_MemFreeProc(FUNC) \
+#define NewNPN_MemFreeProc(FUNC) \
(NPN_MemFreeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFreeProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemFreeProc(FUNC, ARG1) \
+#define CallNPN_MemFreeProc(FUNC, ARG1) \
(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFreeProcInfo, (ARG1))
#else
typedef void (* NP_LOADDS NPN_MemFreeUPP)(void* ptr);
-#define NewNPN_MemFreeProc(FUNC) \
+#define NewNPN_MemFreeProc(FUNC) \
((NPN_MemFreeUPP) (FUNC))
-#define CallNPN_MemFreeProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+#define CallNPN_MemFreeProc(FUNC, ARG1) \
+ (*(FUNC))((ARG1))
#endif
@@ -887,18 +887,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(sizeof(uint32)))
};
-#define NewNPN_MemFlushProc(FUNC) \
+#define NewNPN_MemFlushProc(FUNC) \
(NPN_MemFlushUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFlushProcInfo, GetCurrentArchitecture())
-#define CallNPN_MemFlushProc(FUNC, ARG1) \
- (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))
+#define CallNPN_MemFlushProc(FUNC, ARG1) \
+ (uint32)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_MemFlushProcInfo, (ARG1))
#else
typedef uint32 (* NP_LOADDS NPN_MemFlushUPP)(uint32 size);
-#define NewNPN_MemFlushProc(FUNC) \
+#define NewNPN_MemFlushProc(FUNC) \
((NPN_MemFlushUPP) (FUNC))
-#define CallNPN_MemFlushProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+#define CallNPN_MemFlushProc(FUNC, ARG1) \
+ (*(FUNC))((ARG1))
#endif
@@ -915,18 +915,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPN_ReloadPluginsProc(FUNC) \
+#define NewNPN_ReloadPluginsProc(FUNC) \
(NPN_ReloadPluginsUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, GetCurrentArchitecture())
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
- (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1))
+#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
+ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, (ARG1))
#else
typedef void (* NP_LOADDS NPN_ReloadPluginsUPP)(NPBool reloadPages);
-#define NewNPN_ReloadPluginsProc(FUNC) \
+#define NewNPN_ReloadPluginsProc(FUNC) \
((NPN_ReloadPluginsUPP) (FUNC))
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
+ (*(FUNC))((ARG1))
#endif
@@ -941,17 +941,17 @@ enum {
| RESULT_SIZE(SIZE_CODE(sizeof(JRIEnv*)))
};
-#define NewNPN_GetJavaEnvProc(FUNC) \
+#define NewNPN_GetJavaEnvProc(FUNC) \
(NPN_GetJavaEnvUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaEnvProc(FUNC) \
- (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)
+#define CallNPN_GetJavaEnvProc(FUNC) \
+ (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)
#else
typedef JRIEnv* (* NP_LOADDS NPN_GetJavaEnvUPP)(void);
-#define NewNPN_GetJavaEnvProc(FUNC) \
+#define NewNPN_GetJavaEnvProc(FUNC) \
((NPN_GetJavaEnvUPP) (FUNC))
-#define CallNPN_GetJavaEnvProc(FUNC) \
- (*(FUNC))()
+#define CallNPN_GetJavaEnvProc(FUNC) \
+ (*(FUNC))()
#endif
@@ -967,18 +967,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(sizeof(jref)))
};
-#define NewNPN_GetJavaPeerProc(FUNC) \
+#define NewNPN_GetJavaPeerProc(FUNC) \
(NPN_GetJavaPeerUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1) \
- (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1))
+#define CallNPN_GetJavaPeerProc(FUNC, ARG1) \
+ (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, (ARG1))
#else
typedef jref (* NP_LOADDS NPN_GetJavaPeerUPP)(NPP instance);
-#define NewNPN_GetJavaPeerProc(FUNC) \
+#define NewNPN_GetJavaPeerProc(FUNC) \
((NPN_GetJavaPeerUPP) (FUNC))
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+#define CallNPN_GetJavaPeerProc(FUNC, ARG1) \
+ (*(FUNC))((ARG1))
#endif
@@ -995,18 +995,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPN_InvalidateRectProc(FUNC) \
+#define NewNPN_InvalidateRectProc(FUNC) \
(NPN_InvalidateRectUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, GetCurrentArchitecture())
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
- (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))
+#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
+ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRectProcInfo, (ARG1), (ARG2))
#else
typedef void (* NP_LOADDS NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
-#define NewNPN_InvalidateRectProc(FUNC) \
+#define NewNPN_InvalidateRectProc(FUNC) \
((NPN_InvalidateRectUPP) (FUNC))
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
- (*(FUNC))((ARG1), (ARG2))
+#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
+ (*(FUNC))((ARG1), (ARG2))
#endif
@@ -1023,18 +1023,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(0))
};
-#define NewNPN_InvalidateRegionProc(FUNC) \
+#define NewNPN_InvalidateRegionProc(FUNC) \
(NPN_InvalidateRegionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, GetCurrentArchitecture())
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
- (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))
+#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
+ (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_InvalidateRegionProcInfo, (ARG1), (ARG2))
#else
typedef void (* NP_LOADDS NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
-#define NewNPN_InvalidateRegionProc(FUNC) \
+#define NewNPN_InvalidateRegionProc(FUNC) \
((NPN_InvalidateRegionUPP) (FUNC))
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
- (*(FUNC))((ARG1), (ARG2))
+#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
+ (*(FUNC))((ARG1), (ARG2))
#endif
@@ -1049,18 +1049,18 @@ enum {
| RESULT_SIZE(SIZE_CODE(sizeof(0)))
};
-#define NewNPN_ForceRedrawProc(FUNC) \
+#define NewNPN_ForceRedrawProc(FUNC) \
(NPN_ForceRedrawUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, GetCurrentArchitecture())
-#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
- (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1))
+#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
+ (jref)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, (ARG1))
#else
typedef void (* NP_LOADDS NPN_ForceRedrawUPP)(NPP instance);
-#define NewNPN_ForceRedrawProc(FUNC) \
+#define NewNPN_ForceRedrawProc(FUNC) \
((NPN_ForceRedrawUPP) (FUNC))
-#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
- (*(FUNC))((ARG1))
+#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
+ (*(FUNC))((ARG1))
#endif
@@ -1149,17 +1149,17 @@ enum {
| STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPP_ShutdownUPP*)))
| RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
};
-#define NewNPP_MainEntryProc(FUNC) \
+#define NewNPP_MainEntryProc(FUNC) \
(NPP_MainEntryUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_MainEntryProcInfo, GetCurrentArchitecture())
-#define CallNPP_MainEntryProc(FUNC, netscapeFunc, pluginFunc, shutdownUPP) \
+#define CallNPP_MainEntryProc(FUNC, netscapeFunc, pluginFunc, shutdownUPP) \
CallUniversalProc((UniversalProcPtr)(FUNC), (ProcInfoType)uppNPP_MainEntryProcInfo, (netscapeFunc), (pluginFunc), (shutdownUPP))
#else
typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*, NPP_ShutdownUPP*);
-#define NewNPP_MainEntryProc(FUNC) \
+#define NewNPP_MainEntryProc(FUNC) \
((NPP_MainEntryUPP) (FUNC))
-#define CallNPP_MainEntryProc(FUNC, netscapeFunc, pluginFunc, shutdownUPP) \
+#define CallNPP_MainEntryProc(FUNC, netscapeFunc, pluginFunc, shutdownUPP) \
(*(FUNC))((netscapeFunc), (pluginFunc), (shutdownUPP))
#endif
@@ -1170,7 +1170,7 @@ typedef NPError (* NP_LOADDS NPP_MainEntryUPP)(NPNetscapeFuncs*, NPPluginFuncs*,
* These can be called to retreive MIME information from the plugin dynamically
*
* Note: For compatibility with Quicktime, BPSupportedMIMEtypes is another way
- * to get mime info from the plugin only on OSX and may not be supported
+ * to get mime info from the plugin only on OSX and may not be supported
* in furture version--use NP_GetMIMEDescription instead
*/
@@ -1195,9 +1195,9 @@ enum {
uppNP_GetMIMEDescEntryProc = kThinkCStackBased
| RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
};
-#define NewNP_GetMIMEDescEntryProc(FUNC) \
+#define NewNP_GetMIMEDescEntryProc(FUNC) \
(NP_GetMIMEDescriptionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNP_GetMIMEDescEntryProc, GetCurrentArchitecture())
-#define CallNP_GetMIMEDescEntryProc(FUNC) \
+#define CallNP_GetMIMEDescEntryProc(FUNC) \
(const char *)CallUniversalProc((UniversalProcPtr)(FUNC), (ProcInfoType)uppNP_GetMIMEDescEntryProc)
@@ -1206,15 +1206,15 @@ enum {
// NP_GetMIMEDescription
#define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription"
typedef const char* (* NP_LOADDS NP_GetMIMEDescriptionUPP)();
-#define NewNP_GetMIMEDescEntryProc(FUNC) \
+#define NewNP_GetMIMEDescEntryProc(FUNC) \
((NP_GetMIMEDescriptionUPP) (FUNC))
-#define CallNP_GetMIMEDescEntryProc(FUNC) \
+#define CallNP_GetMIMEDescEntryProc(FUNC) \
(*(FUNC))()
// BP_GetSupportedMIMETypes
typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, UInt32);
-#define NewBP_GetSupportedMIMETypesEntryProc(FUNC) \
+#define NewBP_GetSupportedMIMETypesEntryProc(FUNC) \
((BP_GetSupportedMIMETypesUPP) (FUNC))
-#define CallBP_GetMIMEDescEntryProc(FUNC, mimeInfo, flags) \
+#define CallBP_GetMIMEDescEntryProc(FUNC, mimeInfo, flags) \
(*(FUNC))((mimeInfo), (flags))
#endif
@@ -1259,7 +1259,7 @@ NPError OSCALL NP_Initialize(NPNetscapeFuncs* pFuncs);
NPError OSCALL NP_Shutdown();
-char* NP_GetMIMEDescription();
+char* NP_GetMIMEDescription();
#ifdef __cplusplus
}
@@ -1279,9 +1279,9 @@ extern "C" {
/* plugin meta member functions */
-char* NP_GetMIMEDescription(void);
-NPError NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
-NPError NP_Shutdown(void);
+char* NP_GetMIMEDescription(void);
+NPError NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
+NPError NP_Shutdown(void);
#ifdef __cplusplus
}
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index 2855290529ab..1fb4d3e68e14 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -14,7 +14,7 @@
*
* The Original Code is Mozilla Communicator client code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
@@ -63,8 +63,8 @@ JRIGlobalRef Private_GetJavaClass(void);
////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
// Private_GetJavaClass (global function)
//
-// Given a Java class reference (thru NPP_GetJavaClass) inform JRT
-// of this class existence
+// Given a Java class reference (thru NPP_GetJavaClass) inform JRT
+// of this class existence
//
JRIGlobalRef
Private_GetJavaClass(void)
@@ -80,7 +80,7 @@ Private_GetJavaClass(void)
//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// PLUGIN DLL entry points
+// PLUGIN DLL entry points
//
// These are the Windows specific DLL entry points. They must be exoprted
//
@@ -95,19 +95,19 @@ static NPPluginFuncs* g_pluginFuncs;
////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
// NP_GetEntryPoints
//
-// fills in the func table used by Navigator to call entry points in
+// fills in the func table used by Navigator to call entry points in
// plugin DLL. Note that these entry points ensure that DS is loaded
// by using the NP_LOADDS macro, when compiling for Win16
//
NPError WINAPI NP_EXPORT
NP_GetEntryPoints(NPPluginFuncs* pFuncs)
{
- // trap a NULL ptr
+ // trap a NULL ptr
if(pFuncs == NULL)
return NPERR_INVALID_FUNCTABLE_ERROR;
// if the plugin's function table is smaller than the plugin expects,
- // then they are incompatible, and should return an error
+ // then they are incompatible, and should return an error
pFuncs->version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
pFuncs->newp = NPP_New;
@@ -119,9 +119,9 @@ NP_GetEntryPoints(NPPluginFuncs* pFuncs)
pFuncs->writeready = NPP_WriteReady;
pFuncs->write = NPP_Write;
pFuncs->print = NPP_Print;
- pFuncs->event = 0; /// reserved
+ pFuncs->event = 0; /// reserved
- g_pluginFuncs = pFuncs;
+ g_pluginFuncs = pFuncs;
return NPERR_NO_ERROR;
}
@@ -130,19 +130,19 @@ NP_GetEntryPoints(NPPluginFuncs* pFuncs)
////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
// NP_Initialize
//
-// called immediately after the plugin DLL is loaded
+// called immediately after the plugin DLL is loaded
//
-NPError WINAPI NP_EXPORT
+NPError WINAPI NP_EXPORT
NP_Initialize(NPNetscapeFuncs* pFuncs)
{
- // trap a NULL ptr
+ // trap a NULL ptr
if(pFuncs == NULL)
return NPERR_INVALID_FUNCTABLE_ERROR;
- g_pNavigatorFuncs = pFuncs; // save it for future reference
+ g_pNavigatorFuncs = pFuncs; // save it for future reference
// if the plugin's major ver level is lower than the Navigator's,
- // then they are incompatible, and should return an error
+ // then they are incompatible, and should return an error
if(HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
return NPERR_INCOMPATIBLE_VERSION_ERROR;
@@ -152,8 +152,8 @@ NP_Initialize(NPNetscapeFuncs* pFuncs)
if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
g_pluginFuncs->urlnotify = NPP_URLNotify;
}
-
-#ifdef OJI
+
+#ifdef OJI
if( navMinorVers >= NPVERS_HAS_LIVECONNECT ) {
g_pluginFuncs->javaClass = Private_GetJavaClass();
}
@@ -167,11 +167,11 @@ NP_Initialize(NPNetscapeFuncs* pFuncs)
////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
// NP_Shutdown
//
-// called immediately before the plugin DLL is unloaded.
-// This functio shuold check for some ref count on the dll to see if it is
-// unloadable or it needs to stay in memory.
+// called immediately before the plugin DLL is unloaded.
+// This functio shuold check for some ref count on the dll to see if it is
+// unloadable or it needs to stay in memory.
//
-NPError WINAPI NP_EXPORT
+NPError WINAPI NP_EXPORT
NP_Shutdown()
{
NPP_Shutdown();
@@ -184,7 +184,7 @@ char * NP_GetMIMEDescription()
return NPP_GetMIMEDescription();
}
-// END - PLUGIN DLL entry points
+// END - PLUGIN DLL entry points
////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
@@ -267,7 +267,7 @@ NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
/* Creates a new stream of data from the plug-in to be interpreted
by Netscape in the current window.
*/
-NPError NPN_NewStream(NPP instance, NPMIMEType type,
+NPError NPN_NewStream(NPP instance, NPMIMEType type,
const char* target, NPStream** stream)
{
int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
@@ -299,7 +299,7 @@ int32 NPN_Write(NPP instance, NPStream *stream,
return result;
}
-/* Closes a stream object.
+/* Closes a stream object.
reason indicates why the stream was closed.
*/
NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
diff --git a/sane/inc/sane.h b/sane/inc/sane.h
index eb18eef1a601..212e5bedc94e 100644
--- a/sane/inc/sane.h
+++ b/sane/inc/sane.h
@@ -16,19 +16,19 @@
#ifndef sane_h
#define sane_h
-#define SANE_CURRENT_MAJOR 0
+#define SANE_CURRENT_MAJOR 0
-#define SANE_VERSION_CODE(major, minor, build) \
- ( (((SANE_Word) (major) & 0xff) << 24) \
- | (((SANE_Word) (minor) & 0xff) << 16) \
+#define SANE_VERSION_CODE(major, minor, build) \
+ ( (((SANE_Word) (major) & 0xff) << 24) \
+ | (((SANE_Word) (minor) & 0xff) << 16) \
| (((SANE_Word) (build) & 0xffff) << 0))
-#define SANE_VERSION_MAJOR(code) ((((SANE_Word)(code)) >> 24) & 0xff)
-#define SANE_VERSION_MINOR(code) ((((SANE_Word)(code)) >> 16) & 0xff)
-#define SANE_VERSION_BUILD(code) ((((SANE_Word)(code)) >> 0) & 0xffff)
+#define SANE_VERSION_MAJOR(code) ((((SANE_Word)(code)) >> 24) & 0xff)
+#define SANE_VERSION_MINOR(code) ((((SANE_Word)(code)) >> 16) & 0xff)
+#define SANE_VERSION_BUILD(code) ((((SANE_Word)(code)) >> 0) & 0xffff)
-#define SANE_FALSE 0
-#define SANE_TRUE 1
+#define SANE_FALSE 0
+#define SANE_TRUE 1
typedef unsigned char SANE_Byte;
typedef int SANE_Word;
@@ -40,24 +40,24 @@ typedef const SANE_Char *SANE_String_Const;
typedef void *SANE_Handle;
typedef SANE_Word SANE_Fixed;
-#define SANE_FIXED_SCALE_SHIFT 16
-#define SANE_FIX(v) ((SANE_Word) ((v) * (1 << SANE_FIXED_SCALE_SHIFT)))
-#define SANE_UNFIX(v) ((double)(v) / (1 << SANE_FIXED_SCALE_SHIFT))
+#define SANE_FIXED_SCALE_SHIFT 16
+#define SANE_FIX(v) ((SANE_Word) ((v) * (1 << SANE_FIXED_SCALE_SHIFT)))
+#define SANE_UNFIX(v) ((double)(v) / (1 << SANE_FIXED_SCALE_SHIFT))
typedef enum
{
- SANE_STATUS_GOOD = 0, /* everything A-OK */
- SANE_STATUS_UNSUPPORTED, /* operation is not supported */
- SANE_STATUS_CANCELLED, /* operation was cancelled */
- SANE_STATUS_DEVICE_BUSY, /* device is busy; try again later */
- SANE_STATUS_INVAL, /* data is invalid (includes no dev at open) */
- SANE_STATUS_EOF, /* no more data available (end-of-file) */
- SANE_STATUS_JAMMED, /* document feeder jammed */
- SANE_STATUS_NO_DOCS, /* document feeder out of documents */
- SANE_STATUS_COVER_OPEN, /* scanner cover is open */
- SANE_STATUS_IO_ERROR, /* error during device I/O */
- SANE_STATUS_NO_MEM, /* out of memory */
- SANE_STATUS_ACCESS_DENIED /* access to resource has been denied */
+ SANE_STATUS_GOOD = 0, /* everything A-OK */
+ SANE_STATUS_UNSUPPORTED, /* operation is not supported */
+ SANE_STATUS_CANCELLED, /* operation was cancelled */
+ SANE_STATUS_DEVICE_BUSY, /* device is busy; try again later */
+ SANE_STATUS_INVAL, /* data is invalid (includes no dev at open) */
+ SANE_STATUS_EOF, /* no more data available (end-of-file) */
+ SANE_STATUS_JAMMED, /* document feeder jammed */
+ SANE_STATUS_NO_DOCS, /* document feeder out of documents */
+ SANE_STATUS_COVER_OPEN, /* scanner cover is open */
+ SANE_STATUS_IO_ERROR, /* error during device I/O */
+ SANE_STATUS_NO_MEM, /* out of memory */
+ SANE_STATUS_ACCESS_DENIED /* access to resource has been denied */
}
SANE_Status;
@@ -74,40 +74,40 @@ SANE_Value_Type;
typedef enum
{
- SANE_UNIT_NONE = 0, /* the value is unit-less (e.g., # of scans) */
- SANE_UNIT_PIXEL, /* value is number of pixels */
- SANE_UNIT_BIT, /* value is number of bits */
- SANE_UNIT_MM, /* value is millimeters */
- SANE_UNIT_DPI, /* value is resolution in dots/inch */
- SANE_UNIT_PERCENT, /* value is a percentage */
- SANE_UNIT_MICROSECOND /* value is micro seconds */
+ SANE_UNIT_NONE = 0, /* the value is unit-less (e.g., # of scans) */
+ SANE_UNIT_PIXEL, /* value is number of pixels */
+ SANE_UNIT_BIT, /* value is number of bits */
+ SANE_UNIT_MM, /* value is millimeters */
+ SANE_UNIT_DPI, /* value is resolution in dots/inch */
+ SANE_UNIT_PERCENT, /* value is a percentage */
+ SANE_UNIT_MICROSECOND /* value is micro seconds */
}
SANE_Unit;
typedef struct
{
- SANE_String_Const name; /* unique device name */
- SANE_String_Const vendor; /* device vendor string */
- SANE_String_Const model; /* device model name */
- SANE_String_Const type; /* device type (e.g., "flatbed scanner") */
+ SANE_String_Const name; /* unique device name */
+ SANE_String_Const vendor; /* device vendor string */
+ SANE_String_Const model; /* device model name */
+ SANE_String_Const type; /* device type (e.g., "flatbed scanner") */
}
SANE_Device;
-#define SANE_CAP_SOFT_SELECT (1 << 0)
-#define SANE_CAP_HARD_SELECT (1 << 1)
-#define SANE_CAP_SOFT_DETECT (1 << 2)
-#define SANE_CAP_EMULATED (1 << 3)
-#define SANE_CAP_AUTOMATIC (1 << 4)
-#define SANE_CAP_INACTIVE (1 << 5)
-#define SANE_CAP_ADVANCED (1 << 6)
-#define SANE_CAP_ALWAYS_SETTABLE (1 << 7)
+#define SANE_CAP_SOFT_SELECT (1 << 0)
+#define SANE_CAP_HARD_SELECT (1 << 1)
+#define SANE_CAP_SOFT_DETECT (1 << 2)
+#define SANE_CAP_EMULATED (1 << 3)
+#define SANE_CAP_AUTOMATIC (1 << 4)
+#define SANE_CAP_INACTIVE (1 << 5)
+#define SANE_CAP_ADVANCED (1 << 6)
+#define SANE_CAP_ALWAYS_SETTABLE (1 << 7)
-#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0)
-#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0)
+#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0)
+#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0)
-#define SANE_INFO_INEXACT (1 << 0)
-#define SANE_INFO_RELOAD_OPTIONS (1 << 1)
-#define SANE_INFO_RELOAD_PARAMS (1 << 2)
+#define SANE_INFO_INEXACT (1 << 0)
+#define SANE_INFO_RELOAD_OPTIONS (1 << 1)
+#define SANE_INFO_RELOAD_PARAMS (1 << 2)
typedef enum
{
@@ -120,27 +120,27 @@ SANE_Constraint_Type;
typedef struct
{
- SANE_Word min; /* minimum (element) value */
- SANE_Word max; /* maximum (element) value */
- SANE_Word quant; /* quantization value (0 if none) */
+ SANE_Word min; /* minimum (element) value */
+ SANE_Word max; /* maximum (element) value */
+ SANE_Word quant; /* quantization value (0 if none) */
}
SANE_Range;
typedef struct
{
- SANE_String_Const name; /* name of this option (command-line name) */
- SANE_String_Const title; /* title of this option (single-line) */
- SANE_String_Const desc; /* description of this option (multi-line) */
- SANE_Value_Type type; /* how are values interpreted? */
- SANE_Unit unit; /* what is the (physical) unit? */
+ SANE_String_Const name; /* name of this option (command-line name) */
+ SANE_String_Const title; /* title of this option (single-line) */
+ SANE_String_Const desc; /* description of this option (multi-line) */
+ SANE_Value_Type type; /* how are values interpreted? */
+ SANE_Unit unit; /* what is the (physical) unit? */
SANE_Int size;
- SANE_Int cap; /* capabilities */
+ SANE_Int cap; /* capabilities */
SANE_Constraint_Type constraint_type;
union
{
- const SANE_String_Const *string_list; /* NULL-terminated list */
- const SANE_Word *word_list; /* first element is list-length */
+ const SANE_String_Const *string_list; /* NULL-terminated list */
+ const SANE_Word *word_list; /* first element is list-length */
const SANE_Range *range;
}
constraint;
@@ -157,11 +157,11 @@ SANE_Action;
typedef enum
{
- SANE_FRAME_GRAY, /* band covering human visual range */
- SANE_FRAME_RGB, /* pixel-interleaved red/green/blue bands */
- SANE_FRAME_RED, /* red band only */
- SANE_FRAME_GREEN, /* green band only */
- SANE_FRAME_BLUE /* blue band only */
+ SANE_FRAME_GRAY, /* band covering human visual range */
+ SANE_FRAME_RGB, /* pixel-interleaved red/green/blue bands */
+ SANE_FRAME_RED, /* red band only */
+ SANE_FRAME_GREEN, /* green band only */
+ SANE_FRAME_BLUE /* blue band only */
}
SANE_Frame;
@@ -178,8 +178,8 @@ SANE_Parameters;
struct SANE_Auth_Data;
-#define SANE_MAX_USERNAME_LEN 256
-#define SANE_MAX_PASSWORD_LEN 256
+#define SANE_MAX_USERNAME_LEN 256
+#define SANE_MAX_PASSWORD_LEN 256
typedef void (*SANE_Auth_Callback) (SANE_String_Const resource,
SANE_Char username[SANE_MAX_USERNAME_LEN],
diff --git a/twain/inc/twain.h b/twain/inc/twain.h
index a9643e6111f9..8c5003474956 100644
--- a/twain/inc/twain.h
+++ b/twain/inc/twain.h
@@ -3,21 +3,21 @@
Copyright (C) 1991, 1992 TWAIN Working Group: Aldus, Caere, Eastman-Kodak,
Hewlett-Packard and Logitech Corporations. All rights reserved.
- Copyright (C) 1997 TWAIN Working Group: Bell+Howell, Canon, DocuMagix,
+ Copyright (C) 1997 TWAIN Working Group: Bell+Howell, Canon, DocuMagix,
Fujitsu, Genoa Technology, Hewlett-Packard, Kofax Imaging Products, and
Ricoh Corporation. All rights reserved.
-
- Copyright 1998 TWAIN Working Group: Adobe Systems Incorporated,
- Canon Information Systems, Eastman Kodak Company,
- Fujitsu Computer Products of America, Genoa Technology,
- Hewlett-Packard Company, Intel Corporation, Kofax Image Products,
- JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
+
+ Copyright 1998 TWAIN Working Group: Adobe Systems Incorporated,
+ Canon Information Systems, Eastman Kodak Company,
+ Fujitsu Computer Products of America, Genoa Technology,
+ Hewlett-Packard Company, Intel Corporation, Kofax Image Products,
+ JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
All rights reserved.
- Copyright 2000 TWAIN Working Group: Adobe Systems Incorporated,
- Canon Information Systems, Digimarc Corporation, Eastman Kodak Company,
- Fujitsu Computer Products of America, Hewlett-Packard Company,
- JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
+ Copyright 2000 TWAIN Working Group: Adobe Systems Incorporated,
+ Canon Information Systems, Digimarc Corporation, Eastman Kodak Company,
+ Fujitsu Computer Products of America, Hewlett-Packard Company,
+ JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
All rights reserved.
@@ -25,34 +25,34 @@
data sources written to the TWAIN specification.
It defines constants, data structures, messages etc.
for the public interface to TWAIN.
-
+
Revision History:
version 1.0, March 6, 1992. TWAIN 1.0.
version 1.1, January 1993. Tech Notes 1.1
version 1.5, June 1993. Specification Update 1.5
- Change DC to TW
+ Change DC to TW
Change filename from DC.H to TWAIN.H
version 1.5, July 1993. Remove spaces from country identifiers
-
- version 1.7, July 1997 Added Capabilities and data structure for
+
+ version 1.7, July 1997 Added Capabilities and data structure for
document imaging and digital cameras.
KHL.
version 1.7, July 1997 Inserted Borland compatibile structure packing
directives provided by Mentor. JMH
- version 1.7, Aug 1997 Expanded file tabs to spaces.
- NOTE: future authors should be sure to have
- their editors set to automatically expand tabs
+ version 1.7, Aug 1997 Expanded file tabs to spaces.
+ NOTE: future authors should be sure to have
+ their editors set to automatically expand tabs
to spaces (original tab setting was 4 spaces).
version 1.7, Sept 1997 Added job control values
Added return codes
- version 1.7, Sept 1997 changed definition of pRGBRESPONSE to
+ version 1.7, Sept 1997 changed definition of pRGBRESPONSE to
pTW_RGBRESPONSE
version 1.7 Aug 1998 Added missing TWEI_BARCODEROTATION values
TWBCOR_ types JMH
version 1.8 August 1998 Added new types and definitions required
for 1.8 Specification JMH
version 1.8 January 1999 Changed search mode from SRCH_ to TWBD_ as
- in 1.8 Specification, added TWBT_MAXICODE JMH
+ in 1.8 Specification, added TWBT_MAXICODE JMH
version 1.8 January 1999 Removed undocumented duplicate AUTO<cap> JMH
version 1.8 March 1999 Removed undocumented 1.8 caps:
CAP_FILESYSTEM
@@ -63,9 +63,9 @@
* CAP_PAGEMULTIPLEACQUIRE - is CAP_REACQUIREALLOWED,
requires spec change. JMH
Added Mac structure packing modifications JMH
- version 1.9 March 2000 Added new types and definations required
+ version 1.9 March 2000 Added new types and definations required
for 1.9 Specification MLM
- version 1.9 March 2000 Added ICAP_JPEGQUALITY, TWJQ_ values,
+ version 1.9 March 2000 Added ICAP_JPEGQUALITY, TWJQ_ values,
updated TWON_PROTOCOLMINOR for Release v1.9 MN
\* ======================================================================== */
@@ -123,10 +123,10 @@
* Corrected to allow building of TWAIN MacOS PowerPC Applications
* and MacOS PowerPC TWAIN sources.
*
- * The modification allows a PowerPC Application to use a
+ * The modification allows a PowerPC Application to use a
* TWAIN 68k Source and a PowerPC Source to be used by a 68k Application.
*
- * The modification concerns the data alignment of the C-Structures used by
+ * The modification concerns the data alignment of the C-Structures used by
* TWAIN during the communication between the Application and Source.
*
* The Data Alignment must be 68k code and not PowerPC.
@@ -168,12 +168,12 @@ typedef wchar_t TW_UNI512[512], FAR *pTW_UNI512; /* added 1.9 */
/* Numeric types. */
typedef char TW_INT8, FAR *pTW_INT8;
-typedef short TW_INT16, FAR *pTW_INT16;
+typedef short TW_INT16, FAR *pTW_INT16;
typedef long TW_INT32, FAR *pTW_INT32;
typedef unsigned char TW_UINT8, FAR *pTW_UINT8;
typedef unsigned short TW_UINT16, FAR *pTW_UINT16;
typedef unsigned long TW_UINT32, FAR *pTW_UINT32;
-typedef unsigned short TW_BOOL, FAR *pTW_BOOL;
+typedef unsigned short TW_BOOL, FAR *pTW_BOOL;
/* Fixed point structure type. */
typedef struct {
@@ -473,9 +473,9 @@ typedef struct
/* ----------------------------------------------------------------------- *\
- Version 1.7: Added Following data structure for Document Imaging
+ Version 1.7: Added Following data structure for Document Imaging
July 1997 Enhancement.
- KHL TW_CUSTOMDSDATA -- For Saving and Restoring Source's
+ KHL TW_CUSTOMDSDATA -- For Saving and Restoring Source's
state.
TW_INFO -- Each attribute for extended image
information.
@@ -864,7 +864,7 @@ typedef struct {
#define TWJC_JSIS 2
#define TWJC_JSXC 3
#define TWJC_JSXS 4
-
+
/* Added 1.7 */
/* TWEI_BARCODEROTATION values (BCOR_ means barcode rotation) */
#define TWBCOR_ROT0 0
@@ -897,7 +897,7 @@ typedef struct {
#define TWCB_NOCLEAR 2
/* CAP_DEVICEEVENT values (DE_ means device event) */
-#define TWDE_CUSTOMEVENTS 0x8000
+#define TWDE_CUSTOMEVENTS 0x8000
#define TWDE_CHECKAUTOMATICCAPTURE 0
#define TWDE_CHECKBATTERY 1
#define TWDE_CHECKDEVICEONLINE 2
@@ -1000,7 +1000,7 @@ typedef struct {
#define TWFY_UNKNOWN 8
/* ICAP_JPEGQUALITY values (JQ_ means jpeg quality) */
-#define TWJQ_UNKNOWN -4
+#define TWJQ_UNKNOWN -4
#define TWJQ_LOW -3
#define TWJQ_MEDIUM -2
#define TWJQ_HIGH -1
@@ -1270,7 +1270,7 @@ typedef struct {
#define TWLG_USA 13 /* U.S. English */
/* Added for 1.8 */
#define TWLG_USERLOCALE -1
-#define TWLG_AFRIKAANS 14
+#define TWLG_AFRIKAANS 14
#define TWLG_ALBANIA 15
#define TWLG_ARABIC 16
#define TWLG_ARABIC_ALGERIA 17
@@ -1518,7 +1518,7 @@ typedef struct {
#define MSG_CHANGEDIRECTORY 0x0801
#define MSG_CREATEDIRECTORY 0x0802
#define MSG_DELETE 0x0803
-#define MSG_FORMATMEDIA 0x0804
+#define MSG_FORMATMEDIA 0x0804
#define MSG_GETCLOSE 0x0805
#define MSG_GETFIRSTFILE 0x0806
#define MSG_GETINFO 0x0807
@@ -1595,7 +1595,7 @@ typedef struct {
#define CAP_REACQUIREALLOWED 0x1030 /* Added 1.8 */
#define CAP_BATTERYMINUTES 0x1032 /* Added 1.8 */
#define CAP_BATTERYPERCENTAGE 0x1033 /* Added 1.8 */
-
+
/* image data sources MAY support these caps */
#define ICAP_AUTOBRIGHT 0x1100
#define ICAP_BRIGHTNESS 0x1101
@@ -1674,8 +1674,8 @@ typedef struct {
/* ----------------------------------------------------------------------- *\
Version 1.7: Following is Extended Image Info Attributes.
- July 1997
- KHL
+ July 1997
+ KHL
\* ----------------------------------------------------------------------- */
@@ -1738,9 +1738,9 @@ typedef struct {
#define TWEI_CHAPTERNUMBER 0x1239 /* added 1.9 */
#define TWEI_DOCUMENTNUMBER 0x123A /* added 1.9 */
#define TWEI_PAGENUMBER 0x123B /* added 1.9 */
-#define TWEI_CAMERA 0x123C /* added 1.9 */
+#define TWEI_CAMERA 0x123C /* added 1.9 */
#define TWEI_FRAMENUMBER 0x123D /* added 1.9 */
-#define TWEI_FRAME 0x123E /* added 1.9 */
+#define TWEI_FRAME 0x123E /* added 1.9 */
#define TWEI_PIXELFLAVOR 0x123F /* added 1.9 */
#define TWEJ_NONE 0x0000
@@ -1755,7 +1755,7 @@ typedef struct {
/* Added 1.8 */
/* TW_PASSTHRU.Direction values */
#define TWDR_GET 1
-#define TWDR_SET 2
+#define TWDR_SET 2
/***************************************************************************
* Return Codes and Condition Codes section *
@@ -1806,7 +1806,7 @@ typedef struct {
/* bit patterns: for query the operation that are supported by the data source on a capability */
/* Application gets these through DG_CONTROL/DAT_CAPABILITY/MSG_QUERYSUPPORT */
/* Added 1.6 */
-#define TWQC_GET 0x0001
+#define TWQC_GET 0x0001
#define TWQC_SET 0x0002
#define TWQC_GETDEFAULT 0x0004
#define TWQC_GETCURRENT 0x0008
@@ -1828,21 +1828,21 @@ typedef struct {
* This could identify an application or a data source.
* If this is NULL, the message goes to the Source Manager.
*
- * DG The Data Group.
+ * DG The Data Group.
* Example: DG_IMAGE.
*
* DAT The Data Attribute Type.
* Example: DAT_IMAGEMEMXFER.
- *
+ *
* MSG The message. Messages are interpreted by the destination module
- * with respect to the Data Group and the Data Attribute Type.
+ * with respect to the Data Group and the Data Attribute Type.
* Example: MSG_GET.
*
- * pData A pointer to the data structure or variable identified
+ * pData A pointer to the data structure or variable identified
* by the Data Attribute Type.
* Example: (TW_MEMREF)&ImageMemXfer
* where ImageMemXfer is a TW_IMAGEMEMXFER structure.
- *
+ *
* Returns:
* ReturnCode
* Example: TWRC_SUCCESS.
@@ -1891,21 +1891,21 @@ typedef TW_UINT16 (*DSMENTRYPROC)(pTW_IDENTITY, pTW_IDENTITY,
* pOrigin Identifies the source module of the message. This could
* identify an application or the Data Source Manager.
*
- * DG The Data Group.
+ * DG The Data Group.
* Example: DG_IMAGE.
- *
+ *
* DAT The Data Attribute Type.
* Example: DAT_IMAGEMEMXFER.
- *
+ *
* MSG The message. Messages are interpreted by the data source
* with respect to the Data Group and the Data Attribute Type.
* Example: MSG_GET.
*
- * pData A pointer to the data structure or variable identified
+ * pData A pointer to the data structure or variable identified
* by the Data Attribute Type.
* Example: (TW_MEMREF)&ImageMemXfer
* where ImageMemXfer is a TW_IMAGEMEMXFER structure.
- *
+ *
* Returns:
* ReturnCode
* Example: TWRC_SUCCESS.
@@ -1923,28 +1923,28 @@ extern "C" {
#ifdef _MSWIN_
#ifdef _WIN32
__declspec(dllexport) TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
- TW_UINT32 DG,
- TW_UINT16 DAT,
- TW_UINT16 MSG,
+ TW_UINT32 DG,
+ TW_UINT16 DAT,
+ TW_UINT16 MSG,
TW_MEMREF pData);
#else /* _WIN32 */
TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
- TW_UINT32 DG,
- TW_UINT16 DAT,
- TW_UINT16 MSG,
+ TW_UINT32 DG,
+ TW_UINT16 DAT,
+ TW_UINT16 MSG,
TW_MEMREF pData);
#endif /* _WIN32 */
-
+
typedef TW_UINT16 (FAR PASCAL *DSENTRYPROC) (pTW_IDENTITY pOrigin,
- TW_UINT32 DG,
- TW_UINT16 DAT,
- TW_UINT16 MSG,
+ TW_UINT32 DG,
+ TW_UINT16 DAT,
+ TW_UINT16 MSG,
TW_MEMREF pData);
#else /* _MSWIN_ */
-FAR PASCAL TW_UINT16 DS_Entry( pTW_IDENTITY pOrigin,
- TW_UINT32 DG,
- TW_UINT16 DAT,
- TW_UINT16 MSG,
+FAR PASCAL TW_UINT16 DS_Entry( pTW_IDENTITY pOrigin,
+ TW_UINT32 DG,
+ TW_UINT16 DAT,
+ TW_UINT16 MSG,
TW_MEMREF pData);
typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY,
diff --git a/unixODBC/inc/sql.h b/unixODBC/inc/sql.h
index a81c482b0f5c..7ff7a406a398 100644
--- a/unixODBC/inc/sql.h
+++ b/unixODBC/inc/sql.h
@@ -86,8 +86,8 @@ extern "C" {
/* SQL_ATTR_CURSOR_SCROLLABLE values */
#if (ODBCVER >= 0x0300)
-#define SQL_NONSCROLLABLE 0
-#define SQL_SCROLLABLE 1
+#define SQL_NONSCROLLABLE 0
+#define SQL_SCROLLABLE 1
#endif /* ODBCVER >= 0x0300 */
/* identifiers of fields in the SQL descriptor */
@@ -126,25 +126,25 @@ extern "C" {
/* dynamic function codes */
#if (ODBCVER >= 0x0300)
-#define SQL_DIAG_ALTER_DOMAIN 3
+#define SQL_DIAG_ALTER_DOMAIN 3
#define SQL_DIAG_ALTER_TABLE 4
-#define SQL_DIAG_CALL 7
-#define SQL_DIAG_CREATE_ASSERTION 6
-#define SQL_DIAG_CREATE_CHARACTER_SET 8
-#define SQL_DIAG_CREATE_COLLATION 10
-#define SQL_DIAG_CREATE_DOMAIN 23
+#define SQL_DIAG_CALL 7
+#define SQL_DIAG_CREATE_ASSERTION 6
+#define SQL_DIAG_CREATE_CHARACTER_SET 8
+#define SQL_DIAG_CREATE_COLLATION 10
+#define SQL_DIAG_CREATE_DOMAIN 23
#define SQL_DIAG_CREATE_INDEX (-1)
-#define SQL_DIAG_CREATE_SCHEMA 64
+#define SQL_DIAG_CREATE_SCHEMA 64
#define SQL_DIAG_CREATE_TABLE 77
-#define SQL_DIAG_CREATE_TRANSLATION 79
+#define SQL_DIAG_CREATE_TRANSLATION 79
#define SQL_DIAG_CREATE_VIEW 84
#define SQL_DIAG_DELETE_WHERE 19
-#define SQL_DIAG_DROP_ASSERTION 24
-#define SQL_DIAG_DROP_CHARACTER_SET 25
-#define SQL_DIAG_DROP_COLLATION 26
-#define SQL_DIAG_DROP_DOMAIN 27
+#define SQL_DIAG_DROP_ASSERTION 24
+#define SQL_DIAG_DROP_CHARACTER_SET 25
+#define SQL_DIAG_DROP_COLLATION 26
+#define SQL_DIAG_DROP_DOMAIN 27
#define SQL_DIAG_DROP_INDEX (-2)
-#define SQL_DIAG_DROP_SCHEMA 31
+#define SQL_DIAG_DROP_SCHEMA 31
#define SQL_DIAG_DROP_TABLE 32
#define SQL_DIAG_DROP_TRANSLATION 33
#define SQL_DIAG_DROP_VIEW 36
@@ -159,7 +159,7 @@ extern "C" {
#endif /* ODBCVER >= 0x0300 */
/* SQL data type codes */
-#define SQL_UNKNOWN_TYPE 0
+#define SQL_UNKNOWN_TYPE 0
#define SQL_CHAR 1
#define SQL_NUMERIC 2
#define SQL_DECIMAL 3
@@ -394,9 +394,9 @@ extern "C" {
/* Information requested by SQLGetInfo() */
#if (ODBCVER >= 0x0300)
#define SQL_MAX_DRIVER_CONNECTIONS 0
-#define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS
+#define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS
#define SQL_MAX_CONCURRENT_ACTIVITIES 1
-#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES
+#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES
#endif
#define SQL_DATA_SOURCE_NAME 2
#define SQL_FETCH_DIRECTION 8
@@ -405,27 +405,27 @@ extern "C" {
#define SQL_DBMS_NAME 17
#define SQL_DBMS_VER 18
#define SQL_ACCESSIBLE_TABLES 19
-#define SQL_ACCESSIBLE_PROCEDURES 20
+#define SQL_ACCESSIBLE_PROCEDURES 20
#define SQL_CURSOR_COMMIT_BEHAVIOR 23
#define SQL_DATA_SOURCE_READ_ONLY 25
#define SQL_DEFAULT_TXN_ISOLATION 26
#define SQL_IDENTIFIER_CASE 28
#define SQL_IDENTIFIER_QUOTE_CHAR 29
#define SQL_MAX_COLUMN_NAME_LEN 30
-#define SQL_MAXIMUM_COLUMN_NAME_LENGTH SQL_MAX_COLUMN_NAME_LEN
+#define SQL_MAXIMUM_COLUMN_NAME_LENGTH SQL_MAX_COLUMN_NAME_LEN
#define SQL_MAX_CURSOR_NAME_LEN 31
-#define SQL_MAXIMUM_CURSOR_NAME_LENGTH SQL_MAX_CURSOR_NAME_LEN
+#define SQL_MAXIMUM_CURSOR_NAME_LENGTH SQL_MAX_CURSOR_NAME_LEN
#define SQL_MAX_SCHEMA_NAME_LEN 32
-#define SQL_MAXIMUM_SCHEMA_NAME_LENGTH SQL_MAX_SCHEMA_NAME_LEN
+#define SQL_MAXIMUM_SCHEMA_NAME_LENGTH SQL_MAX_SCHEMA_NAME_LEN
#define SQL_MAX_CATALOG_NAME_LEN 34
-#define SQL_MAXIMUM_CATALOG_NAME_LENGTH SQL_MAX_CATALOG_NAME_LEN
+#define SQL_MAXIMUM_CATALOG_NAME_LENGTH SQL_MAX_CATALOG_NAME_LEN
#define SQL_MAX_TABLE_NAME_LEN 35
#define SQL_SCROLL_CONCURRENCY 43
#define SQL_TXN_CAPABLE 46
-#define SQL_TRANSACTION_CAPABLE SQL_TXN_CAPABLE
+#define SQL_TRANSACTION_CAPABLE SQL_TXN_CAPABLE
#define SQL_USER_NAME 47
#define SQL_TXN_ISOLATION_OPTION 72
-#define SQL_TRANSACTION_ISOLATION_OPTION SQL_TXN_ISOLATION_OPTION
+#define SQL_TRANSACTION_ISOLATION_OPTION SQL_TXN_ISOLATION_OPTION
#define SQL_INTEGRITY 73
#define SQL_GETDATA_EXTENSIONS 81
#define SQL_NULL_COLLATION 85
@@ -433,27 +433,27 @@ extern "C" {
#define SQL_ORDER_BY_COLUMNS_IN_SELECT 90
#define SQL_SPECIAL_CHARACTERS 94
#define SQL_MAX_COLUMNS_IN_GROUP_BY 97
-#define SQL_MAXIMUM_COLUMNS_IN_GROUP_BY SQL_MAX_COLUMNS_IN_GROUP_BY
+#define SQL_MAXIMUM_COLUMNS_IN_GROUP_BY SQL_MAX_COLUMNS_IN_GROUP_BY
#define SQL_MAX_COLUMNS_IN_INDEX 98
-#define SQL_MAXIMUM_COLUMNS_IN_INDEX SQL_MAX_COLUMNS_IN_INDEX
+#define SQL_MAXIMUM_COLUMNS_IN_INDEX SQL_MAX_COLUMNS_IN_INDEX
#define SQL_MAX_COLUMNS_IN_ORDER_BY 99
-#define SQL_MAXIMUM_COLUMNS_IN_ORDER_BY SQL_MAX_COLUMNS_IN_ORDER_BY
+#define SQL_MAXIMUM_COLUMNS_IN_ORDER_BY SQL_MAX_COLUMNS_IN_ORDER_BY
#define SQL_MAX_COLUMNS_IN_SELECT 100
-#define SQL_MAXIMUM_COLUMNS_IN_SELECT SQL_MAX_COLUMNS_IN_SELECT
+#define SQL_MAXIMUM_COLUMNS_IN_SELECT SQL_MAX_COLUMNS_IN_SELECT
#define SQL_MAX_COLUMNS_IN_TABLE 101
#define SQL_MAX_INDEX_SIZE 102
-#define SQL_MAXIMUM_INDEX_SIZE SQL_MAX_INDEX_SIZE
+#define SQL_MAXIMUM_INDEX_SIZE SQL_MAX_INDEX_SIZE
#define SQL_MAX_ROW_SIZE 104
-#define SQL_MAXIMUM_ROW_SIZE SQL_MAX_ROW_SIZE
+#define SQL_MAXIMUM_ROW_SIZE SQL_MAX_ROW_SIZE
#define SQL_MAX_STATEMENT_LEN 105
-#define SQL_MAXIMUM_STATEMENT_LENGTH SQL_MAX_STATEMENT_LEN
+#define SQL_MAXIMUM_STATEMENT_LENGTH SQL_MAX_STATEMENT_LEN
#define SQL_MAX_TABLES_IN_SELECT 106
-#define SQL_MAXIMUM_TABLES_IN_SELECT SQL_MAX_TABLES_IN_SELECT
+#define SQL_MAXIMUM_TABLES_IN_SELECT SQL_MAX_TABLES_IN_SELECT
#define SQL_MAX_USER_NAME_LEN 107
-#define SQL_MAXIMUM_USER_NAME_LENGTH SQL_MAX_USER_NAME_LEN
+#define SQL_MAXIMUM_USER_NAME_LENGTH SQL_MAX_USER_NAME_LEN
#if (ODBCVER >= 0x0300)
#define SQL_OJ_CAPABILITIES 115
-#define SQL_OUTER_JOIN_CAPABILITIES SQL_OJ_CAPABILITIES
+#define SQL_OUTER_JOIN_CAPABILITIES SQL_OJ_CAPABILITIES
#endif /* ODBCVER >= 0x0300 */
#if (ODBCVER >= 0x0300)
@@ -463,34 +463,34 @@ extern "C" {
#define SQL_CATALOG_NAME 10003
#define SQL_COLLATION_SEQ 10004
#define SQL_MAX_IDENTIFIER_LEN 10005
-#define SQL_MAXIMUM_IDENTIFIER_LENGTH SQL_MAX_IDENTIFIER_LEN
+#define SQL_MAXIMUM_IDENTIFIER_LENGTH SQL_MAX_IDENTIFIER_LEN
#endif /* ODBCVER >= 0x0300 */
/* SQL_ALTER_TABLE bitmasks */
#if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN 0x00000001L
-#define SQL_AT_DROP_COLUMN 0x00000002L
+#define SQL_AT_ADD_COLUMN 0x00000001L
+#define SQL_AT_DROP_COLUMN 0x00000002L
#endif /* ODBCVER >= 0x0200 */
#if (ODBCVER >= 0x0300)
-#define SQL_AT_ADD_CONSTRAINT 0x00000008L
+#define SQL_AT_ADD_CONSTRAINT 0x00000008L
/* The following bitmasks are ODBC extensions and defined in sqlext.h
-*#define SQL_AT_COLUMN_SINGLE 0x00000020L
-*#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
-*#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
-*#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
-*#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
-*#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
-*#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
-*#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
-*#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
-*#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
-*#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
-*#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
-*#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
-*#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
-*#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
+*#define SQL_AT_COLUMN_SINGLE 0x00000020L
+*#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
+*#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
+*#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
+*#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
+*#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
+*#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
+*#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
+*#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
+*#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
+*#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
+*#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
+*#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
+*#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
+*#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
*/
#endif /* ODBCVER >= 0x0300 */
@@ -554,13 +554,13 @@ extern "C" {
/* SQL_TXN_ISOLATION_OPTION bitmasks */
#define SQL_TXN_READ_UNCOMMITTED 0x00000001L
-#define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED
+#define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED
#define SQL_TXN_READ_COMMITTED 0x00000002L
-#define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED
+#define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED
#define SQL_TXN_REPEATABLE_READ 0x00000004L
-#define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ
+#define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ
#define SQL_TXN_SERIALIZABLE 0x00000008L
-#define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE
+#define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE
/* SQL_NULL_COLLATION values */
#define SQL_NC_HIGH 0
@@ -600,10 +600,10 @@ extern "C" {
SQLRETURN SQL_API SQLColAttribute(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
- SQLSMALLINT *StringLength, SQLLEN *NumericAttribute
+ SQLSMALLINT *StringLength, SQLLEN *NumericAttribute
/* spec says (SQLPOINTER) not (SQLEN*) - PAH */ );
/* Ms now say SQLLEN* http://msdn.microsoft.com/library/en-us/odbc/htm/dasdkodbcoverview_64bit.asp - NG */
-
+
#endif
@@ -821,4 +821,4 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-#endif
+#endif
diff --git a/unixODBC/inc/sqlext.h b/unixODBC/inc/sqlext.h
index e35af92e3522..ca07d605dd40 100644
--- a/unixODBC/inc/sqlext.h
+++ b/unixODBC/inc/sqlext.h
@@ -17,7 +17,7 @@
#define SQLTables_TABLE_TYPE 4
#define SQLTables_REMARKS 5
-/* COLUMNS IN SQLColumns() RESULT SET */
+/* COLUMNS IN SQLColumns() RESULT SET */
#define SQLColumns_TABLE_CAT 1
#define SQLColumns_TABLE_SCHEM 2
#define SQLColumns_TABLE_NAME 3
@@ -48,32 +48,32 @@ extern "C" { /* Assume C declarations for C++ */
#endif
/* generally useful constants */
-#define SQL_SPEC_MAJOR 3 /* Major version of specification */
-#define SQL_SPEC_MINOR 52 /* Minor version of specification */
-#define SQL_SPEC_STRING "03.52" /* String constant for version */
+#define SQL_SPEC_MAJOR 3 /* Major version of specification */
+#define SQL_SPEC_MINOR 52 /* Minor version of specification */
+#define SQL_SPEC_STRING "03.52" /* String constant for version */
-#define SQL_SQLSTATE_SIZE 5 /* size of SQLSTATE */
-#define SQL_MAX_DSN_LENGTH 32 /* maximum data source name size */
+#define SQL_SQLSTATE_SIZE 5 /* size of SQLSTATE */
+#define SQL_MAX_DSN_LENGTH 32 /* maximum data source name size */
#define SQL_MAX_OPTION_STRING_LENGTH 256
/* return code SQL_NO_DATA_FOUND is the same as SQL_NO_DATA */
#if (ODBCVER < 0x0300)
-#define SQL_NO_DATA_FOUND 100
+#define SQL_NO_DATA_FOUND 100
#else
-#define SQL_NO_DATA_FOUND SQL_NO_DATA
+#define SQL_NO_DATA_FOUND SQL_NO_DATA
#endif
/* an end handle type */
#if (ODBCVER >= 0x0300)
-#define SQL_HANDLE_SENV 5
+#define SQL_HANDLE_SENV 5
#endif /* ODBCVER >= 0x0300 */
/* env attribute */
#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_ODBC_VERSION 200
-#define SQL_ATTR_CONNECTION_POOLING 201
-#define SQL_ATTR_CP_MATCH 202
+#define SQL_ATTR_ODBC_VERSION 200
+#define SQL_ATTR_CONNECTION_POOLING 201
+#define SQL_ATTR_CP_MATCH 202
/* unixODBC additions */
#define SQL_ATTR_UNIXODBC_SYSPATH 65001
@@ -83,19 +83,19 @@ extern "C" { /* Assume C declarations for C++ */
#if (ODBCVER >= 0x0300)
/* values for SQL_ATTR_CONNECTION_POOLING */
-#define SQL_CP_OFF 0UL
-#define SQL_CP_ONE_PER_DRIVER 1UL
-#define SQL_CP_ONE_PER_HENV 2UL
-#define SQL_CP_DEFAULT SQL_CP_OFF
+#define SQL_CP_OFF 0UL
+#define SQL_CP_ONE_PER_DRIVER 1UL
+#define SQL_CP_ONE_PER_HENV 2UL
+#define SQL_CP_DEFAULT SQL_CP_OFF
/* values for SQL_ATTR_CP_MATCH */
-#define SQL_CP_STRICT_MATCH 0UL
-#define SQL_CP_RELAXED_MATCH 1UL
-#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
+#define SQL_CP_STRICT_MATCH 0UL
+#define SQL_CP_RELAXED_MATCH 1UL
+#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
/* values for SQL_ATTR_ODBC_VERSION */
-#define SQL_OV_ODBC2 2UL
-#define SQL_OV_ODBC3 3UL
+#define SQL_OV_ODBC2 2UL
+#define SQL_OV_ODBC3 3UL
#endif /* ODBCVER >= 0x0300 */
/* connection attributes */
@@ -114,30 +114,30 @@ extern "C" { /* Assume C declarations for C++ */
/* connection attributes with new names */
#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_ACCESS_MODE SQL_ACCESS_MODE
-#define SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT
-#define SQL_ATTR_CONNECTION_TIMEOUT 113
-#define SQL_ATTR_CURRENT_CATALOG SQL_CURRENT_QUALIFIER
-#define SQL_ATTR_DISCONNECT_BEHAVIOR 114
-#define SQL_ATTR_ENLIST_IN_DTC 1207
-#define SQL_ATTR_ENLIST_IN_XA 1208
-#define SQL_ATTR_LOGIN_TIMEOUT SQL_LOGIN_TIMEOUT
-#define SQL_ATTR_ODBC_CURSORS SQL_ODBC_CURSORS
-#define SQL_ATTR_PACKET_SIZE SQL_PACKET_SIZE
-#define SQL_ATTR_QUIET_MODE SQL_QUIET_MODE
-#define SQL_ATTR_TRACE SQL_OPT_TRACE
-#define SQL_ATTR_TRACEFILE SQL_OPT_TRACEFILE
-#define SQL_ATTR_TRANSLATE_LIB SQL_TRANSLATE_DLL
-#define SQL_ATTR_TRANSLATE_OPTION SQL_TRANSLATE_OPTION
-#define SQL_ATTR_TXN_ISOLATION SQL_TXN_ISOLATION
+#define SQL_ATTR_ACCESS_MODE SQL_ACCESS_MODE
+#define SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT
+#define SQL_ATTR_CONNECTION_TIMEOUT 113
+#define SQL_ATTR_CURRENT_CATALOG SQL_CURRENT_QUALIFIER
+#define SQL_ATTR_DISCONNECT_BEHAVIOR 114
+#define SQL_ATTR_ENLIST_IN_DTC 1207
+#define SQL_ATTR_ENLIST_IN_XA 1208
+#define SQL_ATTR_LOGIN_TIMEOUT SQL_LOGIN_TIMEOUT
+#define SQL_ATTR_ODBC_CURSORS SQL_ODBC_CURSORS
+#define SQL_ATTR_PACKET_SIZE SQL_PACKET_SIZE
+#define SQL_ATTR_QUIET_MODE SQL_QUIET_MODE
+#define SQL_ATTR_TRACE SQL_OPT_TRACE
+#define SQL_ATTR_TRACEFILE SQL_OPT_TRACEFILE
+#define SQL_ATTR_TRANSLATE_LIB SQL_TRANSLATE_DLL
+#define SQL_ATTR_TRANSLATE_OPTION SQL_TRANSLATE_OPTION
+#define SQL_ATTR_TXN_ISOLATION SQL_TXN_ISOLATION
#endif /* ODBCVER >= 0x0300 */
-#define SQL_ATTR_CONNECTION_DEAD 1209 /* GetConnectAttr only */
+#define SQL_ATTR_CONNECTION_DEAD 1209 /* GetConnectAttr only */
-#define SQL_ATTR_DRIVER_THREADING 1028 /* Driver threading level */
+#define SQL_ATTR_DRIVER_THREADING 1028 /* Driver threading level */
#if (ODBCVER >= 0x0351)
-/* ODBC Driver Manager sets this connection attribute to a unicode driver
+/* ODBC Driver Manager sets this connection attribute to a unicode driver
(which supports SQLConnectW) when the application is an ANSI application
(which calls SQLConnect, SQLDriverConnect, or SQLBrowseConnect).
This is SetConnectAttr only and application does not set this attribute
@@ -149,7 +149,7 @@ extern "C" { /* Assume C declarations for C++ */
the driver manager treates ANSI and Unicode connections differently in
connection pooling.
*/
-#define SQL_ATTR_ANSI_APP 115
+#define SQL_ATTR_ANSI_APP 115
#endif
/* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */
@@ -189,99 +189,99 @@ extern "C" { /* Assume C declarations for C++ */
#if (ODBCVER >= 0x0300)
/* values for SQL_ATTR_DISCONNECT_BEHAVIOR */
-#define SQL_DB_RETURN_TO_POOL 0UL
-#define SQL_DB_DISCONNECT 1UL
-#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
+#define SQL_DB_RETURN_TO_POOL 0UL
+#define SQL_DB_DISCONNECT 1UL
+#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
/* values for SQL_ATTR_ENLIST_IN_DTC */
-#define SQL_DTC_DONE 0L
+#define SQL_DTC_DONE 0L
#endif /* ODBCVER >= 0x0300 */
/* values for SQL_ATTR_CONNECTION_DEAD */
-#define SQL_CD_TRUE 1L /* Connection is closed/dead */
-#define SQL_CD_FALSE 0L /* Connection is open/available */
+#define SQL_CD_TRUE 1L /* Connection is closed/dead */
+#define SQL_CD_FALSE 0L /* Connection is open/available */
/* values for SQL_ATTR_ANSI_APP */
#if (ODBCVER >= 0x0351)
-#define SQL_AA_TRUE 1L /* the application is an ANSI app */
-#define SQL_AA_FALSE 0L /* the application is a Unicode app */
+#define SQL_AA_TRUE 1L /* the application is an ANSI app */
+#define SQL_AA_FALSE 0L /* the application is a Unicode app */
#endif
/* statement attributes */
-#define SQL_QUERY_TIMEOUT 0
-#define SQL_MAX_ROWS 1
-#define SQL_NOSCAN 2
-#define SQL_MAX_LENGTH 3
-#define SQL_ASYNC_ENABLE 4 /* same as SQL_ATTR_ASYNC_ENABLE */
-#define SQL_BIND_TYPE 5
-#define SQL_CURSOR_TYPE 6
-#define SQL_CONCURRENCY 7
-#define SQL_KEYSET_SIZE 8
-#define SQL_ROWSET_SIZE 9
-#define SQL_SIMULATE_CURSOR 10
-#define SQL_RETRIEVE_DATA 11
-#define SQL_USE_BOOKMARKS 12
-#define SQL_GET_BOOKMARK 13 /* GetStmtOption Only */
-#define SQL_ROW_NUMBER 14 /* GetStmtOption Only */
+#define SQL_QUERY_TIMEOUT 0
+#define SQL_MAX_ROWS 1
+#define SQL_NOSCAN 2
+#define SQL_MAX_LENGTH 3
+#define SQL_ASYNC_ENABLE 4 /* same as SQL_ATTR_ASYNC_ENABLE */
+#define SQL_BIND_TYPE 5
+#define SQL_CURSOR_TYPE 6
+#define SQL_CONCURRENCY 7
+#define SQL_KEYSET_SIZE 8
+#define SQL_ROWSET_SIZE 9
+#define SQL_SIMULATE_CURSOR 10
+#define SQL_RETRIEVE_DATA 11
+#define SQL_USE_BOOKMARKS 12
+#define SQL_GET_BOOKMARK 13 /* GetStmtOption Only */
+#define SQL_ROW_NUMBER 14 /* GetStmtOption Only */
/* statement attributes for ODBC 3.0 */
#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_ASYNC_ENABLE 4
-#define SQL_ATTR_CONCURRENCY SQL_CONCURRENCY
-#define SQL_ATTR_CURSOR_TYPE SQL_CURSOR_TYPE
-#define SQL_ATTR_ENABLE_AUTO_IPD 15
-#define SQL_ATTR_FETCH_BOOKMARK_PTR 16
-#define SQL_ATTR_KEYSET_SIZE SQL_KEYSET_SIZE
-#define SQL_ATTR_MAX_LENGTH SQL_MAX_LENGTH
-#define SQL_ATTR_MAX_ROWS SQL_MAX_ROWS
-#define SQL_ATTR_NOSCAN SQL_NOSCAN
-#define SQL_ATTR_PARAM_BIND_OFFSET_PTR 17
-#define SQL_ATTR_PARAM_BIND_TYPE 18
-#define SQL_ATTR_PARAM_OPERATION_PTR 19
-#define SQL_ATTR_PARAM_STATUS_PTR 20
-#define SQL_ATTR_PARAMS_PROCESSED_PTR 21
-#define SQL_ATTR_PARAMSET_SIZE 22
-#define SQL_ATTR_QUERY_TIMEOUT SQL_QUERY_TIMEOUT
-#define SQL_ATTR_RETRIEVE_DATA SQL_RETRIEVE_DATA
-#define SQL_ATTR_ROW_BIND_OFFSET_PTR 23
-#define SQL_ATTR_ROW_BIND_TYPE SQL_BIND_TYPE
-#define SQL_ATTR_ROW_NUMBER SQL_ROW_NUMBER /*GetStmtAttr*/
-#define SQL_ATTR_ROW_OPERATION_PTR 24
-#define SQL_ATTR_ROW_STATUS_PTR 25
-#define SQL_ATTR_ROWS_FETCHED_PTR 26
-#define SQL_ATTR_ROW_ARRAY_SIZE 27
-#define SQL_ATTR_SIMULATE_CURSOR SQL_SIMULATE_CURSOR
-#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
+#define SQL_ATTR_ASYNC_ENABLE 4
+#define SQL_ATTR_CONCURRENCY SQL_CONCURRENCY
+#define SQL_ATTR_CURSOR_TYPE SQL_CURSOR_TYPE
+#define SQL_ATTR_ENABLE_AUTO_IPD 15
+#define SQL_ATTR_FETCH_BOOKMARK_PTR 16
+#define SQL_ATTR_KEYSET_SIZE SQL_KEYSET_SIZE
+#define SQL_ATTR_MAX_LENGTH SQL_MAX_LENGTH
+#define SQL_ATTR_MAX_ROWS SQL_MAX_ROWS
+#define SQL_ATTR_NOSCAN SQL_NOSCAN
+#define SQL_ATTR_PARAM_BIND_OFFSET_PTR 17
+#define SQL_ATTR_PARAM_BIND_TYPE 18
+#define SQL_ATTR_PARAM_OPERATION_PTR 19
+#define SQL_ATTR_PARAM_STATUS_PTR 20
+#define SQL_ATTR_PARAMS_PROCESSED_PTR 21
+#define SQL_ATTR_PARAMSET_SIZE 22
+#define SQL_ATTR_QUERY_TIMEOUT SQL_QUERY_TIMEOUT
+#define SQL_ATTR_RETRIEVE_DATA SQL_RETRIEVE_DATA
+#define SQL_ATTR_ROW_BIND_OFFSET_PTR 23
+#define SQL_ATTR_ROW_BIND_TYPE SQL_BIND_TYPE
+#define SQL_ATTR_ROW_NUMBER SQL_ROW_NUMBER /*GetStmtAttr*/
+#define SQL_ATTR_ROW_OPERATION_PTR 24
+#define SQL_ATTR_ROW_STATUS_PTR 25
+#define SQL_ATTR_ROWS_FETCHED_PTR 26
+#define SQL_ATTR_ROW_ARRAY_SIZE 27
+#define SQL_ATTR_SIMULATE_CURSOR SQL_SIMULATE_CURSOR
+#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
#endif /* ODBCVER >= 0x0300 */
#if (ODBCVER < 0x0300)
#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER
-#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT
-#endif /* ODBCVER < 0x0300 */
+#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT
+#endif /* ODBCVER < 0x0300 */
/* New defines for SEARCHABLE column in SQLGetTypeInfo */
#if (ODBCVER >= 0x0300)
-#define SQL_COL_PRED_CHAR SQL_LIKE_ONLY
-#define SQL_COL_PRED_BASIC SQL_ALL_EXCEPT_LIKE
+#define SQL_COL_PRED_CHAR SQL_LIKE_ONLY
+#define SQL_COL_PRED_BASIC SQL_ALL_EXCEPT_LIKE
#endif /* ODBCVER >= 0x0300 */
/* whether an attribute is a pointer or not */
#if (ODBCVER >= 0x0300)
-#define SQL_IS_POINTER (-4)
-#define SQL_IS_UINTEGER (-5)
-#define SQL_IS_INTEGER (-6)
-#define SQL_IS_USMALLINT (-7)
-#define SQL_IS_SMALLINT (-8)
+#define SQL_IS_POINTER (-4)
+#define SQL_IS_UINTEGER (-5)
+#define SQL_IS_INTEGER (-6)
+#define SQL_IS_USMALLINT (-7)
+#define SQL_IS_SMALLINT (-8)
#endif /* ODBCVER >= 0x0300 */
/* the value of SQL_ATTR_PARAM_BIND_TYPE */
#if (ODBCVER >= 0x0300)
-#define SQL_PARAM_BIND_BY_COLUMN 0UL
-#define SQL_PARAM_BIND_TYPE_DEFAULT SQL_PARAM_BIND_BY_COLUMN
+#define SQL_PARAM_BIND_BY_COLUMN 0UL
+#define SQL_PARAM_BIND_TYPE_DEFAULT SQL_PARAM_BIND_BY_COLUMN
#endif /* ODBCVER >= 0x0300 */
/* SQL_QUERY_TIMEOUT options */
@@ -299,8 +299,8 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_MAX_LENGTH_DEFAULT 0UL
/* values for SQL_ATTR_ASYNC_ENABLE */
-#define SQL_ASYNC_ENABLE_OFF 0UL
-#define SQL_ASYNC_ENABLE_ON 1UL
+#define SQL_ASYNC_ENABLE_OFF 0UL
+#define SQL_ASYNC_ENABLE_ON 1UL
#define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF
/* SQL_BIND_TYPE options */
@@ -339,62 +339,62 @@ extern "C" { /* Assume C declarations for C++ */
/* SQL_USE_BOOKMARKS options */
#define SQL_UB_OFF 0UL
-#define SQL_UB_ON 01UL
+#define SQL_UB_ON 01UL
#define SQL_UB_DEFAULT SQL_UB_OFF
/* New values for SQL_USE_BOOKMARKS attribute */
#if (ODBCVER >= 0x0300)
-#define SQL_UB_FIXED SQL_UB_ON
-#define SQL_UB_VARIABLE 2UL
+#define SQL_UB_FIXED SQL_UB_ON
+#define SQL_UB_VARIABLE 2UL
#endif /* ODBCVER >= 0x0300 */
/* extended descriptor field */
#if (ODBCVER >= 0x0300)
-#define SQL_DESC_ARRAY_SIZE 20
-#define SQL_DESC_ARRAY_STATUS_PTR 21
-#define SQL_DESC_AUTO_UNIQUE_VALUE SQL_COLUMN_AUTO_INCREMENT
-#define SQL_DESC_BASE_COLUMN_NAME 22
-#define SQL_DESC_BASE_TABLE_NAME 23
-#define SQL_DESC_BIND_OFFSET_PTR 24
-#define SQL_DESC_BIND_TYPE 25
-#define SQL_DESC_CASE_SENSITIVE SQL_COLUMN_CASE_SENSITIVE
-#define SQL_DESC_CATALOG_NAME SQL_COLUMN_QUALIFIER_NAME
-#define SQL_DESC_CONCISE_TYPE SQL_COLUMN_TYPE
-#define SQL_DESC_DATETIME_INTERVAL_PRECISION 26
-#define SQL_DESC_DISPLAY_SIZE SQL_COLUMN_DISPLAY_SIZE
-#define SQL_DESC_FIXED_PREC_SCALE SQL_COLUMN_MONEY
-#define SQL_DESC_LABEL SQL_COLUMN_LABEL
-#define SQL_DESC_LITERAL_PREFIX 27
-#define SQL_DESC_LITERAL_SUFFIX 28
-#define SQL_DESC_LOCAL_TYPE_NAME 29
-#define SQL_DESC_MAXIMUM_SCALE 30
-#define SQL_DESC_MINIMUM_SCALE 31
-#define SQL_DESC_NUM_PREC_RADIX 32
-#define SQL_DESC_PARAMETER_TYPE 33
-#define SQL_DESC_ROWS_PROCESSED_PTR 34
+#define SQL_DESC_ARRAY_SIZE 20
+#define SQL_DESC_ARRAY_STATUS_PTR 21
+#define SQL_DESC_AUTO_UNIQUE_VALUE SQL_COLUMN_AUTO_INCREMENT
+#define SQL_DESC_BASE_COLUMN_NAME 22
+#define SQL_DESC_BASE_TABLE_NAME 23
+#define SQL_DESC_BIND_OFFSET_PTR 24
+#define SQL_DESC_BIND_TYPE 25
+#define SQL_DESC_CASE_SENSITIVE SQL_COLUMN_CASE_SENSITIVE
+#define SQL_DESC_CATALOG_NAME SQL_COLUMN_QUALIFIER_NAME
+#define SQL_DESC_CONCISE_TYPE SQL_COLUMN_TYPE
+#define SQL_DESC_DATETIME_INTERVAL_PRECISION 26
+#define SQL_DESC_DISPLAY_SIZE SQL_COLUMN_DISPLAY_SIZE
+#define SQL_DESC_FIXED_PREC_SCALE SQL_COLUMN_MONEY
+#define SQL_DESC_LABEL SQL_COLUMN_LABEL
+#define SQL_DESC_LITERAL_PREFIX 27
+#define SQL_DESC_LITERAL_SUFFIX 28
+#define SQL_DESC_LOCAL_TYPE_NAME 29
+#define SQL_DESC_MAXIMUM_SCALE 30
+#define SQL_DESC_MINIMUM_SCALE 31
+#define SQL_DESC_NUM_PREC_RADIX 32
+#define SQL_DESC_PARAMETER_TYPE 33
+#define SQL_DESC_ROWS_PROCESSED_PTR 34
#if (ODBCVER >= 0x0350)
-#define SQL_DESC_ROWVER 35
+#define SQL_DESC_ROWVER 35
#endif /* ODBCVER >= 0x0350 */
-#define SQL_DESC_SCHEMA_NAME SQL_COLUMN_OWNER_NAME
-#define SQL_DESC_SEARCHABLE SQL_COLUMN_SEARCHABLE
-#define SQL_DESC_TYPE_NAME SQL_COLUMN_TYPE_NAME
-#define SQL_DESC_TABLE_NAME SQL_COLUMN_TABLE_NAME
-#define SQL_DESC_UNSIGNED SQL_COLUMN_UNSIGNED
-#define SQL_DESC_UPDATABLE SQL_COLUMN_UPDATABLE
+#define SQL_DESC_SCHEMA_NAME SQL_COLUMN_OWNER_NAME
+#define SQL_DESC_SEARCHABLE SQL_COLUMN_SEARCHABLE
+#define SQL_DESC_TYPE_NAME SQL_COLUMN_TYPE_NAME
+#define SQL_DESC_TABLE_NAME SQL_COLUMN_TABLE_NAME
+#define SQL_DESC_UNSIGNED SQL_COLUMN_UNSIGNED
+#define SQL_DESC_UPDATABLE SQL_COLUMN_UPDATABLE
#endif /* ODBCVER >= 0x0300 */
/* defines for diagnostics fields */
#if (ODBCVER >= 0x0300)
-#define SQL_DIAG_CURSOR_ROW_COUNT (-1249)
-#define SQL_DIAG_ROW_NUMBER (-1248)
-#define SQL_DIAG_COLUMN_NUMBER (-1247)
+#define SQL_DIAG_CURSOR_ROW_COUNT (-1249)
+#define SQL_DIAG_ROW_NUMBER (-1248)
+#define SQL_DIAG_COLUMN_NUMBER (-1247)
#endif /* ODBCVER >= 0x0300 */
/* SQL extended datatypes */
#define SQL_DATE 9
#if (ODBCVER >= 0x0300)
-#define SQL_INTERVAL 10
+#define SQL_INTERVAL 10
#endif /* ODBCVER >= 0x0300 */
#define SQL_TIME 10
#define SQL_TIMESTAMP 11
@@ -406,38 +406,38 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_TINYINT (-6)
#define SQL_BIT (-7)
#if (ODBCVER >= 0x0350)
-#define SQL_GUID (-11)
+#define SQL_GUID (-11)
#endif /* ODBCVER >= 0x0350 */
#if (ODBCVER >= 0x0300)
/* interval code */
-#define SQL_CODE_YEAR 1
-#define SQL_CODE_MONTH 2
-#define SQL_CODE_DAY 3
-#define SQL_CODE_HOUR 4
-#define SQL_CODE_MINUTE 5
-#define SQL_CODE_SECOND 6
-#define SQL_CODE_YEAR_TO_MONTH 7
-#define SQL_CODE_DAY_TO_HOUR 8
-#define SQL_CODE_DAY_TO_MINUTE 9
-#define SQL_CODE_DAY_TO_SECOND 10
-#define SQL_CODE_HOUR_TO_MINUTE 11
-#define SQL_CODE_HOUR_TO_SECOND 12
-#define SQL_CODE_MINUTE_TO_SECOND 13
-
-#define SQL_INTERVAL_YEAR (100 + SQL_CODE_YEAR)
-#define SQL_INTERVAL_MONTH (100 + SQL_CODE_MONTH)
-#define SQL_INTERVAL_DAY (100 + SQL_CODE_DAY)
-#define SQL_INTERVAL_HOUR (100 + SQL_CODE_HOUR)
-#define SQL_INTERVAL_MINUTE (100 + SQL_CODE_MINUTE)
-#define SQL_INTERVAL_SECOND (100 + SQL_CODE_SECOND)
-#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_YEAR_TO_MONTH)
-#define SQL_INTERVAL_DAY_TO_HOUR (100 + SQL_CODE_DAY_TO_HOUR)
-#define SQL_INTERVAL_DAY_TO_MINUTE (100 + SQL_CODE_DAY_TO_MINUTE)
-#define SQL_INTERVAL_DAY_TO_SECOND (100 + SQL_CODE_DAY_TO_SECOND)
-#define SQL_INTERVAL_HOUR_TO_MINUTE (100 + SQL_CODE_HOUR_TO_MINUTE)
-#define SQL_INTERVAL_HOUR_TO_SECOND (100 + SQL_CODE_HOUR_TO_SECOND)
-#define SQL_INTERVAL_MINUTE_TO_SECOND (100 + SQL_CODE_MINUTE_TO_SECOND)
+#define SQL_CODE_YEAR 1
+#define SQL_CODE_MONTH 2
+#define SQL_CODE_DAY 3
+#define SQL_CODE_HOUR 4
+#define SQL_CODE_MINUTE 5
+#define SQL_CODE_SECOND 6
+#define SQL_CODE_YEAR_TO_MONTH 7
+#define SQL_CODE_DAY_TO_HOUR 8
+#define SQL_CODE_DAY_TO_MINUTE 9
+#define SQL_CODE_DAY_TO_SECOND 10
+#define SQL_CODE_HOUR_TO_MINUTE 11
+#define SQL_CODE_HOUR_TO_SECOND 12
+#define SQL_CODE_MINUTE_TO_SECOND 13
+
+#define SQL_INTERVAL_YEAR (100 + SQL_CODE_YEAR)
+#define SQL_INTERVAL_MONTH (100 + SQL_CODE_MONTH)
+#define SQL_INTERVAL_DAY (100 + SQL_CODE_DAY)
+#define SQL_INTERVAL_HOUR (100 + SQL_CODE_HOUR)
+#define SQL_INTERVAL_MINUTE (100 + SQL_CODE_MINUTE)
+#define SQL_INTERVAL_SECOND (100 + SQL_CODE_SECOND)
+#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_YEAR_TO_MONTH)
+#define SQL_INTERVAL_DAY_TO_HOUR (100 + SQL_CODE_DAY_TO_HOUR)
+#define SQL_INTERVAL_DAY_TO_MINUTE (100 + SQL_CODE_DAY_TO_MINUTE)
+#define SQL_INTERVAL_DAY_TO_SECOND (100 + SQL_CODE_DAY_TO_SECOND)
+#define SQL_INTERVAL_HOUR_TO_MINUTE (100 + SQL_CODE_HOUR_TO_MINUTE)
+#define SQL_INTERVAL_HOUR_TO_SECOND (100 + SQL_CODE_HOUR_TO_SECOND)
+#define SQL_INTERVAL_MINUTE_TO_SECOND (100 + SQL_CODE_MINUTE_TO_SECOND)
#else
#define SQL_INTERVAL_YEAR (-80)
@@ -464,10 +464,10 @@ extern "C" { /* Assume C declarations for C++ */
#else
/* The previous definitions for SQL_UNICODE_ are historical and obsolete */
-#define SQL_UNICODE SQL_WCHAR
-#define SQL_UNICODE_VARCHAR SQL_WVARCHAR
-#define SQL_UNICODE_LONGVARCHAR SQL_WLONGVARCHAR
-#define SQL_UNICODE_CHAR SQL_WCHAR
+#define SQL_UNICODE SQL_WCHAR
+#define SQL_UNICODE_VARCHAR SQL_WVARCHAR
+#define SQL_UNICODE_LONGVARCHAR SQL_WLONGVARCHAR
+#define SQL_UNICODE_CHAR SQL_WCHAR
#endif
#if (ODBCVER < 0x0300)
@@ -483,7 +483,7 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_C_FLOAT SQL_REAL /* REAL */
#define SQL_C_DOUBLE SQL_DOUBLE /* FLOAT, DOUBLE */
#if (ODBCVER >= 0x0300)
-#define SQL_C_NUMERIC SQL_NUMERIC
+#define SQL_C_NUMERIC SQL_NUMERIC
#endif /* ODBCVER >= 0x0300 */
#define SQL_C_DEFAULT 99
@@ -495,28 +495,28 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_C_TIME SQL_TIME
#define SQL_C_TIMESTAMP SQL_TIMESTAMP
#if (ODBCVER >= 0x0300)
-#define SQL_C_TYPE_DATE SQL_TYPE_DATE
-#define SQL_C_TYPE_TIME SQL_TYPE_TIME
-#define SQL_C_TYPE_TIMESTAMP SQL_TYPE_TIMESTAMP
-#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR
-#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH
-#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY
-#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR
-#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE
-#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND
-#define SQL_C_INTERVAL_YEAR_TO_MONTH SQL_INTERVAL_YEAR_TO_MONTH
-#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR
-#define SQL_C_INTERVAL_DAY_TO_MINUTE SQL_INTERVAL_DAY_TO_MINUTE
-#define SQL_C_INTERVAL_DAY_TO_SECOND SQL_INTERVAL_DAY_TO_SECOND
-#define SQL_C_INTERVAL_HOUR_TO_MINUTE SQL_INTERVAL_HOUR_TO_MINUTE
-#define SQL_C_INTERVAL_HOUR_TO_SECOND SQL_INTERVAL_HOUR_TO_SECOND
-#define SQL_C_INTERVAL_MINUTE_TO_SECOND SQL_INTERVAL_MINUTE_TO_SECOND
+#define SQL_C_TYPE_DATE SQL_TYPE_DATE
+#define SQL_C_TYPE_TIME SQL_TYPE_TIME
+#define SQL_C_TYPE_TIMESTAMP SQL_TYPE_TIMESTAMP
+#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR
+#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH
+#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY
+#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR
+#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE
+#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND
+#define SQL_C_INTERVAL_YEAR_TO_MONTH SQL_INTERVAL_YEAR_TO_MONTH
+#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR
+#define SQL_C_INTERVAL_DAY_TO_MINUTE SQL_INTERVAL_DAY_TO_MINUTE
+#define SQL_C_INTERVAL_DAY_TO_SECOND SQL_INTERVAL_DAY_TO_SECOND
+#define SQL_C_INTERVAL_HOUR_TO_MINUTE SQL_INTERVAL_HOUR_TO_MINUTE
+#define SQL_C_INTERVAL_HOUR_TO_SECOND SQL_INTERVAL_HOUR_TO_SECOND
+#define SQL_C_INTERVAL_MINUTE_TO_SECOND SQL_INTERVAL_MINUTE_TO_SECOND
#endif /* ODBCVER >= 0x0300 */
#define SQL_C_BINARY SQL_BINARY
#define SQL_C_BIT SQL_BIT
#if (ODBCVER >= 0x0300)
-#define SQL_C_SBIGINT (SQL_BIGINT+SQL_SIGNED_OFFSET) /* SIGNED BIGINT */
-#define SQL_C_UBIGINT (SQL_BIGINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED BIGINT */
+#define SQL_C_SBIGINT (SQL_BIGINT+SQL_SIGNED_OFFSET) /* SIGNED BIGINT */
+#define SQL_C_UBIGINT (SQL_BIGINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED BIGINT */
#endif /* ODBCVER >= 0x0300 */
#define SQL_C_TINYINT SQL_TINYINT
#define SQL_C_SLONG (SQL_C_LONG+SQL_SIGNED_OFFSET) /* SIGNED INTEGER */
@@ -533,7 +533,7 @@ extern "C" { /* Assume C declarations for C++ */
#endif
#if (ODBCVER >= 0x0350)
-#define SQL_C_GUID SQL_GUID
+#define SQL_C_GUID SQL_GUID
#endif /* ODBCVER >= 0x0350 */
#define SQL_TYPE_NULL 0
@@ -543,29 +543,29 @@ extern "C" { /* Assume C declarations for C++ */
#endif
#if (ODBCVER >= 0x0300)
-#define SQL_C_VARBOOKMARK SQL_C_BINARY
+#define SQL_C_VARBOOKMARK SQL_C_BINARY
#endif /* ODBCVER >= 0x0300 */
/* define for SQL_DIAG_ROW_NUMBER and SQL_DIAG_COLUMN_NUMBER */
#if (ODBCVER >= 0x0300)
-#define SQL_NO_ROW_NUMBER (-1)
-#define SQL_NO_COLUMN_NUMBER (-1)
-#define SQL_ROW_NUMBER_UNKNOWN (-2)
-#define SQL_COLUMN_NUMBER_UNKNOWN (-2)
+#define SQL_NO_ROW_NUMBER (-1)
+#define SQL_NO_COLUMN_NUMBER (-1)
+#define SQL_ROW_NUMBER_UNKNOWN (-2)
+#define SQL_COLUMN_NUMBER_UNKNOWN (-2)
#endif
/* SQLBindParameter extensions */
#define SQL_DEFAULT_PARAM (-5)
#define SQL_IGNORE (-6)
#if (ODBCVER >= 0x0300)
-#define SQL_COLUMN_IGNORE SQL_IGNORE
+#define SQL_COLUMN_IGNORE SQL_IGNORE
#endif /* ODBCVER >= 0x0300 */
#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100)
#define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET)
/* binary length for driver specific attributes */
-#define SQL_LEN_BINARY_ATTR_OFFSET (-100)
-#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
+#define SQL_LEN_BINARY_ATTR_OFFSET (-100)
+#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
/* Defines used by Driver Manager when mapping SQLSetParam to SQLBindParameter
*/
@@ -610,7 +610,7 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_LIKE_ONLY 1
#define SQL_ALL_EXCEPT_LIKE 2
#define SQL_SEARCHABLE 3
-#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE
+#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE
/* Special return values for SQLGetData */
@@ -619,19 +619,19 @@ extern "C" { /* Assume C declarations for C++ */
/********************************************/
/* SQLGetFunctions: additional values for */
/* fFunction to represent functions that */
-/* are not in the X/Open spec. */
+/* are not in the X/Open spec. */
/********************************************/
#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLALLOCHANDLESTD 73
-#define SQL_API_SQLBULKOPERATIONS 24
+#define SQL_API_SQLALLOCHANDLESTD 73
+#define SQL_API_SQLBULKOPERATIONS 24
#endif /* ODBCVER >= 0x0300 */
#define SQL_API_SQLBINDPARAMETER 72
#define SQL_API_SQLBROWSECONNECT 55
#define SQL_API_SQLCOLATTRIBUTES 6
#define SQL_API_SQLCOLUMNPRIVILEGES 56
#define SQL_API_SQLDESCRIBEPARAM 58
-#define SQL_API_SQLDRIVERCONNECT 41
+#define SQL_API_SQLDRIVERCONNECT 41
#define SQL_API_SQLDRIVERS 71
#define SQL_API_SQLEXTENDEDFETCH 59
#define SQL_API_SQLFOREIGNKEYS 60
@@ -671,18 +671,18 @@ extern "C" { /* Assume C declarations for C++ */
/* method -- SQL_API_ODBC3_ALL_FUNCTIONS */
/*--------------------------------------------*/
-#define SQL_API_ALL_FUNCTIONS 0 /* See CAUTION above */
+#define SQL_API_ALL_FUNCTIONS 0 /* See CAUTION above */
/*----------------------------------------------*/
-/* 2.X drivers export a dummy function with */
+/* 2.X drivers export a dummy function with */
/* ordinal number SQL_API_LOADBYORDINAL to speed*/
/* loading under the windows operating system. */
-/* */
+/* */
/* CAUTION: Loading by ordinal is not supported */
-/* for 3.0 and above drivers. */
+/* for 3.0 and above drivers. */
/*----------------------------------------------*/
-#define SQL_API_LOADBYORDINAL 199 /* See CAUTION above */
+#define SQL_API_LOADBYORDINAL 199 /* See CAUTION above */
/*----------------------------------------------*/
/* SQL_API_ODBC3_ALL_FUNCTIONS */
@@ -694,8 +694,8 @@ extern "C" { /* Assume C declarations for C++ */
#if (ODBCVER >= 0x0300)
-#define SQL_API_ODBC3_ALL_FUNCTIONS 999
-#define SQL_API_ODBC3_ALL_FUNCTIONS_SIZE 250 /* array of 250 words */
+#define SQL_API_ODBC3_ALL_FUNCTIONS 999
+#define SQL_API_ODBC3_ALL_FUNCTIONS_SIZE 250 /* array of 250 words */
#define SQL_FUNC_EXISTS(pfExists, uwAPI) ((*(((UWORD*) (pfExists)) + ((uwAPI) >> 4)) & (1 << ((uwAPI) & 0x000F)) ) ? SQL_TRUE : SQL_FALSE )
@@ -704,7 +704,7 @@ extern "C" { /* Assume C declarations for C++ */
/************************************************/
-/* Extended definitions for SQLGetInfo */
+/* Extended definitions for SQLGetInfo */
/************************************************/
/*---------------------------------*/
@@ -712,9 +712,9 @@ extern "C" { /* Assume C declarations for C++ */
/* in the X/Open spec */
/*---------------------------------*/
-#define SQL_INFO_FIRST 0
-#define SQL_ACTIVE_CONNECTIONS 0 /* MAX_DRIVER_CONNECTIONS */
-#define SQL_ACTIVE_STATEMENTS 1 /* MAX_CONCURRENT_ACTIVITIES */
+#define SQL_INFO_FIRST 0
+#define SQL_ACTIVE_CONNECTIONS 0 /* MAX_DRIVER_CONNECTIONS */
+#define SQL_ACTIVE_STATEMENTS 1 /* MAX_CONCURRENT_ACTIVITIES */
#define SQL_DRIVER_HDBC 3
#define SQL_DRIVER_HENV 4
#define SQL_DRIVER_HSTMT 5
@@ -729,9 +729,9 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_CONCAT_NULL_BEHAVIOR 22
#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24
#define SQL_EXPRESSIONS_IN_ORDERBY 27
-#define SQL_MAX_OWNER_NAME_LEN 32 /* MAX_SCHEMA_NAME_LEN */
+#define SQL_MAX_OWNER_NAME_LEN 32 /* MAX_SCHEMA_NAME_LEN */
#define SQL_MAX_PROCEDURE_NAME_LEN 33
-#define SQL_MAX_QUALIFIER_NAME_LEN 34 /* MAX_CATALOG_NAME_LEN */
+#define SQL_MAX_QUALIFIER_NAME_LEN 34 /* MAX_CATALOG_NAME_LEN */
#define SQL_MULT_RESULT_SETS 36
#define SQL_MULTIPLE_ACTIVE_TXN 37
#define SQL_OUTER_JOINS 38
@@ -765,8 +765,8 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_CONVERT_VARBINARY 69
#define SQL_CONVERT_VARCHAR 70
#define SQL_CONVERT_LONGVARBINARY 71
-#define SQL_CONVERT_GUID 173
-#define SQL_ODBC_SQL_OPT_IEF 73 /* SQL_INTEGRITY */
+#define SQL_CONVERT_GUID 173
+#define SQL_ODBC_SQL_OPT_IEF 73 /* SQL_INTEGRITY */
#define SQL_CORRELATION_NAME 74
#define SQL_NON_NULLABLE_COLUMNS 75
#define SQL_DRIVER_HLIB 76
@@ -803,119 +803,119 @@ extern "C" { /* Assume C declarations for C++ */
/*----------------------------------------------*/
/* SQL_INFO_LAST and SQL_INFO_DRIVER_START are */
/* not useful anymore, because X/Open has */
-/* values in the 10000 range. You */
-/* must contact X/Open directly to get a range */
-/* of numbers for driver-specific values. */
+/* values in the 10000 range. You */
+/* must contact X/Open directly to get a range */
+/* of numbers for driver-specific values. */
/*----------------------------------------------*/
#if (ODBCVER < 0x0300)
-#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION
-#define SQL_INFO_DRIVER_START 1000
+#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION
+#define SQL_INFO_DRIVER_START 1000
#endif /* ODBCVER < 0x0300 */
/*-----------------------------------------------*/
/* ODBC 3.0 SQLGetInfo values that are not part */
/* of the X/Open standard at this time. X/Open */
-/* standard values are in sql.h. */
+/* standard values are in sql.h. */
/*-----------------------------------------------*/
#if (ODBCVER >= 0x0300)
-#define SQL_ACTIVE_ENVIRONMENTS 116
-#define SQL_ALTER_DOMAIN 117
-
-#define SQL_SQL_CONFORMANCE 118
-#define SQL_DATETIME_LITERALS 119
-
-#define SQL_ASYNC_MODE 10021 /* new X/Open spec */
-#define SQL_BATCH_ROW_COUNT 120
-#define SQL_BATCH_SUPPORT 121
-#define SQL_CATALOG_LOCATION SQL_QUALIFIER_LOCATION
-#define SQL_CATALOG_NAME_SEPARATOR SQL_QUALIFIER_NAME_SEPARATOR
-#define SQL_CATALOG_TERM SQL_QUALIFIER_TERM
-#define SQL_CATALOG_USAGE SQL_QUALIFIER_USAGE
-#define SQL_CONVERT_WCHAR 122
-#define SQL_CONVERT_INTERVAL_DAY_TIME 123
-#define SQL_CONVERT_INTERVAL_YEAR_MONTH 124
-#define SQL_CONVERT_WLONGVARCHAR 125
-#define SQL_CONVERT_WVARCHAR 126
-#define SQL_CREATE_ASSERTION 127
-#define SQL_CREATE_CHARACTER_SET 128
-#define SQL_CREATE_COLLATION 129
-#define SQL_CREATE_DOMAIN 130
-#define SQL_CREATE_SCHEMA 131
-#define SQL_CREATE_TABLE 132
-#define SQL_CREATE_TRANSLATION 133
-#define SQL_CREATE_VIEW 134
-#define SQL_DRIVER_HDESC 135
-#define SQL_DROP_ASSERTION 136
-#define SQL_DROP_CHARACTER_SET 137
-#define SQL_DROP_COLLATION 138
-#define SQL_DROP_DOMAIN 139
-#define SQL_DROP_SCHEMA 140
-#define SQL_DROP_TABLE 141
-#define SQL_DROP_TRANSLATION 142
-#define SQL_DROP_VIEW 143
-#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1 144
-#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2 145
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 147
-#define SQL_INDEX_KEYWORDS 148
-#define SQL_INFO_SCHEMA_VIEWS 149
-#define SQL_KEYSET_CURSOR_ATTRIBUTES1 150
-#define SQL_KEYSET_CURSOR_ATTRIBUTES2 151
-#define SQL_MAX_ASYNC_CONCURRENT_STATEMENTS 10022 /* new X/Open spec */
-#define SQL_ODBC_INTERFACE_CONFORMANCE 152
-#define SQL_PARAM_ARRAY_ROW_COUNTS 153
-#define SQL_PARAM_ARRAY_SELECTS 154
-#define SQL_SCHEMA_TERM SQL_OWNER_TERM
-#define SQL_SCHEMA_USAGE SQL_OWNER_USAGE
-#define SQL_SQL92_DATETIME_FUNCTIONS 155
-#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156
-#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157
-#define SQL_SQL92_GRANT 158
-#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS 159
-#define SQL_SQL92_PREDICATES 160
-#define SQL_SQL92_RELATIONAL_JOIN_OPERATORS 161
-#define SQL_SQL92_REVOKE 162
-#define SQL_SQL92_ROW_VALUE_CONSTRUCTOR 163
-#define SQL_SQL92_STRING_FUNCTIONS 164
-#define SQL_SQL92_VALUE_EXPRESSIONS 165
-#define SQL_STANDARD_CLI_CONFORMANCE 166
-#define SQL_STATIC_CURSOR_ATTRIBUTES1 167
-#define SQL_STATIC_CURSOR_ATTRIBUTES2 168
-
-#define SQL_AGGREGATE_FUNCTIONS 169
-#define SQL_DDL_INDEX 170
-#define SQL_DM_VER 171
-#define SQL_INSERT_STATEMENT 172
-#define SQL_UNION_STATEMENT SQL_UNION
+#define SQL_ACTIVE_ENVIRONMENTS 116
+#define SQL_ALTER_DOMAIN 117
+
+#define SQL_SQL_CONFORMANCE 118
+#define SQL_DATETIME_LITERALS 119
+
+#define SQL_ASYNC_MODE 10021 /* new X/Open spec */
+#define SQL_BATCH_ROW_COUNT 120
+#define SQL_BATCH_SUPPORT 121
+#define SQL_CATALOG_LOCATION SQL_QUALIFIER_LOCATION
+#define SQL_CATALOG_NAME_SEPARATOR SQL_QUALIFIER_NAME_SEPARATOR
+#define SQL_CATALOG_TERM SQL_QUALIFIER_TERM
+#define SQL_CATALOG_USAGE SQL_QUALIFIER_USAGE
+#define SQL_CONVERT_WCHAR 122
+#define SQL_CONVERT_INTERVAL_DAY_TIME 123
+#define SQL_CONVERT_INTERVAL_YEAR_MONTH 124
+#define SQL_CONVERT_WLONGVARCHAR 125
+#define SQL_CONVERT_WVARCHAR 126
+#define SQL_CREATE_ASSERTION 127
+#define SQL_CREATE_CHARACTER_SET 128
+#define SQL_CREATE_COLLATION 129
+#define SQL_CREATE_DOMAIN 130
+#define SQL_CREATE_SCHEMA 131
+#define SQL_CREATE_TABLE 132
+#define SQL_CREATE_TRANSLATION 133
+#define SQL_CREATE_VIEW 134
+#define SQL_DRIVER_HDESC 135
+#define SQL_DROP_ASSERTION 136
+#define SQL_DROP_CHARACTER_SET 137
+#define SQL_DROP_COLLATION 138
+#define SQL_DROP_DOMAIN 139
+#define SQL_DROP_SCHEMA 140
+#define SQL_DROP_TABLE 141
+#define SQL_DROP_TRANSLATION 142
+#define SQL_DROP_VIEW 143
+#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1 144
+#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2 145
+#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146
+#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 147
+#define SQL_INDEX_KEYWORDS 148
+#define SQL_INFO_SCHEMA_VIEWS 149
+#define SQL_KEYSET_CURSOR_ATTRIBUTES1 150
+#define SQL_KEYSET_CURSOR_ATTRIBUTES2 151
+#define SQL_MAX_ASYNC_CONCURRENT_STATEMENTS 10022 /* new X/Open spec */
+#define SQL_ODBC_INTERFACE_CONFORMANCE 152
+#define SQL_PARAM_ARRAY_ROW_COUNTS 153
+#define SQL_PARAM_ARRAY_SELECTS 154
+#define SQL_SCHEMA_TERM SQL_OWNER_TERM
+#define SQL_SCHEMA_USAGE SQL_OWNER_USAGE
+#define SQL_SQL92_DATETIME_FUNCTIONS 155
+#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156
+#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157
+#define SQL_SQL92_GRANT 158
+#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS 159
+#define SQL_SQL92_PREDICATES 160
+#define SQL_SQL92_RELATIONAL_JOIN_OPERATORS 161
+#define SQL_SQL92_REVOKE 162
+#define SQL_SQL92_ROW_VALUE_CONSTRUCTOR 163
+#define SQL_SQL92_STRING_FUNCTIONS 164
+#define SQL_SQL92_VALUE_EXPRESSIONS 165
+#define SQL_STANDARD_CLI_CONFORMANCE 166
+#define SQL_STATIC_CURSOR_ATTRIBUTES1 167
+#define SQL_STATIC_CURSOR_ATTRIBUTES2 168
+
+#define SQL_AGGREGATE_FUNCTIONS 169
+#define SQL_DDL_INDEX 170
+#define SQL_DM_VER 171
+#define SQL_INSERT_STATEMENT 172
+#define SQL_UNION_STATEMENT SQL_UNION
#endif /* ODBCVER >= 0x0300 */
-#define SQL_DTC_TRANSITION_COST 1750
+#define SQL_DTC_TRANSITION_COST 1750
/* SQL_ALTER_TABLE bitmasks */
#if (ODBCVER >= 0x0300)
/* the following 5 bitmasks are defined in sql.h
-*#define SQL_AT_ADD_COLUMN 0x00000001L
-*#define SQL_AT_DROP_COLUMN 0x00000002L
-*#define SQL_AT_ADD_CONSTRAINT 0x00000008L
+*#define SQL_AT_ADD_COLUMN 0x00000001L
+*#define SQL_AT_DROP_COLUMN 0x00000002L
+*#define SQL_AT_ADD_CONSTRAINT 0x00000008L
*/
-#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
-#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
-#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
-#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
-#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
-#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
-#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
-#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
-#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
-#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
-#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
-#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
-#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
-#endif /* ODBCVER >= 0x0300 */
+#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
+#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
+#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
+#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
+#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
+#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
+#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
+#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
+#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
+#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
+#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
+#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
+#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
+#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
+#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
+#endif /* ODBCVER >= 0x0300 */
/* SQL_CONVERT_* return value bitmasks */
@@ -939,12 +939,12 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_CVT_TIMESTAMP 0x00020000L
#define SQL_CVT_LONGVARBINARY 0x00040000L
#if (ODBCVER >= 0x0300)
-#define SQL_CVT_INTERVAL_YEAR_MONTH 0x00080000L
-#define SQL_CVT_INTERVAL_DAY_TIME 0x00100000L
-#define SQL_CVT_WCHAR 0x00200000L
-#define SQL_CVT_WLONGVARCHAR 0x00400000L
-#define SQL_CVT_WVARCHAR 0x00800000L
-#define SQL_CVT_GUID 0x01000000L
+#define SQL_CVT_INTERVAL_YEAR_MONTH 0x00080000L
+#define SQL_CVT_INTERVAL_DAY_TIME 0x00100000L
+#define SQL_CVT_WCHAR 0x00200000L
+#define SQL_CVT_WLONGVARCHAR 0x00400000L
+#define SQL_CVT_WVARCHAR 0x00800000L
+#define SQL_CVT_GUID 0x01000000L
#endif /* ODBCVER >= 0x0300 */
@@ -952,7 +952,7 @@ extern "C" { /* Assume C declarations for C++ */
/* SQL_CONVERT_FUNCTIONS functions */
#define SQL_FN_CVT_CONVERT 0x00000001L
#if (ODBCVER >= 0x0300)
-#define SQL_FN_CVT_CAST 0x00000002L
+#define SQL_FN_CVT_CAST 0x00000002L
#endif /* ODBCVER >= 0x0300 */
@@ -978,23 +978,23 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_FN_STR_SOUNDEX 0x00020000L
#define SQL_FN_STR_SPACE 0x00040000L
#if (ODBCVER >= 0x0300)
-#define SQL_FN_STR_BIT_LENGTH 0x00080000L
-#define SQL_FN_STR_CHAR_LENGTH 0x00100000L
-#define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L
-#define SQL_FN_STR_OCTET_LENGTH 0x00400000L
-#define SQL_FN_STR_POSITION 0x00800000L
+#define SQL_FN_STR_BIT_LENGTH 0x00080000L
+#define SQL_FN_STR_CHAR_LENGTH 0x00100000L
+#define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L
+#define SQL_FN_STR_OCTET_LENGTH 0x00400000L
+#define SQL_FN_STR_POSITION 0x00800000L
#endif /* ODBCVER >= 0x0300 */
/* SQL_SQL92_STRING_FUNCTIONS */
#if (ODBCVER >= 0x0300)
-#define SQL_SSF_CONVERT 0x00000001L
-#define SQL_SSF_LOWER 0x00000002L
-#define SQL_SSF_UPPER 0x00000004L
-#define SQL_SSF_SUBSTRING 0x00000008L
-#define SQL_SSF_TRANSLATE 0x00000010L
-#define SQL_SSF_TRIM_BOTH 0x00000020L
-#define SQL_SSF_TRIM_LEADING 0x00000040L
-#define SQL_SSF_TRIM_TRAILING 0x00000080L
+#define SQL_SSF_CONVERT 0x00000001L
+#define SQL_SSF_LOWER 0x00000002L
+#define SQL_SSF_UPPER 0x00000004L
+#define SQL_SSF_SUBSTRING 0x00000008L
+#define SQL_SSF_TRANSLATE 0x00000010L
+#define SQL_SSF_TRIM_BOTH 0x00000020L
+#define SQL_SSF_TRIM_LEADING 0x00000040L
+#define SQL_SSF_TRIM_TRAILING 0x00000080L
#endif /* ODBCVER >= 0x0300 */
/* SQL_NUMERIC_FUNCTIONS functions */
@@ -1026,12 +1026,12 @@ extern "C" { /* Assume C declarations for C++ */
/* SQL_SQL92_NUMERIC_VALUE_FUNCTIONS */
#if (ODBCVER >= 0x0300)
-#define SQL_SNVF_BIT_LENGTH 0x00000001L
-#define SQL_SNVF_CHAR_LENGTH 0x00000002L
-#define SQL_SNVF_CHARACTER_LENGTH 0x00000004L
-#define SQL_SNVF_EXTRACT 0x00000008L
-#define SQL_SNVF_OCTET_LENGTH 0x00000010L
-#define SQL_SNVF_POSITION 0x00000020L
+#define SQL_SNVF_BIT_LENGTH 0x00000001L
+#define SQL_SNVF_CHAR_LENGTH 0x00000002L
+#define SQL_SNVF_CHARACTER_LENGTH 0x00000004L
+#define SQL_SNVF_EXTRACT 0x00000008L
+#define SQL_SNVF_OCTET_LENGTH 0x00000010L
+#define SQL_SNVF_POSITION 0x00000020L
#endif /* ODBCVER >= 0x0300 */
/* SQL_TIMEDATE_FUNCTIONS functions */
@@ -1054,17 +1054,17 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_FN_TD_DAYNAME 0x00008000L
#define SQL_FN_TD_MONTHNAME 0x00010000L
#if (ODBCVER >= 0x0300)
-#define SQL_FN_TD_CURRENT_DATE 0x00020000L
-#define SQL_FN_TD_CURRENT_TIME 0x00040000L
-#define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L
-#define SQL_FN_TD_EXTRACT 0x00100000L
+#define SQL_FN_TD_CURRENT_DATE 0x00020000L
+#define SQL_FN_TD_CURRENT_TIME 0x00040000L
+#define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L
+#define SQL_FN_TD_EXTRACT 0x00100000L
#endif /* ODBCVER >= 0x0300 */
/* SQL_SQL92_DATETIME_FUNCTIONS */
#if (ODBCVER >= 0x0300)
-#define SQL_SDF_CURRENT_DATE 0x00000001L
-#define SQL_SDF_CURRENT_TIME 0x00000002L
-#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L
+#define SQL_SDF_CURRENT_DATE 0x00000001L
+#define SQL_SDF_CURRENT_TIME 0x00000002L
+#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L
#endif /* ODBCVER >= 0x0300 */
/* SQL_SYSTEM_FUNCTIONS functions */
@@ -1091,32 +1091,32 @@ extern "C" { /* Assume C declarations for C++ */
*/
#if (ODBCVER >= 0x0300)
/* supported SQLFetchScroll FetchOrientation's */
-#define SQL_CA1_NEXT 0x00000001L
-#define SQL_CA1_ABSOLUTE 0x00000002L
-#define SQL_CA1_RELATIVE 0x00000004L
-#define SQL_CA1_BOOKMARK 0x00000008L
+#define SQL_CA1_NEXT 0x00000001L
+#define SQL_CA1_ABSOLUTE 0x00000002L
+#define SQL_CA1_RELATIVE 0x00000004L
+#define SQL_CA1_BOOKMARK 0x00000008L
/* supported SQLSetPos LockType's */
-#define SQL_CA1_LOCK_NO_CHANGE 0x00000040L
-#define SQL_CA1_LOCK_EXCLUSIVE 0x00000080L
-#define SQL_CA1_LOCK_UNLOCK 0x00000100L
+#define SQL_CA1_LOCK_NO_CHANGE 0x00000040L
+#define SQL_CA1_LOCK_EXCLUSIVE 0x00000080L
+#define SQL_CA1_LOCK_UNLOCK 0x00000100L
/* supported SQLSetPos Operations */
-#define SQL_CA1_POS_POSITION 0x00000200L
-#define SQL_CA1_POS_UPDATE 0x00000400L
-#define SQL_CA1_POS_DELETE 0x00000800L
-#define SQL_CA1_POS_REFRESH 0x00001000L
+#define SQL_CA1_POS_POSITION 0x00000200L
+#define SQL_CA1_POS_UPDATE 0x00000400L
+#define SQL_CA1_POS_DELETE 0x00000800L
+#define SQL_CA1_POS_REFRESH 0x00001000L
/* positioned updates and deletes */
-#define SQL_CA1_POSITIONED_UPDATE 0x00002000L
-#define SQL_CA1_POSITIONED_DELETE 0x00004000L
-#define SQL_CA1_SELECT_FOR_UPDATE 0x00008000L
+#define SQL_CA1_POSITIONED_UPDATE 0x00002000L
+#define SQL_CA1_POSITIONED_DELETE 0x00004000L
+#define SQL_CA1_SELECT_FOR_UPDATE 0x00008000L
/* supported SQLBulkOperations operations */
-#define SQL_CA1_BULK_ADD 0x00010000L
-#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK 0x00020000L
-#define SQL_CA1_BULK_DELETE_BY_BOOKMARK 0x00040000L
-#define SQL_CA1_BULK_FETCH_BY_BOOKMARK 0x00080000L
+#define SQL_CA1_BULK_ADD 0x00010000L
+#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK 0x00020000L
+#define SQL_CA1_BULK_DELETE_BY_BOOKMARK 0x00040000L
+#define SQL_CA1_BULK_FETCH_BY_BOOKMARK 0x00080000L
#endif /* ODBCVER >= 0x0300 */
/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES2,
@@ -1125,32 +1125,32 @@ extern "C" { /* Assume C declarations for C++ */
*/
#if (ODBCVER >= 0x0300)
/* supported values for SQL_ATTR_SCROLL_CONCURRENCY */
-#define SQL_CA2_READ_ONLY_CONCURRENCY 0x00000001L
-#define SQL_CA2_LOCK_CONCURRENCY 0x00000002L
-#define SQL_CA2_OPT_ROWVER_CONCURRENCY 0x00000004L
-#define SQL_CA2_OPT_VALUES_CONCURRENCY 0x00000008L
+#define SQL_CA2_READ_ONLY_CONCURRENCY 0x00000001L
+#define SQL_CA2_LOCK_CONCURRENCY 0x00000002L
+#define SQL_CA2_OPT_ROWVER_CONCURRENCY 0x00000004L
+#define SQL_CA2_OPT_VALUES_CONCURRENCY 0x00000008L
/* sensitivity of the cursor to its own inserts, deletes, and updates */
-#define SQL_CA2_SENSITIVITY_ADDITIONS 0x00000010L
-#define SQL_CA2_SENSITIVITY_DELETIONS 0x00000020L
-#define SQL_CA2_SENSITIVITY_UPDATES 0x00000040L
+#define SQL_CA2_SENSITIVITY_ADDITIONS 0x00000010L
+#define SQL_CA2_SENSITIVITY_DELETIONS 0x00000020L
+#define SQL_CA2_SENSITIVITY_UPDATES 0x00000040L
/* semantics of SQL_ATTR_MAX_ROWS */
-#define SQL_CA2_MAX_ROWS_SELECT 0x00000080L
-#define SQL_CA2_MAX_ROWS_INSERT 0x00000100L
-#define SQL_CA2_MAX_ROWS_DELETE 0x00000200L
-#define SQL_CA2_MAX_ROWS_UPDATE 0x00000400L
-#define SQL_CA2_MAX_ROWS_CATALOG 0x00000800L
-#define SQL_CA2_MAX_ROWS_AFFECTS_ALL (SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG)
+#define SQL_CA2_MAX_ROWS_SELECT 0x00000080L
+#define SQL_CA2_MAX_ROWS_INSERT 0x00000100L
+#define SQL_CA2_MAX_ROWS_DELETE 0x00000200L
+#define SQL_CA2_MAX_ROWS_UPDATE 0x00000400L
+#define SQL_CA2_MAX_ROWS_CATALOG 0x00000800L
+#define SQL_CA2_MAX_ROWS_AFFECTS_ALL (SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG)
/* semantics of SQL_DIAG_CURSOR_ROW_COUNT */
-#define SQL_CA2_CRC_EXACT 0x00001000L
-#define SQL_CA2_CRC_APPROXIMATE 0x00002000L
+#define SQL_CA2_CRC_EXACT 0x00001000L
+#define SQL_CA2_CRC_APPROXIMATE 0x00002000L
/* the kinds of positioned statements that can be simulated */
-#define SQL_CA2_SIMULATE_NON_UNIQUE 0x00004000L
-#define SQL_CA2_SIMULATE_TRY_UNIQUE 0x00008000L
-#define SQL_CA2_SIMULATE_UNIQUE 0x00010000L
+#define SQL_CA2_SIMULATE_NON_UNIQUE 0x00004000L
+#define SQL_CA2_SIMULATE_TRY_UNIQUE 0x00008000L
+#define SQL_CA2_SIMULATE_UNIQUE 0x00010000L
#endif /* ODBCVER >= 0x0300 */
/* SQL_ODBC_API_CONFORMANCE values */
@@ -1217,7 +1217,7 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_FILE_NOT_SUPPORTED 0x0000
#define SQL_FILE_TABLE 0x0001
#define SQL_FILE_QUALIFIER 0x0002
-#define SQL_FILE_CATALOG SQL_FILE_QUALIFIER /* ODBC 3.0 */
+#define SQL_FILE_CATALOG SQL_FILE_QUALIFIER /* ODBC 3.0 */
/* SQL_GETDATA_EXTENSIONS values */
@@ -1238,7 +1238,7 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_GB_GROUP_BY_CONTAINS_SELECT 0x0002
#define SQL_GB_NO_RELATION 0x0003
#if (ODBCVER >= 0x0300)
-#define SQL_GB_COLLATE 0x0004
+#define SQL_GB_COLLATE 0x0004
#endif /* ODBCVER >= 0x0300 */
@@ -1252,11 +1252,11 @@ extern "C" { /* Assume C declarations for C++ */
/* SQL_SCHEMA_USAGE masks */
#if (ODBCVER >= 0x0300)
-#define SQL_SU_DML_STATEMENTS SQL_OU_DML_STATEMENTS
-#define SQL_SU_PROCEDURE_INVOCATION SQL_OU_PROCEDURE_INVOCATION
-#define SQL_SU_TABLE_DEFINITION SQL_OU_TABLE_DEFINITION
-#define SQL_SU_INDEX_DEFINITION SQL_OU_INDEX_DEFINITION
-#define SQL_SU_PRIVILEGE_DEFINITION SQL_OU_PRIVILEGE_DEFINITION
+#define SQL_SU_DML_STATEMENTS SQL_OU_DML_STATEMENTS
+#define SQL_SU_PROCEDURE_INVOCATION SQL_OU_PROCEDURE_INVOCATION
+#define SQL_SU_TABLE_DEFINITION SQL_OU_TABLE_DEFINITION
+#define SQL_SU_INDEX_DEFINITION SQL_OU_INDEX_DEFINITION
+#define SQL_SU_PRIVILEGE_DEFINITION SQL_OU_PRIVILEGE_DEFINITION
#endif /* ODBCVER >= 0x0300 */
/* SQL_QUALIFIER_USAGE masks */
@@ -1269,11 +1269,11 @@ extern "C" { /* Assume C declarations for C++ */
#if (ODBCVER >= 0x0300)
/* SQL_CATALOG_USAGE masks */
-#define SQL_CU_DML_STATEMENTS SQL_QU_DML_STATEMENTS
-#define SQL_CU_PROCEDURE_INVOCATION SQL_QU_PROCEDURE_INVOCATION
-#define SQL_CU_TABLE_DEFINITION SQL_QU_TABLE_DEFINITION
-#define SQL_CU_INDEX_DEFINITION SQL_QU_INDEX_DEFINITION
-#define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION
+#define SQL_CU_DML_STATEMENTS SQL_QU_DML_STATEMENTS
+#define SQL_CU_PROCEDURE_INVOCATION SQL_QU_PROCEDURE_INVOCATION
+#define SQL_CU_TABLE_DEFINITION SQL_QU_TABLE_DEFINITION
+#define SQL_CU_INDEX_DEFINITION SQL_QU_INDEX_DEFINITION
+#define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION
#endif /* ODBCVER >= 0x0300 */
/* SQL_SUBQUERIES masks */
@@ -1306,10 +1306,10 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_SS_UPDATES 0x00000004L
/* SQL_VIEW values */
-#define SQL_CV_CREATE_VIEW 0x00000001L
-#define SQL_CV_CHECK_OPTION 0x00000002L
-#define SQL_CV_CASCADED 0x00000004L
-#define SQL_CV_LOCAL 0x00000008L
+#define SQL_CV_CREATE_VIEW 0x00000001L
+#define SQL_CV_CHECK_OPTION 0x00000002L
+#define SQL_CV_CASCADED 0x00000004L
+#define SQL_CV_LOCAL 0x00000008L
/* SQL_LOCK_TYPES masks */
@@ -1334,310 +1334,310 @@ extern "C" { /* Assume C declarations for C++ */
#if (ODBCVER >= 0x0300)
/* SQL_AGGREGATE_FUNCTIONS bitmasks */
-#define SQL_AF_AVG 0x00000001L
-#define SQL_AF_COUNT 0x00000002L
-#define SQL_AF_MAX 0x00000004L
-#define SQL_AF_MIN 0x00000008L
-#define SQL_AF_SUM 0x00000010L
-#define SQL_AF_DISTINCT 0x00000020L
-#define SQL_AF_ALL 0x00000040L
+#define SQL_AF_AVG 0x00000001L
+#define SQL_AF_COUNT 0x00000002L
+#define SQL_AF_MAX 0x00000004L
+#define SQL_AF_MIN 0x00000008L
+#define SQL_AF_SUM 0x00000010L
+#define SQL_AF_DISTINCT 0x00000020L
+#define SQL_AF_ALL 0x00000040L
/* SQL_SQL_CONFORMANCE bit masks */
-#define SQL_SC_SQL92_ENTRY 0x00000001L
-#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L
-#define SQL_SC_SQL92_INTERMEDIATE 0x00000004L
-#define SQL_SC_SQL92_FULL 0x00000008L
+#define SQL_SC_SQL92_ENTRY 0x00000001L
+#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L
+#define SQL_SC_SQL92_INTERMEDIATE 0x00000004L
+#define SQL_SC_SQL92_FULL 0x00000008L
/* SQL_DATETIME_LITERALS masks */
-#define SQL_DL_SQL92_DATE 0x00000001L
-#define SQL_DL_SQL92_TIME 0x00000002L
-#define SQL_DL_SQL92_TIMESTAMP 0x00000004L
-#define SQL_DL_SQL92_INTERVAL_YEAR 0x00000008L
-#define SQL_DL_SQL92_INTERVAL_MONTH 0x00000010L
-#define SQL_DL_SQL92_INTERVAL_DAY 0x00000020L
-#define SQL_DL_SQL92_INTERVAL_HOUR 0x00000040L
-#define SQL_DL_SQL92_INTERVAL_MINUTE 0x00000080L
-#define SQL_DL_SQL92_INTERVAL_SECOND 0x00000100L
-#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH 0x00000200L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR 0x00000400L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE 0x00000800L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND 0x00001000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE 0x00002000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND 0x00004000L
-#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND 0x00008000L
+#define SQL_DL_SQL92_DATE 0x00000001L
+#define SQL_DL_SQL92_TIME 0x00000002L
+#define SQL_DL_SQL92_TIMESTAMP 0x00000004L
+#define SQL_DL_SQL92_INTERVAL_YEAR 0x00000008L
+#define SQL_DL_SQL92_INTERVAL_MONTH 0x00000010L
+#define SQL_DL_SQL92_INTERVAL_DAY 0x00000020L
+#define SQL_DL_SQL92_INTERVAL_HOUR 0x00000040L
+#define SQL_DL_SQL92_INTERVAL_MINUTE 0x00000080L
+#define SQL_DL_SQL92_INTERVAL_SECOND 0x00000100L
+#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH 0x00000200L
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR 0x00000400L
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE 0x00000800L
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND 0x00001000L
+#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE 0x00002000L
+#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND 0x00004000L
+#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND 0x00008000L
/* SQL_CATALOG_LOCATION values */
-#define SQL_CL_START SQL_QL_START
-#define SQL_CL_END SQL_QL_END
+#define SQL_CL_START SQL_QL_START
+#define SQL_CL_END SQL_QL_END
/* values for SQL_BATCH_ROW_COUNT */
-#define SQL_BRC_PROCEDURES 0x0000001
-#define SQL_BRC_EXPLICIT 0x0000002
-#define SQL_BRC_ROLLED_UP 0x0000004
+#define SQL_BRC_PROCEDURES 0x0000001
+#define SQL_BRC_EXPLICIT 0x0000002
+#define SQL_BRC_ROLLED_UP 0x0000004
/* bitmasks for SQL_BATCH_SUPPORT */
-#define SQL_BS_SELECT_EXPLICIT 0x00000001L
-#define SQL_BS_ROW_COUNT_EXPLICIT 0x00000002L
-#define SQL_BS_SELECT_PROC 0x00000004L
-#define SQL_BS_ROW_COUNT_PROC 0x00000008L
+#define SQL_BS_SELECT_EXPLICIT 0x00000001L
+#define SQL_BS_ROW_COUNT_EXPLICIT 0x00000002L
+#define SQL_BS_SELECT_PROC 0x00000004L
+#define SQL_BS_ROW_COUNT_PROC 0x00000008L
/* Values for SQL_PARAM_ARRAY_ROW_COUNTS getinfo */
-#define SQL_PARC_BATCH 1
-#define SQL_PARC_NO_BATCH 2
+#define SQL_PARC_BATCH 1
+#define SQL_PARC_NO_BATCH 2
/* values for SQL_PARAM_ARRAY_SELECTS */
-#define SQL_PAS_BATCH 1
-#define SQL_PAS_NO_BATCH 2
-#define SQL_PAS_NO_SELECT 3
+#define SQL_PAS_BATCH 1
+#define SQL_PAS_NO_BATCH 2
+#define SQL_PAS_NO_SELECT 3
/* Bitmasks for SQL_INDEX_KEYWORDS */
-#define SQL_IK_NONE 0x00000000L
-#define SQL_IK_ASC 0x00000001L
-#define SQL_IK_DESC 0x00000002L
-#define SQL_IK_ALL (SQL_IK_ASC | SQL_IK_DESC)
+#define SQL_IK_NONE 0x00000000L
+#define SQL_IK_ASC 0x00000001L
+#define SQL_IK_DESC 0x00000002L
+#define SQL_IK_ALL (SQL_IK_ASC | SQL_IK_DESC)
/* Bitmasks for SQL_INFO_SCHEMA_VIEWS */
-#define SQL_ISV_ASSERTIONS 0x00000001L
-#define SQL_ISV_CHARACTER_SETS 0x00000002L
-#define SQL_ISV_CHECK_CONSTRAINTS 0x00000004L
-#define SQL_ISV_COLLATIONS 0x00000008L
-#define SQL_ISV_COLUMN_DOMAIN_USAGE 0x00000010L
-#define SQL_ISV_COLUMN_PRIVILEGES 0x00000020L
-#define SQL_ISV_COLUMNS 0x00000040L
-#define SQL_ISV_CONSTRAINT_COLUMN_USAGE 0x00000080L
-#define SQL_ISV_CONSTRAINT_TABLE_USAGE 0x00000100L
-#define SQL_ISV_DOMAIN_CONSTRAINTS 0x00000200L
-#define SQL_ISV_DOMAINS 0x00000400L
-#define SQL_ISV_KEY_COLUMN_USAGE 0x00000800L
-#define SQL_ISV_REFERENTIAL_CONSTRAINTS 0x00001000L
-#define SQL_ISV_SCHEMATA 0x00002000L
-#define SQL_ISV_SQL_LANGUAGES 0x00004000L
-#define SQL_ISV_TABLE_CONSTRAINTS 0x00008000L
-#define SQL_ISV_TABLE_PRIVILEGES 0x00010000L
-#define SQL_ISV_TABLES 0x00020000L
-#define SQL_ISV_TRANSLATIONS 0x00040000L
-#define SQL_ISV_USAGE_PRIVILEGES 0x00080000L
-#define SQL_ISV_VIEW_COLUMN_USAGE 0x00100000L
-#define SQL_ISV_VIEW_TABLE_USAGE 0x00200000L
-#define SQL_ISV_VIEWS 0x00400000L
+#define SQL_ISV_ASSERTIONS 0x00000001L
+#define SQL_ISV_CHARACTER_SETS 0x00000002L
+#define SQL_ISV_CHECK_CONSTRAINTS 0x00000004L
+#define SQL_ISV_COLLATIONS 0x00000008L
+#define SQL_ISV_COLUMN_DOMAIN_USAGE 0x00000010L
+#define SQL_ISV_COLUMN_PRIVILEGES 0x00000020L
+#define SQL_ISV_COLUMNS 0x00000040L
+#define SQL_ISV_CONSTRAINT_COLUMN_USAGE 0x00000080L
+#define SQL_ISV_CONSTRAINT_TABLE_USAGE 0x00000100L
+#define SQL_ISV_DOMAIN_CONSTRAINTS 0x00000200L
+#define SQL_ISV_DOMAINS 0x00000400L
+#define SQL_ISV_KEY_COLUMN_USAGE 0x00000800L
+#define SQL_ISV_REFERENTIAL_CONSTRAINTS 0x00001000L
+#define SQL_ISV_SCHEMATA 0x00002000L
+#define SQL_ISV_SQL_LANGUAGES 0x00004000L
+#define SQL_ISV_TABLE_CONSTRAINTS 0x00008000L
+#define SQL_ISV_TABLE_PRIVILEGES 0x00010000L
+#define SQL_ISV_TABLES 0x00020000L
+#define SQL_ISV_TRANSLATIONS 0x00040000L
+#define SQL_ISV_USAGE_PRIVILEGES 0x00080000L
+#define SQL_ISV_VIEW_COLUMN_USAGE 0x00100000L
+#define SQL_ISV_VIEW_TABLE_USAGE 0x00200000L
+#define SQL_ISV_VIEWS 0x00400000L
/* Bitmasks for SQL_ASYNC_MODE */
-#define SQL_AM_NONE 0
-#define SQL_AM_CONNECTION 1
-#define SQL_AM_STATEMENT 2
+#define SQL_AM_NONE 0
+#define SQL_AM_CONNECTION 1
+#define SQL_AM_STATEMENT 2
/* Bitmasks for SQL_ALTER_DOMAIN */
-#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
-#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L
-#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L
-#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L
-#define SQL_AD_DROP_DOMAIN_DEFAULT 0x00000010L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
+#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L
+#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L
+#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L
+#define SQL_AD_DROP_DOMAIN_DEFAULT 0x00000010L
+#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
+#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
+#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE 0x00000080L
+#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE 0x00000100L
/* SQL_CREATE_SCHEMA bitmasks */
-#define SQL_CS_CREATE_SCHEMA 0x00000001L
-#define SQL_CS_AUTHORIZATION 0x00000002L
-#define SQL_CS_DEFAULT_CHARACTER_SET 0x00000004L
+#define SQL_CS_CREATE_SCHEMA 0x00000001L
+#define SQL_CS_AUTHORIZATION 0x00000002L
+#define SQL_CS_DEFAULT_CHARACTER_SET 0x00000004L
/* SQL_CREATE_TRANSLATION bitmasks */
-#define SQL_CTR_CREATE_TRANSLATION 0x00000001L
+#define SQL_CTR_CREATE_TRANSLATION 0x00000001L
/* SQL_CREATE_ASSERTION bitmasks */
-#define SQL_CA_CREATE_ASSERTION 0x00000001L
-#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED 0x00000010L
-#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000020L
-#define SQL_CA_CONSTRAINT_DEFERRABLE 0x00000040L
-#define SQL_CA_CONSTRAINT_NON_DEFERRABLE 0x00000080L
+#define SQL_CA_CREATE_ASSERTION 0x00000001L
+#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED 0x00000010L
+#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000020L
+#define SQL_CA_CONSTRAINT_DEFERRABLE 0x00000040L
+#define SQL_CA_CONSTRAINT_NON_DEFERRABLE 0x00000080L
/* SQL_CREATE_CHARACTER_SET bitmasks */
-#define SQL_CCS_CREATE_CHARACTER_SET 0x00000001L
-#define SQL_CCS_COLLATE_CLAUSE 0x00000002L
-#define SQL_CCS_LIMITED_COLLATION 0x00000004L
+#define SQL_CCS_CREATE_CHARACTER_SET 0x00000001L
+#define SQL_CCS_COLLATE_CLAUSE 0x00000002L
+#define SQL_CCS_LIMITED_COLLATION 0x00000004L
/* SQL_CREATE_COLLATION bitmasks */
-#define SQL_CCOL_CREATE_COLLATION 0x00000001L
+#define SQL_CCOL_CREATE_COLLATION 0x00000001L
/* SQL_CREATE_DOMAIN bitmasks */
-#define SQL_CDO_CREATE_DOMAIN 0x00000001L
-#define SQL_CDO_DEFAULT 0x00000002L
-#define SQL_CDO_CONSTRAINT 0x00000004L
-#define SQL_CDO_COLLATION 0x00000008L
-#define SQL_CDO_CONSTRAINT_NAME_DEFINITION 0x00000010L
-#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_CDO_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_CDO_CREATE_DOMAIN 0x00000001L
+#define SQL_CDO_DEFAULT 0x00000002L
+#define SQL_CDO_CONSTRAINT 0x00000004L
+#define SQL_CDO_COLLATION 0x00000008L
+#define SQL_CDO_CONSTRAINT_NAME_DEFINITION 0x00000010L
+#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
+#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
+#define SQL_CDO_CONSTRAINT_DEFERRABLE 0x00000080L
+#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE 0x00000100L
/* SQL_CREATE_TABLE bitmasks */
-#define SQL_CT_CREATE_TABLE 0x00000001L
-#define SQL_CT_COMMIT_PRESERVE 0x00000002L
-#define SQL_CT_COMMIT_DELETE 0x00000004L
-#define SQL_CT_GLOBAL_TEMPORARY 0x00000008L
-#define SQL_CT_LOCAL_TEMPORARY 0x00000010L
-#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_CT_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_CT_CONSTRAINT_NON_DEFERRABLE 0x00000100L
-#define SQL_CT_COLUMN_CONSTRAINT 0x00000200L
-#define SQL_CT_COLUMN_DEFAULT 0x00000400L
-#define SQL_CT_COLUMN_COLLATION 0x00000800L
-#define SQL_CT_TABLE_CONSTRAINT 0x00001000L
-#define SQL_CT_CONSTRAINT_NAME_DEFINITION 0x00002000L
+#define SQL_CT_CREATE_TABLE 0x00000001L
+#define SQL_CT_COMMIT_PRESERVE 0x00000002L
+#define SQL_CT_COMMIT_DELETE 0x00000004L
+#define SQL_CT_GLOBAL_TEMPORARY 0x00000008L
+#define SQL_CT_LOCAL_TEMPORARY 0x00000010L
+#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
+#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
+#define SQL_CT_CONSTRAINT_DEFERRABLE 0x00000080L
+#define SQL_CT_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_CT_COLUMN_CONSTRAINT 0x00000200L
+#define SQL_CT_COLUMN_DEFAULT 0x00000400L
+#define SQL_CT_COLUMN_COLLATION 0x00000800L
+#define SQL_CT_TABLE_CONSTRAINT 0x00001000L
+#define SQL_CT_CONSTRAINT_NAME_DEFINITION 0x00002000L
/* SQL_DDL_INDEX bitmasks */
-#define SQL_DI_CREATE_INDEX 0x00000001L
-#define SQL_DI_DROP_INDEX 0x00000002L
+#define SQL_DI_CREATE_INDEX 0x00000001L
+#define SQL_DI_DROP_INDEX 0x00000002L
/* SQL_DROP_COLLATION bitmasks */
-#define SQL_DC_DROP_COLLATION 0x00000001L
+#define SQL_DC_DROP_COLLATION 0x00000001L
/* SQL_DROP_DOMAIN bitmasks */
-#define SQL_DD_DROP_DOMAIN 0x00000001L
-#define SQL_DD_RESTRICT 0x00000002L
-#define SQL_DD_CASCADE 0x00000004L
+#define SQL_DD_DROP_DOMAIN 0x00000001L
+#define SQL_DD_RESTRICT 0x00000002L
+#define SQL_DD_CASCADE 0x00000004L
/* SQL_DROP_SCHEMA bitmasks */
-#define SQL_DS_DROP_SCHEMA 0x00000001L
-#define SQL_DS_RESTRICT 0x00000002L
-#define SQL_DS_CASCADE 0x00000004L
+#define SQL_DS_DROP_SCHEMA 0x00000001L
+#define SQL_DS_RESTRICT 0x00000002L
+#define SQL_DS_CASCADE 0x00000004L
/* SQL_DROP_CHARACTER_SET bitmasks */
-#define SQL_DCS_DROP_CHARACTER_SET 0x00000001L
+#define SQL_DCS_DROP_CHARACTER_SET 0x00000001L
/* SQL_DROP_ASSERTION bitmasks */
-#define SQL_DA_DROP_ASSERTION 0x00000001L
+#define SQL_DA_DROP_ASSERTION 0x00000001L
/* SQL_DROP_TABLE bitmasks */
-#define SQL_DT_DROP_TABLE 0x00000001L
-#define SQL_DT_RESTRICT 0x00000002L
-#define SQL_DT_CASCADE 0x00000004L
+#define SQL_DT_DROP_TABLE 0x00000001L
+#define SQL_DT_RESTRICT 0x00000002L
+#define SQL_DT_CASCADE 0x00000004L
/* SQL_DROP_TRANSLATION bitmasks */
-#define SQL_DTR_DROP_TRANSLATION 0x00000001L
+#define SQL_DTR_DROP_TRANSLATION 0x00000001L
/* SQL_DROP_VIEW bitmasks */
-#define SQL_DV_DROP_VIEW 0x00000001L
-#define SQL_DV_RESTRICT 0x00000002L
-#define SQL_DV_CASCADE 0x00000004L
+#define SQL_DV_DROP_VIEW 0x00000001L
+#define SQL_DV_RESTRICT 0x00000002L
+#define SQL_DV_CASCADE 0x00000004L
/* SQL_INSERT_STATEMENT bitmasks */
-#define SQL_IS_INSERT_LITERALS 0x00000001L
-#define SQL_IS_INSERT_SEARCHED 0x00000002L
-#define SQL_IS_SELECT_INTO 0x00000004L
+#define SQL_IS_INSERT_LITERALS 0x00000001L
+#define SQL_IS_INSERT_SEARCHED 0x00000002L
+#define SQL_IS_SELECT_INTO 0x00000004L
/* SQL_ODBC_INTERFACE_CONFORMANCE values */
-#define SQL_OIC_CORE 1UL
-#define SQL_OIC_LEVEL1 2UL
-#define SQL_OIC_LEVEL2 3UL
+#define SQL_OIC_CORE 1UL
+#define SQL_OIC_LEVEL1 2UL
+#define SQL_OIC_LEVEL2 3UL
/* SQL_SQL92_FOREIGN_KEY_DELETE_RULE bitmasks */
-#define SQL_SFKD_CASCADE 0x00000001L
-#define SQL_SFKD_NO_ACTION 0x00000002L
-#define SQL_SFKD_SET_DEFAULT 0x00000004L
-#define SQL_SFKD_SET_NULL 0x00000008L
+#define SQL_SFKD_CASCADE 0x00000001L
+#define SQL_SFKD_NO_ACTION 0x00000002L
+#define SQL_SFKD_SET_DEFAULT 0x00000004L
+#define SQL_SFKD_SET_NULL 0x00000008L
/* SQL_SQL92_FOREIGN_KEY_UPDATE_RULE bitmasks */
-#define SQL_SFKU_CASCADE 0x00000001L
-#define SQL_SFKU_NO_ACTION 0x00000002L
-#define SQL_SFKU_SET_DEFAULT 0x00000004L
-#define SQL_SFKU_SET_NULL 0x00000008L
-
-/* SQL_SQL92_GRANT bitmasks */
-#define SQL_SG_USAGE_ON_DOMAIN 0x00000001L
-#define SQL_SG_USAGE_ON_CHARACTER_SET 0x00000002L
-#define SQL_SG_USAGE_ON_COLLATION 0x00000004L
-#define SQL_SG_USAGE_ON_TRANSLATION 0x00000008L
-#define SQL_SG_WITH_GRANT_OPTION 0x00000010L
-#define SQL_SG_DELETE_TABLE 0x00000020L
-#define SQL_SG_INSERT_TABLE 0x00000040L
-#define SQL_SG_INSERT_COLUMN 0x00000080L
-#define SQL_SG_REFERENCES_TABLE 0x00000100L
-#define SQL_SG_REFERENCES_COLUMN 0x00000200L
-#define SQL_SG_SELECT_TABLE 0x00000400L
-#define SQL_SG_UPDATE_TABLE 0x00000800L
-#define SQL_SG_UPDATE_COLUMN 0x00001000L
+#define SQL_SFKU_CASCADE 0x00000001L
+#define SQL_SFKU_NO_ACTION 0x00000002L
+#define SQL_SFKU_SET_DEFAULT 0x00000004L
+#define SQL_SFKU_SET_NULL 0x00000008L
+
+/* SQL_SQL92_GRANT bitmasks */
+#define SQL_SG_USAGE_ON_DOMAIN 0x00000001L
+#define SQL_SG_USAGE_ON_CHARACTER_SET 0x00000002L
+#define SQL_SG_USAGE_ON_COLLATION 0x00000004L
+#define SQL_SG_USAGE_ON_TRANSLATION 0x00000008L
+#define SQL_SG_WITH_GRANT_OPTION 0x00000010L
+#define SQL_SG_DELETE_TABLE 0x00000020L
+#define SQL_SG_INSERT_TABLE 0x00000040L
+#define SQL_SG_INSERT_COLUMN 0x00000080L
+#define SQL_SG_REFERENCES_TABLE 0x00000100L
+#define SQL_SG_REFERENCES_COLUMN 0x00000200L
+#define SQL_SG_SELECT_TABLE 0x00000400L
+#define SQL_SG_UPDATE_TABLE 0x00000800L
+#define SQL_SG_UPDATE_COLUMN 0x00001000L
/* SQL_SQL92_PREDICATES bitmasks */
-#define SQL_SP_EXISTS 0x00000001L
-#define SQL_SP_ISNOTNULL 0x00000002L
-#define SQL_SP_ISNULL 0x00000004L
-#define SQL_SP_MATCH_FULL 0x00000008L
-#define SQL_SP_MATCH_PARTIAL 0x00000010L
-#define SQL_SP_MATCH_UNIQUE_FULL 0x00000020L
-#define SQL_SP_MATCH_UNIQUE_PARTIAL 0x00000040L
-#define SQL_SP_OVERLAPS 0x00000080L
-#define SQL_SP_UNIQUE 0x00000100L
-#define SQL_SP_LIKE 0x00000200L
-#define SQL_SP_IN 0x00000400L
-#define SQL_SP_BETWEEN 0x00000800L
-#define SQL_SP_COMPARISON 0x00001000L
-#define SQL_SP_QUANTIFIED_COMPARISON 0x00002000L
+#define SQL_SP_EXISTS 0x00000001L
+#define SQL_SP_ISNOTNULL 0x00000002L
+#define SQL_SP_ISNULL 0x00000004L
+#define SQL_SP_MATCH_FULL 0x00000008L
+#define SQL_SP_MATCH_PARTIAL 0x00000010L
+#define SQL_SP_MATCH_UNIQUE_FULL 0x00000020L
+#define SQL_SP_MATCH_UNIQUE_PARTIAL 0x00000040L
+#define SQL_SP_OVERLAPS 0x00000080L
+#define SQL_SP_UNIQUE 0x00000100L
+#define SQL_SP_LIKE 0x00000200L
+#define SQL_SP_IN 0x00000400L
+#define SQL_SP_BETWEEN 0x00000800L
+#define SQL_SP_COMPARISON 0x00001000L
+#define SQL_SP_QUANTIFIED_COMPARISON 0x00002000L
/* SQL_SQL92_RELATIONAL_JOIN_OPERATORS bitmasks */
-#define SQL_SRJO_CORRESPONDING_CLAUSE 0x00000001L
-#define SQL_SRJO_CROSS_JOIN 0x00000002L
-#define SQL_SRJO_EXCEPT_JOIN 0x00000004L
-#define SQL_SRJO_FULL_OUTER_JOIN 0x00000008L
-#define SQL_SRJO_INNER_JOIN 0x00000010L
-#define SQL_SRJO_INTERSECT_JOIN 0x00000020L
-#define SQL_SRJO_LEFT_OUTER_JOIN 0x00000040L
-#define SQL_SRJO_NATURAL_JOIN 0x00000080L
-#define SQL_SRJO_RIGHT_OUTER_JOIN 0x00000100L
-#define SQL_SRJO_UNION_JOIN 0x00000200L
+#define SQL_SRJO_CORRESPONDING_CLAUSE 0x00000001L
+#define SQL_SRJO_CROSS_JOIN 0x00000002L
+#define SQL_SRJO_EXCEPT_JOIN 0x00000004L
+#define SQL_SRJO_FULL_OUTER_JOIN 0x00000008L
+#define SQL_SRJO_INNER_JOIN 0x00000010L
+#define SQL_SRJO_INTERSECT_JOIN 0x00000020L
+#define SQL_SRJO_LEFT_OUTER_JOIN 0x00000040L
+#define SQL_SRJO_NATURAL_JOIN 0x00000080L
+#define SQL_SRJO_RIGHT_OUTER_JOIN 0x00000100L
+#define SQL_SRJO_UNION_JOIN 0x00000200L
/* SQL_SQL92_REVOKE bitmasks */
-#define SQL_SR_USAGE_ON_DOMAIN 0x00000001L
-#define SQL_SR_USAGE_ON_CHARACTER_SET 0x00000002L
-#define SQL_SR_USAGE_ON_COLLATION 0x00000004L
-#define SQL_SR_USAGE_ON_TRANSLATION 0x00000008L
-#define SQL_SR_GRANT_OPTION_FOR 0x00000010L
-#define SQL_SR_CASCADE 0x00000020L
-#define SQL_SR_RESTRICT 0x00000040L
-#define SQL_SR_DELETE_TABLE 0x00000080L
-#define SQL_SR_INSERT_TABLE 0x00000100L
-#define SQL_SR_INSERT_COLUMN 0x00000200L
-#define SQL_SR_REFERENCES_TABLE 0x00000400L
-#define SQL_SR_REFERENCES_COLUMN 0x00000800L
-#define SQL_SR_SELECT_TABLE 0x00001000L
-#define SQL_SR_UPDATE_TABLE 0x00002000L
-#define SQL_SR_UPDATE_COLUMN 0x00004000L
+#define SQL_SR_USAGE_ON_DOMAIN 0x00000001L
+#define SQL_SR_USAGE_ON_CHARACTER_SET 0x00000002L
+#define SQL_SR_USAGE_ON_COLLATION 0x00000004L
+#define SQL_SR_USAGE_ON_TRANSLATION 0x00000008L
+#define SQL_SR_GRANT_OPTION_FOR 0x00000010L
+#define SQL_SR_CASCADE 0x00000020L
+#define SQL_SR_RESTRICT 0x00000040L
+#define SQL_SR_DELETE_TABLE 0x00000080L
+#define SQL_SR_INSERT_TABLE 0x00000100L
+#define SQL_SR_INSERT_COLUMN 0x00000200L
+#define SQL_SR_REFERENCES_TABLE 0x00000400L
+#define SQL_SR_REFERENCES_COLUMN 0x00000800L
+#define SQL_SR_SELECT_TABLE 0x00001000L
+#define SQL_SR_UPDATE_TABLE 0x00002000L
+#define SQL_SR_UPDATE_COLUMN 0x00004000L
/* SQL_SQL92_ROW_VALUE_CONSTRUCTOR bitmasks */
-#define SQL_SRVC_VALUE_EXPRESSION 0x00000001L
-#define SQL_SRVC_NULL 0x00000002L
-#define SQL_SRVC_DEFAULT 0x00000004L
-#define SQL_SRVC_ROW_SUBQUERY 0x00000008L
+#define SQL_SRVC_VALUE_EXPRESSION 0x00000001L
+#define SQL_SRVC_NULL 0x00000002L
+#define SQL_SRVC_DEFAULT 0x00000004L
+#define SQL_SRVC_ROW_SUBQUERY 0x00000008L
/* SQL_SQL92_VALUE_EXPRESSIONS bitmasks */
-#define SQL_SVE_CASE 0x00000001L
-#define SQL_SVE_CAST 0x00000002L
-#define SQL_SVE_COALESCE 0x00000004L
-#define SQL_SVE_NULLIF 0x00000008L
+#define SQL_SVE_CASE 0x00000001L
+#define SQL_SVE_CAST 0x00000002L
+#define SQL_SVE_COALESCE 0x00000004L
+#define SQL_SVE_NULLIF 0x00000008L
/* SQL_STANDARD_CLI_CONFORMANCE bitmasks */
-#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L
-#define SQL_SCC_ISO92_CLI 0x00000002L
+#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L
+#define SQL_SCC_ISO92_CLI 0x00000002L
/* SQL_UNION_STATEMENT bitmasks */
-#define SQL_US_UNION SQL_U_UNION
-#define SQL_US_UNION_ALL SQL_U_UNION_ALL
+#define SQL_US_UNION SQL_U_UNION
+#define SQL_US_UNION_ALL SQL_U_UNION_ALL
#endif /* ODBCVER >= 0x0300 */
/* SQL_DTC_TRANSITION_COST bitmasks */
-#define SQL_DTC_ENLIST_EXPENSIVE 0x00000001L
-#define SQL_DTC_UNENLIST_EXPENSIVE 0x00000002L
+#define SQL_DTC_ENLIST_EXPENSIVE 0x00000001L
+#define SQL_DTC_UNENLIST_EXPENSIVE 0x00000002L
/* additional SQLDataSources fetch directions */
#if (ODBCVER >= 0x0300)
-#define SQL_FETCH_FIRST_USER 31
-#define SQL_FETCH_FIRST_SYSTEM 32
+#define SQL_FETCH_FIRST_USER 31
+#define SQL_FETCH_FIRST_SYSTEM 32
#endif /* ODBCVER >= 0x0300 */
@@ -1652,11 +1652,11 @@ extern "C" { /* Assume C declarations for C++ */
/* Operations in SQLBulkOperations */
#define SQL_ADD 4
-#define SQL_SETPOS_MAX_OPTION_VALUE SQL_ADD
+#define SQL_SETPOS_MAX_OPTION_VALUE SQL_ADD
#if (ODBCVER >= 0x0300)
-#define SQL_UPDATE_BY_BOOKMARK 5
-#define SQL_DELETE_BY_BOOKMARK 6
-#define SQL_FETCH_BY_BOOKMARK 7
+#define SQL_UPDATE_BY_BOOKMARK 5
+#define SQL_DELETE_BY_BOOKMARK 6
+#define SQL_FETCH_BY_BOOKMARK 7
#endif /* ODBCVER >= 0x0300 */
@@ -1665,7 +1665,7 @@ extern "C" { /* Assume C declarations for C++ */
#define SQL_LOCK_EXCLUSIVE 1 /* 1.0 TRUE */
#define SQL_LOCK_UNLOCK 2
-#define SQL_SETPOS_MAX_LOCK_VALUE SQL_LOCK_UNLOCK
+#define SQL_SETPOS_MAX_LOCK_VALUE SQL_LOCK_UNLOCK
/* Macros for SQLSetPos */
#define SQL_POSITION_TO(hstmt,irow) SQLSetPos(hstmt,irow,SQL_POSITION,SQL_LOCK_NO_CHANGE)
@@ -1695,9 +1695,9 @@ extern "C" { /* Assume C declarations for C++ */
/* Defines for SQLTables */
#if (ODBCVER >= 0x0300)
-#define SQL_ALL_CATALOGS "%"
-#define SQL_ALL_SCHEMAS "%"
-#define SQL_ALL_TABLE_TYPES "%"
+#define SQL_ALL_CATALOGS "%"
+#define SQL_ALL_SCHEMAS "%"
+#define SQL_ALL_TABLE_TYPES "%"
#endif /* ODBCVER >= 0x0300 */
/* Options for SQLDriverConnect */
@@ -1709,11 +1709,11 @@ extern "C" { /* Assume C declarations for C++ */
SQLRETURN SQL_API SQLDriverConnect(
SQLHDBC hdbc,
SQLHWND hwnd,
- SQLCHAR *szConnStrIn,
+ SQLCHAR *szConnStrIn,
SQLSMALLINT cbConnStrIn,
SQLCHAR *szConnStrOut,
SQLSMALLINT cbConnStrOutMax,
- SQLSMALLINT *pcbConnStrOut,
+ SQLSMALLINT *pcbConnStrOut,
SQLUSMALLINT fDriverCompletion);
/* Level 2 Functions */
@@ -1729,21 +1729,21 @@ SQLRETURN SQL_API SQLDriverConnect(
#define SQL_ROW_ADDED 4
#define SQL_ROW_ERROR 5
#if (ODBCVER >= 0x0300)
-#define SQL_ROW_SUCCESS_WITH_INFO 6
-#define SQL_ROW_PROCEED 0
-#define SQL_ROW_IGNORE 1
+#define SQL_ROW_SUCCESS_WITH_INFO 6
+#define SQL_ROW_PROCEED 0
+#define SQL_ROW_IGNORE 1
#endif
/* value for SQL_DESC_ARRAY_STATUS_PTR */
#if (ODBCVER >= 0x0300)
-#define SQL_PARAM_SUCCESS 0
-#define SQL_PARAM_SUCCESS_WITH_INFO 6
-#define SQL_PARAM_ERROR 5
-#define SQL_PARAM_UNUSED 7
-#define SQL_PARAM_DIAG_UNAVAILABLE 1
-
-#define SQL_PARAM_PROCEED 0
-#define SQL_PARAM_IGNORE 1
+#define SQL_PARAM_SUCCESS 0
+#define SQL_PARAM_SUCCESS_WITH_INFO 6
+#define SQL_PARAM_ERROR 5
+#define SQL_PARAM_UNUSED 7
+#define SQL_PARAM_DIAG_UNAVAILABLE 1
+
+#define SQL_PARAM_PROCEED 0
+#define SQL_PARAM_IGNORE 1
#endif /* ODBCVER >= 0x0300 */
/* Defines for SQLForeignKeys (UPDATE_RULE and DELETE_RULE) */
@@ -1751,17 +1751,17 @@ SQLRETURN SQL_API SQLDriverConnect(
#define SQL_RESTRICT 1
#define SQL_SET_NULL 2
#if (ODBCVER >= 0x0250)
-#define SQL_NO_ACTION 3
-#define SQL_SET_DEFAULT 4
+#define SQL_NO_ACTION 3
+#define SQL_SET_DEFAULT 4
#endif /* ODBCVER >= 0x0250 */
#if (ODBCVER >= 0x0300)
/* Note that the following are in a different column of SQLForeignKeys than */
/* the previous #defines. These are for DEFERRABILITY. */
-#define SQL_INITIALLY_DEFERRED 5
-#define SQL_INITIALLY_IMMEDIATE 6
-#define SQL_NOT_DEFERRABLE 7
+#define SQL_INITIALLY_DEFERRED 5
+#define SQL_INITIALLY_IMMEDIATE 6
+#define SQL_NOT_DEFERRABLE 7
#endif /* ODBCVER >= 0x0300 */
@@ -1814,16 +1814,16 @@ SQLRETURN SQL_API SQLDriverConnect(
SQLRETURN SQL_API SQLBrowseConnect(
SQLHDBC hdbc,
- SQLCHAR *szConnStrIn,
+ SQLCHAR *szConnStrIn,
SQLSMALLINT cbConnStrIn,
- SQLCHAR *szConnStrOut,
+ SQLCHAR *szConnStrOut,
SQLSMALLINT cbConnStrOutMax,
SQLSMALLINT *pcbConnStrOut);
#if (ODBCVER >= 0x0300)
-SQLRETURN SQL_API SQLBulkOperations(
- SQLHSTMT StatementHandle,
- SQLSMALLINT Operation);
+SQLRETURN SQL_API SQLBulkOperations(
+ SQLHSTMT StatementHandle,
+ SQLSMALLINT Operation);
#endif /* ODBCVER >= 0x0300 */
SQLRETURN SQL_API SQLColAttributes(
@@ -1832,48 +1832,48 @@ SQLRETURN SQL_API SQLColAttributes(
SQLUSMALLINT fDescType,
SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax,
- SQLSMALLINT *pcbDesc,
- SQLLEN *pfDesc);
+ SQLSMALLINT *pcbDesc,
+ SQLLEN *pfDesc);
SQLRETURN SQL_API SQLColumnPrivileges(
SQLHSTMT hstmt,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szTableName,
+ SQLCHAR *szTableName,
SQLSMALLINT cbTableName,
- SQLCHAR *szColumnName,
+ SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName);
SQLRETURN SQL_API SQLDescribeParam(
SQLHSTMT hstmt,
SQLUSMALLINT ipar,
- SQLSMALLINT *pfSqlType,
- SQLULEN *pcbParamDef,
- SQLSMALLINT *pibScale,
- SQLSMALLINT *pfNullable);
+ SQLSMALLINT *pfSqlType,
+ SQLULEN *pcbParamDef,
+ SQLSMALLINT *pibScale,
+ SQLSMALLINT *pfNullable);
SQLRETURN SQL_API SQLExtendedFetch(
SQLHSTMT hstmt,
SQLUSMALLINT fFetchType,
SQLLEN irow,
- SQLULEN *pcrow,
- SQLUSMALLINT *rgfRowStatus);
+ SQLULEN *pcrow,
+ SQLUSMALLINT *rgfRowStatus);
SQLRETURN SQL_API SQLForeignKeys(
SQLHSTMT hstmt,
- SQLCHAR *szPkCatalogName,
+ SQLCHAR *szPkCatalogName,
SQLSMALLINT cbPkCatalogName,
- SQLCHAR *szPkSchemaName,
+ SQLCHAR *szPkSchemaName,
SQLSMALLINT cbPkSchemaName,
- SQLCHAR *szPkTableName,
+ SQLCHAR *szPkTableName,
SQLSMALLINT cbPkTableName,
- SQLCHAR *szFkCatalogName,
+ SQLCHAR *szFkCatalogName,
SQLSMALLINT cbFkCatalogName,
- SQLCHAR *szFkSchemaName,
+ SQLCHAR *szFkSchemaName,
SQLSMALLINT cbFkSchemaName,
- SQLCHAR *szFkTableName,
+ SQLCHAR *szFkTableName,
SQLSMALLINT cbFkTableName);
SQLRETURN SQL_API SQLMoreResults(
@@ -1881,48 +1881,48 @@ SQLRETURN SQL_API SQLMoreResults(
SQLRETURN SQL_API SQLNativeSql(
SQLHDBC hdbc,
- SQLCHAR *szSqlStrIn,
+ SQLCHAR *szSqlStrIn,
SQLINTEGER cbSqlStrIn,
- SQLCHAR *szSqlStr,
+ SQLCHAR *szSqlStr,
SQLINTEGER cbSqlStrMax,
- SQLINTEGER *pcbSqlStr);
+ SQLINTEGER *pcbSqlStr);
SQLRETURN SQL_API SQLNumParams(
SQLHSTMT hstmt,
- SQLSMALLINT *pcpar);
+ SQLSMALLINT *pcpar);
SQLRETURN SQL_API SQLParamOptions(
SQLHSTMT hstmt,
- SQLULEN crow,
- SQLULEN *pirow);
+ SQLULEN crow,
+ SQLULEN *pirow);
SQLRETURN SQL_API SQLPrimaryKeys(
SQLHSTMT hstmt,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szTableName,
+ SQLCHAR *szTableName,
SQLSMALLINT cbTableName);
SQLRETURN SQL_API SQLProcedureColumns(
SQLHSTMT hstmt,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szProcName,
+ SQLCHAR *szProcName,
SQLSMALLINT cbProcName,
- SQLCHAR *szColumnName,
+ SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName);
SQLRETURN SQL_API SQLProcedures(
SQLHSTMT hstmt,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szProcName,
+ SQLCHAR *szProcName,
SQLSMALLINT cbProcName);
SQLRETURN SQL_API SQLSetPos(
@@ -1933,22 +1933,22 @@ SQLRETURN SQL_API SQLSetPos(
SQLRETURN SQL_API SQLTablePrivileges(
SQLHSTMT hstmt,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szTableName,
+ SQLCHAR *szTableName,
SQLSMALLINT cbTableName);
SQLRETURN SQL_API SQLDrivers(
SQLHENV henv,
SQLUSMALLINT fDirection,
- SQLCHAR *szDriverDesc,
+ SQLCHAR *szDriverDesc,
SQLSMALLINT cbDriverDescMax,
- SQLSMALLINT *pcbDriverDesc,
- SQLCHAR *szDriverAttributes,
+ SQLSMALLINT *pcbDriverDesc,
+ SQLCHAR *szDriverAttributes,
SQLSMALLINT cbDrvrAttrMax,
- SQLSMALLINT *pcbDrvrAttr);
+ SQLSMALLINT *pcbDrvrAttr);
SQLRETURN SQL_API SQLBindParameter(
SQLHSTMT hstmt,
@@ -1960,38 +1960,38 @@ SQLRETURN SQL_API SQLBindParameter(
SQLSMALLINT ibScale,
SQLPOINTER rgbValue,
SQLLEN cbValueMax,
- SQLLEN *pcbValue);
+ SQLLEN *pcbValue);
/*---------------------------------------------------------*/
/* SQLAllocHandleStd is implemented to make SQLAllocHandle */
-/* compatible with X/Open standard. an application should */
-/* not call SQLAllocHandleStd directly */
+/* compatible with X/Open standard. an application should */
+/* not call SQLAllocHandleStd directly */
/*---------------------------------------------------------*/
#ifdef ODBC_STD
#define SQLAllocHandle SQLAllocHandleStd
#define SQLAllocEnv(phenv) SQLAllocHandleStd(SQL_HANDLE_ENV, SQL_NULL_HANDLE, phenv)
/* Internal type subcodes */
-#define SQL_YEAR SQL_CODE_YEAR
-#define SQL_MONTH SQL_CODE_MONTH
-#define SQL_DAY SQL_CODE_DAY
-#define SQL_HOUR SQL_CODE_HOUR
-#define SQL_MINUTE SQL_CODE_MINUTE
-#define SQL_SECOND SQL_CODE_SECOND
-#define SQL_YEAR_TO_MONTH SQL_CODE_YEAR_TO_MONTH
-#define SQL_DAY_TO_HOUR SQL_CODE_DAY_TO_HOUR
-#define SQL_DAY_TO_MINUTE SQL_CODE_DAY_TO_MINUTE
-#define SQL_DAY_TO_SECOND SQL_CODE_DAY_TO_SECOND
-#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
-#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND
-#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND
+#define SQL_YEAR SQL_CODE_YEAR
+#define SQL_MONTH SQL_CODE_MONTH
+#define SQL_DAY SQL_CODE_DAY
+#define SQL_HOUR SQL_CODE_HOUR
+#define SQL_MINUTE SQL_CODE_MINUTE
+#define SQL_SECOND SQL_CODE_SECOND
+#define SQL_YEAR_TO_MONTH SQL_CODE_YEAR_TO_MONTH
+#define SQL_DAY_TO_HOUR SQL_CODE_DAY_TO_HOUR
+#define SQL_DAY_TO_MINUTE SQL_CODE_DAY_TO_MINUTE
+#define SQL_DAY_TO_SECOND SQL_CODE_DAY_TO_SECOND
+#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
+#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND
+#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND
#endif /* ODBC_STD */
#if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLAllocHandleStd(
- SQLSMALLINT fHandleType,
- SQLHANDLE hInput,
- SQLHANDLE *phOutput);
+ SQLSMALLINT fHandleType,
+ SQLHANDLE hInput,
+ SQLHANDLE *phOutput);
#endif
/* Deprecated defines from prior versions of ODBC */
@@ -2024,26 +2024,26 @@ SQLRETURN SQL_API SQLSetScrollOptions( /* Use SQLSetStmtOptions */
/*!
* \defgroup Tracing.
*
- * unixODBC implements a slight variation of the tracing mechanism used
+ * unixODBC implements a slight variation of the tracing mechanism used
* on MS platforms. The unixODBC method loses the ability to produce trace
* output for invalid handles but gains the following;
*
- * - better concurrency
+ * - better concurrency
* - allows tracing to be turned on/off and configured at finer granularity
* - hopefully; better performance
*
* unixODBC provides a cross-platform helper library called 'trace' and an
- * example/default trace plugin called 'odbctrac'. Those writing an ODBC
+ * example/default trace plugin called 'odbctrac'. Those writing an ODBC
* driver can use the 'trace' helper library (a static library). Those wanting
* to create custom trace output can implement a different version of the
* 'odbctrac' plugin.
*
- * The text file driver (odbctxt) included with unixODBC is an example of a
+ * The text file driver (odbctxt) included with unixODBC is an example of a
* driver using the 'trace' helper library.
*
- * The 'trace' library and the example plugin 'odbctrac' are designed to be
+ * The 'trace' library and the example plugin 'odbctrac' are designed to be
* portable on all platforms where unixODBC is available and on MS platforms.
- * This will allow drivers using 'trace' and 'odbctrac' plugin to equilly
+ * This will allow drivers using 'trace' and 'odbctrac' plugin to equilly
* portable. On MS platforms - this compliments traditional tracing (mostly
* just used by the Driver Manager).
*
@@ -2052,52 +2052,52 @@ SQLRETURN SQL_API SQLSetScrollOptions( /* Use SQLSetStmtOptions */
* odbctrac
*/
/*@{*/
-#define TRACE_VERSION 1000 /*!< Version of trace API */
+#define TRACE_VERSION 1000 /*!< Version of trace API */
#ifdef UNICODE
-RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); /*!< open a trace log file */
+RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); /*!< open a trace log file */
#else
-RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); /*!< open a trace log file */
+RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); /*!< open a trace log file */
#endif
-RETCODE TraceCloseLogFile(SQLPOINTER); /*!< Request to close a trace log */
+RETCODE TraceCloseLogFile(SQLPOINTER); /*!< Request to close a trace log */
SQLRETURN TraceReturn(SQLPOINTER,SQLRETURN); /*!< Call to produce trace output upon function return. */
#ifdef __cplusplus
-DWORD TraceVersion(); /*!< Returns trace API version */
+DWORD TraceVersion(); /*!< Returns trace API version */
#else
-DWORD TraceVersion(VOID); /*!< Returns trace API version */
+DWORD TraceVersion(VOID); /*!< Returns trace API version */
#endif
/* Functions for Visual Studio Analyzer*/
/* to turn on/off tracing or VS events, call TraceVSControl by setting or clearing the following bits */
-#define TRACE_ON 0x00000001L
-#define TRACE_VS_EVENT_ON 0x00000002L
+#define TRACE_ON 0x00000001L
+#define TRACE_VS_EVENT_ON 0x00000002L
-RETCODE TraceVSControl(DWORD);
+RETCODE TraceVSControl(DWORD);
/* the flags in ODBC_VS_ARGS */
-#define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L /* the argument is unicode */
-#define ODBC_VS_FLAG_UNICODE_COR 0x00000002L /* the correlation is unicode */
-#define ODBC_VS_FLAG_RETCODE 0x00000004L /* RetCode field is set */
-#define ODBC_VS_FLAG_STOP 0x00000008L /* Stop firing visual studio analyzer events */
+#define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L /* the argument is unicode */
+#define ODBC_VS_FLAG_UNICODE_COR 0x00000002L /* the correlation is unicode */
+#define ODBC_VS_FLAG_RETCODE 0x00000004L /* RetCode field is set */
+#define ODBC_VS_FLAG_STOP 0x00000008L /* Stop firing visual studio analyzer events */
typedef struct tagODBC_VS_ARGS {
#ifdef GUID_DEFINED
- const GUID *pguidEvent; /* the GUID for event */
+ const GUID *pguidEvent; /* the GUID for event */
#else
- const void *pguidEvent; /* the GUID for event */
+ const void *pguidEvent; /* the GUID for event */
#endif
- DWORD dwFlags; /* flags for the call */
+ DWORD dwFlags; /* flags for the call */
union {
- WCHAR *wszArg;
- CHAR *szArg;
+ WCHAR *wszArg;
+ CHAR *szArg;
}u1;
union {
- WCHAR *wszCorrelation;
- CHAR *szCorrelation;
- }u2;
- RETCODE RetCode;
+ WCHAR *wszCorrelation;
+ CHAR *szCorrelation;
+ }u2;
+ RETCODE RetCode;
} ODBC_VS_ARGS, *PODBC_VS_ARGS;
-VOID FireVSDebugEvent(PODBC_VS_ARGS);
+VOID FireVSDebugEvent(PODBC_VS_ARGS);
/*@}*/
#ifdef __cplusplus
diff --git a/unixODBC/inc/sqltypes.h b/unixODBC/inc/sqltypes.h
index b0c5b6d8cab6..130de90086ee 100644
--- a/unixODBC/inc/sqltypes.h
+++ b/unixODBC/inc/sqltypes.h
@@ -23,15 +23,15 @@
* default to the 3.51 definitions. should define ODBCVER before here if you want an older set of defines
***************************/
#ifndef ODBCVER
-#define ODBCVER 0x0351
+#define ODBCVER 0x0351
#endif
/*
* if thi sis set, then use a 4 byte unicode definition, insteead of the 2 bye that MS use
*/
-#ifdef SQL_WCHART_CONVERT
-/*
+#ifdef SQL_WCHART_CONVERT
+/*
* Use this if you want to use the C/C++ portable definition of a wide char, wchar_t
* Microsoft hardcoded a definition of unsigned short which may not be compatible with
* your platform specific wide char definition.
@@ -80,16 +80,16 @@ extern "C" {
#else
#define SQL_API
#endif
-#define BOOL int
-typedef void* HWND;
-typedef char CHAR;
+#define BOOL int
+typedef void* HWND;
+typedef char CHAR;
#ifdef UNICODE
-/*
- * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and
+/*
+ * NOTE: The Microsoft unicode define is only for apps that want to use TCHARs and
* be able to compile for both unicode and non-unicode with the same source.
* This is not recommanded for linux applications and is not supported
- * by the standard linux string header files.
+ * by the standard linux string header files.
*/
#ifdef SQL_WCHART_CONVERT
typedef wchar_t TCHAR;
@@ -98,33 +98,33 @@ typedef signed short TCHAR;
#endif
#else
-typedef char TCHAR;
+typedef char TCHAR;
#endif
#ifndef DONT_TD_VOID
-typedef void VOID;
+typedef void VOID;
#endif
-typedef unsigned short WORD;
+typedef unsigned short WORD;
#if (SIZEOF_LONG_INT == 4)
-typedef unsigned long DWORD;
+typedef unsigned long DWORD;
#else
-typedef unsigned int DWORD;
+typedef unsigned int DWORD;
#endif
-typedef unsigned char BYTE;
+typedef unsigned char BYTE;
#ifdef SQL_WCHART_CONVERT
typedef wchar_t WCHAR;
#else
-typedef unsigned short WCHAR;
+typedef unsigned short WCHAR;
#endif
-typedef WCHAR* LPWSTR;
+typedef WCHAR* LPWSTR;
typedef const char* LPCSTR;
typedef const WCHAR* LPCWSTR;
typedef TCHAR* LPTSTR;
typedef char* LPSTR;
-typedef DWORD* LPDWORD;
+typedef DWORD* LPDWORD;
typedef void* HINSTANCE;
@@ -150,7 +150,7 @@ typedef double SQLFLOAT;
/*
* Hopefully by now it should be safe to assume most drivers know about SQLLEN now
* and the defaukt is now sizeof( SQLLEN ) = 8 on 64 bit platforms
- *
+ *
*/
#if (SIZEOF_LONG_INT == 8)
@@ -160,7 +160,7 @@ typedef unsigned int SQLUINTEGER;
#define SQLLEN SQLINTEGER
#define SQLULEN SQLUINTEGER
#define SQLSETPOSIROW SQLUSMALLINT
-/*
+/*
* These are not supprted on 64bit ODBC according to MS, removed, so use at your peril
*
typedef SQLULEN SQLROWCOUNT;
@@ -174,13 +174,13 @@ typedef unsigned int SQLUINTEGER;
typedef long SQLLEN;
typedef unsigned long SQLULEN;
typedef unsigned long SQLSETPOSIROW;
-/*
+/*
* These are not supprted on 64bit ODBC according to MS, removed, so use at your peril
*
- typedef SQLULEN SQLTRANSID;
- typedef SQLULEN SQLROWCOUNT;
- typedef SQLUINTEGER SQLROWSETSIZE;
- typedef SQLLEN SQLROWOFFSET;
+ typedef SQLULEN SQLTRANSID;
+ typedef SQLULEN SQLROWCOUNT;
+ typedef SQLUINTEGER SQLROWSETSIZE;
+ typedef SQLLEN SQLROWOFFSET;
*/
typedef SQLULEN SQLROWCOUNT;
typedef SQLULEN SQLROWSETSIZE;
@@ -221,7 +221,7 @@ typedef unsigned char SQLVARCHAR;
typedef SQLSMALLINT SQLRETURN;
#if (ODBCVER >= 0x0300)
-typedef void * SQLHANDLE;
+typedef void * SQLHANDLE;
typedef SQLHANDLE SQLHENV;
typedef SQLHANDLE SQLHDBC;
typedef SQLHANDLE SQLHSTMT;
@@ -233,7 +233,7 @@ typedef void * SQLHSTMT;
/*
* some things like PHP won't build without this
*/
-typedef void * SQLHANDLE;
+typedef void * SQLHANDLE;
#endif
/****************************
@@ -244,13 +244,13 @@ typedef void * SQLHANDLE;
***************************/
#if (ODBCVER >= 0x0300)
-typedef SQLHANDLE HENV;
-typedef SQLHANDLE HDBC;
-typedef SQLHANDLE HSTMT;
+typedef SQLHANDLE HENV;
+typedef SQLHANDLE HDBC;
+typedef SQLHANDLE HSTMT;
#else
-typedef void * HENV;
-typedef void * HDBC;
-typedef void * HSTMT;
+typedef void * HENV;
+typedef void * HDBC;
+typedef void * HSTMT;
#endif
@@ -277,9 +277,9 @@ typedef signed short SSHORT;
typedef unsigned long ULONG;
typedef unsigned short USHORT;
typedef double SDOUBLE;
-typedef double LDOUBLE;
+typedef double LDOUBLE;
typedef float SFLOAT;
-typedef void* PTR;
+typedef void* PTR;
typedef signed short RETCODE;
typedef void* SQLHWND;
@@ -288,8 +288,8 @@ typedef void* SQLHWND;
/****************************
* standard structs for working with date/times
***************************/
-#ifndef __SQLDATE
-#define __SQLDATE
+#ifndef __SQLDATE
+#define __SQLDATE
typedef struct tagDATE_STRUCT
{
SQLSMALLINT year;
@@ -298,7 +298,7 @@ typedef struct tagDATE_STRUCT
} DATE_STRUCT;
#if (ODBCVER >= 0x0300)
-typedef DATE_STRUCT SQL_DATE_STRUCT;
+typedef DATE_STRUCT SQL_DATE_STRUCT;
#endif
typedef struct tagTIME_STRUCT
@@ -309,7 +309,7 @@ typedef struct tagTIME_STRUCT
} TIME_STRUCT;
#if (ODBCVER >= 0x0300)
-typedef TIME_STRUCT SQL_TIME_STRUCT;
+typedef TIME_STRUCT SQL_TIME_STRUCT;
#endif
typedef struct tagTIMESTAMP_STRUCT
@@ -324,26 +324,26 @@ typedef struct tagTIMESTAMP_STRUCT
} TIMESTAMP_STRUCT;
#if (ODBCVER >= 0x0300)
-typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT;
+typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT;
#endif
#if (ODBCVER >= 0x0300)
typedef enum
{
- SQL_IS_YEAR = 1,
- SQL_IS_MONTH = 2,
- SQL_IS_DAY = 3,
- SQL_IS_HOUR = 4,
- SQL_IS_MINUTE = 5,
- SQL_IS_SECOND = 6,
- SQL_IS_YEAR_TO_MONTH = 7,
- SQL_IS_DAY_TO_HOUR = 8,
- SQL_IS_DAY_TO_MINUTE = 9,
- SQL_IS_DAY_TO_SECOND = 10,
- SQL_IS_HOUR_TO_MINUTE = 11,
- SQL_IS_HOUR_TO_SECOND = 12,
- SQL_IS_MINUTE_TO_SECOND = 13
+ SQL_IS_YEAR = 1,
+ SQL_IS_MONTH = 2,
+ SQL_IS_DAY = 3,
+ SQL_IS_HOUR = 4,
+ SQL_IS_MINUTE = 5,
+ SQL_IS_SECOND = 6,
+ SQL_IS_YEAR_TO_MONTH = 7,
+ SQL_IS_DAY_TO_HOUR = 8,
+ SQL_IS_DAY_TO_MINUTE = 9,
+ SQL_IS_DAY_TO_SECOND = 10,
+ SQL_IS_HOUR_TO_MINUTE = 11,
+ SQL_IS_HOUR_TO_SECOND = 12,
+ SQL_IS_MINUTE_TO_SECOND = 13
} SQLINTERVAL;
#endif
@@ -351,26 +351,26 @@ typedef enum
#if (ODBCVER >= 0x0300)
typedef struct tagSQL_YEAR_MONTH
{
- SQLUINTEGER year;
- SQLUINTEGER month;
+ SQLUINTEGER year;
+ SQLUINTEGER month;
} SQL_YEAR_MONTH_STRUCT;
typedef struct tagSQL_DAY_SECOND
{
- SQLUINTEGER day;
- SQLUINTEGER hour;
- SQLUINTEGER minute;
- SQLUINTEGER second;
- SQLUINTEGER fraction;
+ SQLUINTEGER day;
+ SQLUINTEGER hour;
+ SQLUINTEGER minute;
+ SQLUINTEGER second;
+ SQLUINTEGER fraction;
} SQL_DAY_SECOND_STRUCT;
typedef struct tagSQL_INTERVAL_STRUCT
{
- SQLINTERVAL interval_type;
- SQLSMALLINT interval_sign;
+ SQLINTERVAL interval_type;
+ SQLSMALLINT interval_sign;
union {
- SQL_YEAR_MONTH_STRUCT year_month;
- SQL_DAY_SECOND_STRUCT day_second;
+ SQL_YEAR_MONTH_STRUCT year_month;
+ SQL_DAY_SECOND_STRUCT day_second;
} intval;
} SQL_INTERVAL_STRUCT;
@@ -385,12 +385,12 @@ typedef struct tagSQL_INTERVAL_STRUCT
#ifndef ODBCINT64
# if (ODBCVER >= 0x0300)
# if (SIZEOF_LONG_INT == 8)
-# define ODBCINT64 long
-# define UODBCINT64 unsigned long
+# define ODBCINT64 long
+# define UODBCINT64 unsigned long
# else
# ifdef HAVE_LONG_LONG
-# define ODBCINT64 long long
-# define UODBCINT64 unsigned long long
+# define ODBCINT64 long long
+# define UODBCINT64 unsigned long long
# else
/*
* may fail in some cases, but what else can we do ?
@@ -405,18 +405,18 @@ struct __bigint_struct_u
unsigned int hiword;
unsigned int loword;
};
-# define ODBCINT64 struct __bigint_struct
-# define UODBCINT64 struct __bigint_struct_u
+# define ODBCINT64 struct __bigint_struct
+# define UODBCINT64 struct __bigint_struct_u
# endif
# endif
#endif
#endif
#ifdef ODBCINT64
-typedef ODBCINT64 SQLBIGINT;
+typedef ODBCINT64 SQLBIGINT;
#endif
#ifdef UODBCINT64
-typedef UODBCINT64 SQLUBIGINT;
+typedef UODBCINT64 SQLUBIGINT;
#endif
@@ -424,20 +424,20 @@ typedef UODBCINT64 SQLUBIGINT;
* cursor and bookmark
***************************/
#if (ODBCVER >= 0x0300)
-#define SQL_MAX_NUMERIC_LEN 16
+#define SQL_MAX_NUMERIC_LEN 16
typedef struct tagSQL_NUMERIC_STRUCT
{
- SQLCHAR precision;
- SQLSCHAR scale;
- SQLCHAR sign; /* 1=pos 0=neg */
- SQLCHAR val[SQL_MAX_NUMERIC_LEN];
+ SQLCHAR precision;
+ SQLSCHAR scale;
+ SQLCHAR sign; /* 1=pos 0=neg */
+ SQLCHAR val[SQL_MAX_NUMERIC_LEN];
} SQL_NUMERIC_STRUCT;
#endif
#if (ODBCVER >= 0x0350)
#ifdef GUID_DEFINED
#ifndef ALLREADY_HAVE_WINDOWS_TYPE
-typedef GUID SQLGUID;
+typedef GUID SQLGUID;
#else
typedef struct tagSQLGUID
{
diff --git a/unixODBC/inc/sqlucode.h b/unixODBC/inc/sqlucode.h
index 366dab75127a..14ea0b4a985b 100644
--- a/unixODBC/inc/sqlucode.h
+++ b/unixODBC/inc/sqlucode.h
@@ -11,29 +11,29 @@
extern "C" {
#endif
-#define SQL_WCHAR (-8)
-#define SQL_WVARCHAR (-9)
-#define SQL_WLONGVARCHAR (-10)
-#define SQL_C_WCHAR SQL_WCHAR
+#define SQL_WCHAR (-8)
+#define SQL_WVARCHAR (-9)
+#define SQL_WLONGVARCHAR (-10)
+#define SQL_C_WCHAR SQL_WCHAR
#ifdef UNICODE
-#define SQL_C_TCHAR SQL_C_WCHAR
+#define SQL_C_TCHAR SQL_C_WCHAR
#else
-#define SQL_C_TCHAR SQL_C_CHAR
-#endif
+#define SQL_C_TCHAR SQL_C_CHAR
+#endif
-#define SQL_SQLSTATE_SIZEW 10 /* size of SQLSTATE for unicode */
+#define SQL_SQLSTATE_SIZEW 10 /* size of SQLSTATE for unicode */
/* UNICODE versions */
SQLRETURN SQL_API SQLColAttributeW(
- SQLHSTMT hstmt,
- SQLUSMALLINT iCol,
- SQLUSMALLINT iField,
- SQLPOINTER pCharAttr,
- SQLSMALLINT cbCharAttrMax,
- SQLSMALLINT *pcbCharAttr,
- SQLLEN *pNumAttr);
+ SQLHSTMT hstmt,
+ SQLUSMALLINT iCol,
+ SQLUSMALLINT iField,
+ SQLPOINTER pCharAttr,
+ SQLSMALLINT cbCharAttrMax,
+ SQLSMALLINT *pcbCharAttr,
+ SQLLEN *pNumAttr);
SQLRETURN SQL_API SQLColAttributesW(
SQLHSTMT hstmt,
@@ -96,9 +96,9 @@ SQLRETURN SQL_API SQLGetCursorNameW(
#if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLSetDescFieldW(SQLHDESC DescriptorHandle,
- SQLSMALLINT RecNumber,
+ SQLSMALLINT RecNumber,
SQLSMALLINT FieldIdentifier,
- SQLPOINTER Value,
+ SQLPOINTER Value,
SQLINTEGER BufferLength);
@@ -108,7 +108,7 @@ SQLRETURN SQL_API SQLGetDescFieldW(
SQLSMALLINT iRecord,
SQLSMALLINT iField,
SQLPOINTER rgbValue,
- SQLINTEGER cbValueMax,
+ SQLINTEGER cbValueMax,
SQLINTEGER *pcbValue);
SQLRETURN SQL_API SQLGetDescRecW(
@@ -120,7 +120,7 @@ SQLRETURN SQL_API SQLGetDescRecW(
SQLSMALLINT *pfType,
SQLSMALLINT *pfSubType,
SQLLEN *pLength,
- SQLSMALLINT *pPrecision,
+ SQLSMALLINT *pPrecision,
SQLSMALLINT *pScale,
SQLSMALLINT *pNullable);
@@ -165,7 +165,7 @@ SQLRETURN SQL_API SQLSetCursorNameW(
-
+
@@ -194,9 +194,9 @@ SQLRETURN SQL_API SQLGetInfoW(
SQLSMALLINT cbInfoValueMax,
SQLSMALLINT *pcbInfoValue);
-SQLRETURN SQL_API SQLGetTypeInfoW(
- SQLHSTMT StatementHandle,
- SQLSMALLINT DataType);
+SQLRETURN SQL_API SQLGetTypeInfoW(
+ SQLHSTMT StatementHandle,
+ SQLSMALLINT DataType);
SQLRETURN SQL_API SQLSetConnectOptionW(
@@ -375,13 +375,13 @@ SQLRETURN SQL_API SQLDriversW(
/* ANSI versions */
SQLRETURN SQL_API SQLColAttributeA(
- SQLHSTMT hstmt,
- SQLSMALLINT iCol,
- SQLSMALLINT iField,
- SQLPOINTER pCharAttr,
- SQLSMALLINT cbCharAttrMax,
- SQLSMALLINT *pcbCharAttr,
- SQLLEN *pNumAttr);
+ SQLHSTMT hstmt,
+ SQLSMALLINT iCol,
+ SQLSMALLINT iField,
+ SQLPOINTER pCharAttr,
+ SQLSMALLINT cbCharAttrMax,
+ SQLSMALLINT *pcbCharAttr,
+ SQLLEN *pNumAttr);
SQLRETURN SQL_API SQLColAttributesA(
SQLHSTMT hstmt,
@@ -389,8 +389,8 @@ SQLRETURN SQL_API SQLColAttributesA(
SQLUSMALLINT fDescType,
SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax,
- SQLSMALLINT *pcbDesc,
- SQLLEN *pfDesc);
+ SQLSMALLINT *pcbDesc,
+ SQLLEN *pfDesc);
SQLRETURN SQL_API SQLConnectA(
SQLHDBC hdbc,
@@ -407,11 +407,11 @@ SQLRETURN SQL_API SQLDescribeColA(
SQLUSMALLINT icol,
SQLCHAR *szColName,
SQLSMALLINT cbColNameMax,
- SQLSMALLINT *pcbColName,
- SQLSMALLINT *pfSqlType,
- SQLULEN *pcbColDef,
- SQLSMALLINT *pibScale,
- SQLSMALLINT *pfNullable);
+ SQLSMALLINT *pcbColName,
+ SQLSMALLINT *pfSqlType,
+ SQLULEN *pcbColDef,
+ SQLSMALLINT *pibScale,
+ SQLSMALLINT *pfNullable);
SQLRETURN SQL_API SQLErrorA(
@@ -438,7 +438,7 @@ SQLRETURN SQL_API SQLGetConnectAttrA(
SQLRETURN SQL_API SQLGetCursorNameA(
SQLHSTMT hstmt,
- SQLCHAR *szCursor,
+ SQLCHAR *szCursor,
SQLSMALLINT cbCursorMax,
SQLSMALLINT *pcbCursor);
@@ -448,7 +448,7 @@ SQLRETURN SQL_API SQLGetDescFieldA(
SQLSMALLINT iRecord,
SQLSMALLINT iField,
SQLPOINTER rgbValue,
- SQLINTEGER cbValueMax,
+ SQLINTEGER cbValueMax,
SQLINTEGER *pcbValue);
SQLRETURN SQL_API SQLGetDescRecA(
@@ -460,7 +460,7 @@ SQLRETURN SQL_API SQLGetDescRecA(
SQLSMALLINT *pfType,
SQLSMALLINT *pfSubType,
SQLLEN *pLength,
- SQLSMALLINT *pPrecision,
+ SQLSMALLINT *pPrecision,
SQLSMALLINT *pScale,
SQLSMALLINT *pNullable);
@@ -493,13 +493,13 @@ SQLRETURN SQL_API SQLGetStmtAttrA(
#endif
-SQLRETURN SQL_API SQLGetTypeInfoA(
- SQLHSTMT StatementHandle,
- SQLSMALLINT DataTyoe);
+SQLRETURN SQL_API SQLGetTypeInfoA(
+ SQLHSTMT StatementHandle,
+ SQLSMALLINT DataTyoe);
SQLRETURN SQL_API SQLPrepareA(
SQLHSTMT hstmt,
- SQLCHAR *szSqlStr,
+ SQLCHAR *szSqlStr,
SQLINTEGER cbSqlStr);
SQLRETURN SQL_API SQLSetConnectAttrA(
@@ -515,19 +515,19 @@ SQLRETURN SQL_API SQLSetCursorNameA(
-
+
SQLRETURN SQL_API SQLColumnsA(
SQLHSTMT hstmt,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szTableName,
+ SQLCHAR *szTableName,
SQLSMALLINT cbTableName,
- SQLCHAR *szColumnName,
+ SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName);
SQLRETURN SQL_API SQLGetConnectOptionA(
@@ -562,11 +562,11 @@ SQLRETURN SQL_API SQLSetStmtOptionA(
SQLRETURN SQL_API SQLSpecialColumnsA(
SQLHSTMT hstmt,
SQLUSMALLINT fColType,
- SQLCHAR *szCatalogName,
+ SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName,
- SQLCHAR *szSchemaName,
+ SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName,
- SQLCHAR *szTableName,
+ SQLCHAR *szTableName,
SQLSMALLINT cbTableName,
SQLUSMALLINT fScope,
SQLUSMALLINT fNullable);
@@ -732,49 +732,49 @@ SQLRETURN SQL_API SQLDriversA(
/* Mapping macros for Unicode */
/*---------------------------------------------*/
-#ifndef SQL_NOUNICODEMAP /* define this to disable the mapping */
-#ifdef UNICODE
-
-#define SQLColAttribute SQLColAttributeW
-#define SQLColAttributes SQLColAttributesW
-#define SQLConnect SQLConnectW
-#define SQLDescribeCol SQLDescribeColW
-#define SQLError SQLErrorW
-#define SQLExecDirect SQLExecDirectW
-#define SQLGetConnectAttr SQLGetConnectAttrW
-#define SQLGetCursorName SQLGetCursorNameW
-#define SQLGetDescField SQLGetDescFieldW
-#define SQLGetDescRec SQLGetDescRecW
-#define SQLGetDiagField SQLGetDiagFieldW
-#define SQLGetDiagRec SQLGetDiagRecW
-#define SQLPrepare SQLPrepareW
-#define SQLSetConnectAttr SQLSetConnectAttrW
-#define SQLSetCursorName SQLSetCursorNameW
-#define SQLSetDescField SQLSetDescFieldW
-#define SQLSetStmtAttr SQLSetStmtAttrW
-#define SQLGetStmtAttr SQLGetStmtAttrW
-#define SQLColumns SQLColumnsW
-#define SQLGetConnectOption SQLGetConnectOptionW
-#define SQLGetInfo SQLGetInfoW
-#define SQLGetTypeInfo SQLGetTypeInfoW
-#define SQLSetConnectOption SQLSetConnectOptionW
-#define SQLSpecialColumns SQLSpecialColumnsW
-#define SQLStatistics SQLStatisticsW
-#define SQLTables SQLTablesW
-#define SQLDataSources SQLDataSourcesW
-#define SQLDriverConnect SQLDriverConnectW
-#define SQLBrowseConnect SQLBrowseConnectW
-#define SQLColumnPrivileges SQLColumnPrivilegesW
-#define SQLForeignKeys SQLForeignKeysW
-#define SQLNativeSql SQLNativeSqlW
-#define SQLPrimaryKeys SQLPrimaryKeysW
-#define SQLProcedureColumns SQLProcedureColumnsW
-#define SQLProcedures SQLProceduresW
-#define SQLTablePrivileges SQLTablePrivilegesW
-#define SQLDrivers SQLDriversW
-
-#endif /* UNICODE */
-#endif /* SQL_NOUNICODEMAP */
+#ifndef SQL_NOUNICODEMAP /* define this to disable the mapping */
+#ifdef UNICODE
+
+#define SQLColAttribute SQLColAttributeW
+#define SQLColAttributes SQLColAttributesW
+#define SQLConnect SQLConnectW
+#define SQLDescribeCol SQLDescribeColW
+#define SQLError SQLErrorW
+#define SQLExecDirect SQLExecDirectW
+#define SQLGetConnectAttr SQLGetConnectAttrW
+#define SQLGetCursorName SQLGetCursorNameW
+#define SQLGetDescField SQLGetDescFieldW
+#define SQLGetDescRec SQLGetDescRecW
+#define SQLGetDiagField SQLGetDiagFieldW
+#define SQLGetDiagRec SQLGetDiagRecW
+#define SQLPrepare SQLPrepareW
+#define SQLSetConnectAttr SQLSetConnectAttrW
+#define SQLSetCursorName SQLSetCursorNameW
+#define SQLSetDescField SQLSetDescFieldW
+#define SQLSetStmtAttr SQLSetStmtAttrW
+#define SQLGetStmtAttr SQLGetStmtAttrW
+#define SQLColumns SQLColumnsW
+#define SQLGetConnectOption SQLGetConnectOptionW
+#define SQLGetInfo SQLGetInfoW
+#define SQLGetTypeInfo SQLGetTypeInfoW
+#define SQLSetConnectOption SQLSetConnectOptionW
+#define SQLSpecialColumns SQLSpecialColumnsW
+#define SQLStatistics SQLStatisticsW
+#define SQLTables SQLTablesW
+#define SQLDataSources SQLDataSourcesW
+#define SQLDriverConnect SQLDriverConnectW
+#define SQLBrowseConnect SQLBrowseConnectW
+#define SQLColumnPrivileges SQLColumnPrivilegesW
+#define SQLForeignKeys SQLForeignKeysW
+#define SQLNativeSql SQLNativeSqlW
+#define SQLPrimaryKeys SQLPrimaryKeysW
+#define SQLProcedureColumns SQLProcedureColumnsW
+#define SQLProcedures SQLProceduresW
+#define SQLTablePrivileges SQLTablePrivilegesW
+#define SQLDrivers SQLDriversW
+
+#endif /* UNICODE */
+#endif /* SQL_NOUNICODEMAP */
#ifdef __cplusplus
}
diff --git a/x11_extensions/inc/Xrandr.h b/x11_extensions/inc/Xrandr.h
index 3cf2a674760f..2f0cb7e86af7 100644
--- a/x11_extensions/inc/Xrandr.h
+++ b/x11_extensions/inc/Xrandr.h
@@ -18,7 +18,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Jim Gettys, HP Labs, HP.
@@ -33,10 +33,10 @@
_XFUNCPROTOBEGIN
-
+
typedef struct {
- int width, height;
- int mwidth, mheight;
+ int width, height;
+ int mwidth, mheight;
} XRRScreenSize;
/*
@@ -44,14 +44,14 @@ typedef struct {
*/
typedef struct {
- int type; /* event base */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent request */
- Display *display; /* Display the event was read from */
- Window window; /* window which selected for this event */
- Window root; /* Root window for changed screen */
- Time timestamp; /* when the screen change occurred */
- Time config_timestamp; /* when the last configuration change */
+ int type; /* event base */
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came from a SendEvent request */
+ Display *display; /* Display the event was read from */
+ Window window; /* window which selected for this event */
+ Window root; /* Root window for changed screen */
+ Time timestamp; /* when the screen change occurred */
+ Time config_timestamp; /* when the last configuration change */
SizeID size_index;
SubpixelOrder subpixel_order;
Rotation rotation;
@@ -63,7 +63,7 @@ typedef struct {
/* internal representation is private to the library */
-typedef struct _XRRScreenConfiguration XRRScreenConfiguration;
+typedef struct _XRRScreenConfiguration XRRScreenConfiguration;
Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep);
Status XRRQueryVersion (Display *dpy,
@@ -72,17 +72,17 @@ Status XRRQueryVersion (Display *dpy,
XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy,
Drawable draw);
-
+
void XRRFreeScreenConfigInfo (XRRScreenConfiguration *config);
-/*
+/*
* Note that screen configuration changes are only permitted if the client can
* prove it has up to date configuration information. We are trying to
* insist that it become possible for screens to change dynamically, so
* we want to ensure the client knows what it is talking about when requesting
* changes.
*/
-Status XRRSetScreenConfig (Display *dpy,
+Status XRRSetScreenConfig (Display *dpy,
XRRScreenConfiguration *config,
Drawable draw,
int size_index,
@@ -90,7 +90,7 @@ Status XRRSetScreenConfig (Display *dpy,
Time timestamp);
/* added in v1.1, sorry for the lame name */
-Status XRRSetScreenConfigAndRate (Display *dpy,
+Status XRRSetScreenConfigAndRate (Display *dpy,
XRRScreenConfiguration *config,
Drawable draw,
int size_index,
@@ -107,14 +107,14 @@ XRRScreenSize *XRRConfigSizes(XRRScreenConfiguration *config, int *nsizes);
short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates);
-SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config,
+SizeID XRRConfigCurrentConfiguration (XRRScreenConfiguration *config,
Rotation *rotation);
-
+
short XRRConfigCurrentRate (XRRScreenConfiguration *config);
int XRRRootToScreen(Display *dpy, Window root);
-/*
+/*
* returns the screen configuration for the specified screen; does a lazy
* evalution to delay getting the information, and caches the result.
* These routines should be used in preference to XRRGetScreenInfo
@@ -127,9 +127,9 @@ XRRScreenConfiguration *XRRScreenConfig(Display *dpy, int screen);
XRRScreenConfiguration *XRRConfig(Screen *screen);
void XRRSelectInput(Display *dpy, Window window, int mask);
-/*
- * the following are always safe to call, even if RandR is not implemented
- * on a screen
+/*
+ * the following are always safe to call, even if RandR is not implemented
+ * on a screen
*/
@@ -139,8 +139,8 @@ short *XRRRates (Display *dpy, int screen, int sizeID, int *nrates);
Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
-/*
- * intended to take RRScreenChangeNotify, or
+/*
+ * intended to take RRScreenChangeNotify, or
* ConfigureNotify (on the root window)
* returns 1 if it is an event type it understands, 0 if not
*/
diff --git a/x11_extensions/inc/Xrender.h b/x11_extensions/inc/Xrender.h
index 1b3bc939f24e..73a654ac4179 100644
--- a/x11_extensions/inc/Xrender.h
+++ b/x11_extensions/inc/Xrender.h
@@ -16,7 +16,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
@@ -44,40 +44,40 @@ typedef struct {
} XRenderDirectFormat;
typedef struct {
- PictFormat id;
- int type;
- int depth;
- XRenderDirectFormat direct;
- Colormap colormap;
+ PictFormat id;
+ int type;
+ int depth;
+ XRenderDirectFormat direct;
+ Colormap colormap;
} XRenderPictFormat;
-#define PictFormatID (1 << 0)
-#define PictFormatType (1 << 1)
-#define PictFormatDepth (1 << 2)
-#define PictFormatRed (1 << 3)
+#define PictFormatID (1 << 0)
+#define PictFormatType (1 << 1)
+#define PictFormatDepth (1 << 2)
+#define PictFormatRed (1 << 3)
#define PictFormatRedMask (1 << 4)
-#define PictFormatGreen (1 << 5)
+#define PictFormatGreen (1 << 5)
#define PictFormatGreenMask (1 << 6)
-#define PictFormatBlue (1 << 7)
+#define PictFormatBlue (1 << 7)
#define PictFormatBlueMask (1 << 8)
-#define PictFormatAlpha (1 << 9)
+#define PictFormatAlpha (1 << 9)
#define PictFormatAlphaMask (1 << 10)
#define PictFormatColormap (1 << 11)
typedef struct _XRenderPictureAttributes {
- int repeat;
- Picture alpha_map;
- int alpha_x_origin;
- int alpha_y_origin;
- int clip_x_origin;
- int clip_y_origin;
- Pixmap clip_mask;
- Bool graphics_exposures;
- int subwindow_mode;
- int poly_edge;
- int poly_mode;
- Atom dither;
- Bool component_alpha;
+ int repeat;
+ Picture alpha_map;
+ int alpha_x_origin;
+ int alpha_y_origin;
+ int clip_x_origin;
+ int clip_y_origin;
+ Pixmap clip_mask;
+ Bool graphics_exposures;
+ int subwindow_mode;
+ int poly_edge;
+ int poly_mode;
+ Atom dither;
+ Bool component_alpha;
} XRenderPictureAttributes;
typedef struct {
@@ -90,37 +90,37 @@ typedef struct {
typedef struct _XGlyphInfo {
unsigned short width;
unsigned short height;
- short x;
- short y;
- short xOff;
- short yOff;
+ short x;
+ short y;
+ short xOff;
+ short yOff;
} XGlyphInfo;
typedef struct _XGlyphElt8 {
- GlyphSet glyphset;
- _Xconst char *chars;
- int nchars;
- int xOff;
- int yOff;
+ GlyphSet glyphset;
+ _Xconst char *chars;
+ int nchars;
+ int xOff;
+ int yOff;
} XGlyphElt8;
typedef struct _XGlyphElt16 {
- GlyphSet glyphset;
+ GlyphSet glyphset;
_Xconst unsigned short *chars;
- int nchars;
- int xOff;
- int yOff;
+ int nchars;
+ int xOff;
+ int yOff;
} XGlyphElt16;
typedef struct _XGlyphElt32 {
- GlyphSet glyphset;
+ GlyphSet glyphset;
_Xconst unsigned int *chars;
- int nchars;
- int xOff;
- int yOff;
+ int nchars;
+ int xOff;
+ int yOff;
} XGlyphElt32;
-typedef double XDouble;
+typedef double XDouble;
typedef struct _XPointDouble {
XDouble x, y;
@@ -136,11 +136,11 @@ typedef struct _XPointFixed {
} XPointFixed;
typedef struct _XLineFixed {
- XPointFixed p1, p2;
+ XPointFixed p1, p2;
} XLineFixed;
typedef struct _XTriangle {
- XPointFixed p1, p2, p3;
+ XPointFixed p1, p2, p3;
} XTriangle;
typedef struct _XCircle {
@@ -151,7 +151,7 @@ typedef struct _XCircle {
typedef struct _XTrapezoid {
XFixed top, bottom;
- XLineFixed left, right;
+ XLineFixed left, right;
} XTrapezoid;
typedef struct _XTransform {
@@ -159,9 +159,9 @@ typedef struct _XTransform {
} XTransform;
typedef struct _XFilters {
- int nfilter;
+ int nfilter;
char **filter;
- int nalias;
+ int nalias;
short *alias;
} XFilters;
@@ -171,16 +171,16 @@ typedef struct _XIndexValue {
} XIndexValue;
typedef struct _XAnimCursor {
- Cursor cursor;
+ Cursor cursor;
unsigned long delay;
} XAnimCursor;
typedef struct _XSpanFix {
- XFixed left, right, y;
+ XFixed left, right, y;
} XSpanFix;
typedef struct _XTrap {
- XSpanFix top, bottom;
+ XSpanFix top, bottom;
} XTrap;
typedef struct _XLinearGradient {
@@ -216,57 +216,57 @@ XRenderPictFormat *
XRenderFindVisualFormat (Display *dpy, _Xconst Visual *visual);
XRenderPictFormat *
-XRenderFindFormat (Display *dpy,
- unsigned long mask,
- _Xconst XRenderPictFormat *templ,
- int count);
-
+XRenderFindFormat (Display *dpy,
+ unsigned long mask,
+ _Xconst XRenderPictFormat *templ,
+ int count);
+
#define PictStandardARGB32 0
#define PictStandardRGB24 1
-#define PictStandardA8 2
-#define PictStandardA4 3
-#define PictStandardA1 4
-#define PictStandardNUM 5
+#define PictStandardA8 2
+#define PictStandardA4 3
+#define PictStandardA1 4
+#define PictStandardNUM 5
XRenderPictFormat *
-XRenderFindStandardFormat (Display *dpy,
- int format);
+XRenderFindStandardFormat (Display *dpy,
+ int format);
XIndexValue *
-XRenderQueryPictIndexValues(Display *dpy,
- _Xconst XRenderPictFormat *format,
- int *num);
+XRenderQueryPictIndexValues(Display *dpy,
+ _Xconst XRenderPictFormat *format,
+ int *num);
Picture
-XRenderCreatePicture (Display *dpy,
- Drawable drawable,
- _Xconst XRenderPictFormat *format,
- unsigned long valuemask,
- _Xconst XRenderPictureAttributes *attributes);
+XRenderCreatePicture (Display *dpy,
+ Drawable drawable,
+ _Xconst XRenderPictFormat *format,
+ unsigned long valuemask,
+ _Xconst XRenderPictureAttributes *attributes);
void
-XRenderChangePicture (Display *dpy,
- Picture picture,
- unsigned long valuemask,
+XRenderChangePicture (Display *dpy,
+ Picture picture,
+ unsigned long valuemask,
_Xconst XRenderPictureAttributes *attributes);
void
-XRenderSetPictureClipRectangles (Display *dpy,
- Picture picture,
- int xOrigin,
- int yOrigin,
+XRenderSetPictureClipRectangles (Display *dpy,
+ Picture picture,
+ int xOrigin,
+ int yOrigin,
_Xconst XRectangle *rects,
- int n);
+ int n);
void
-XRenderSetPictureClipRegion (Display *dpy,
- Picture picture,
- Region r);
+XRenderSetPictureClipRegion (Display *dpy,
+ Picture picture,
+ Region r);
void
-XRenderSetPictureTransform (Display *dpy,
- Picture picture,
- XTransform *transform);
+XRenderSetPictureTransform (Display *dpy,
+ Picture picture,
+ XTransform *transform);
void
XRenderFreePicture (Display *dpy,
@@ -274,18 +274,18 @@ XRenderFreePicture (Display *dpy,
void
XRenderComposite (Display *dpy,
- int op,
+ int op,
Picture src,
Picture mask,
Picture dst,
- int src_x,
- int src_y,
- int mask_x,
- int mask_y,
- int dst_x,
- int dst_y,
- unsigned int width,
- unsigned int height);
+ int src_x,
+ int src_y,
+ int mask_x,
+ int mask_y,
+ int dst_x,
+ int dst_y,
+ unsigned int width,
+ unsigned int height);
GlyphSet
XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format);
@@ -297,184 +297,184 @@ void
XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset);
void
-XRenderAddGlyphs (Display *dpy,
- GlyphSet glyphset,
- _Xconst Glyph *gids,
- _Xconst XGlyphInfo *glyphs,
- int nglyphs,
- _Xconst char *images,
- int nbyte_images);
+XRenderAddGlyphs (Display *dpy,
+ GlyphSet glyphset,
+ _Xconst Glyph *gids,
+ _Xconst XGlyphInfo *glyphs,
+ int nglyphs,
+ _Xconst char *images,
+ int nbyte_images);
void
-XRenderFreeGlyphs (Display *dpy,
- GlyphSet glyphset,
+XRenderFreeGlyphs (Display *dpy,
+ GlyphSet glyphset,
_Xconst Glyph *gids,
- int nglyphs);
+ int nglyphs);
void
-XRenderCompositeString8 (Display *dpy,
- int op,
- Picture src,
- Picture dst,
+XRenderCompositeString8 (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
_Xconst XRenderPictFormat *maskFormat,
- GlyphSet glyphset,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
- _Xconst char *string,
- int nchar);
+ GlyphSet glyphset,
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
+ _Xconst char *string,
+ int nchar);
void
-XRenderCompositeString16 (Display *dpy,
- int op,
- Picture src,
- Picture dst,
+XRenderCompositeString16 (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
_Xconst XRenderPictFormat *maskFormat,
- GlyphSet glyphset,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
+ GlyphSet glyphset,
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
_Xconst unsigned short *string,
- int nchar);
+ int nchar);
void
-XRenderCompositeString32 (Display *dpy,
- int op,
- Picture src,
- Picture dst,
+XRenderCompositeString32 (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
_Xconst XRenderPictFormat *maskFormat,
- GlyphSet glyphset,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
- _Xconst unsigned int *string,
- int nchar);
+ GlyphSet glyphset,
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
+ _Xconst unsigned int *string,
+ int nchar);
void
-XRenderCompositeText8 (Display *dpy,
- int op,
- Picture src,
- Picture dst,
+XRenderCompositeText8 (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
_Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
- _Xconst XGlyphElt8 *elts,
- int nelt);
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
+ _Xconst XGlyphElt8 *elts,
+ int nelt);
void
-XRenderCompositeText16 (Display *dpy,
- int op,
- Picture src,
- Picture dst,
+XRenderCompositeText16 (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
_Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
- _Xconst XGlyphElt16 *elts,
- int nelt);
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
+ _Xconst XGlyphElt16 *elts,
+ int nelt);
void
-XRenderCompositeText32 (Display *dpy,
- int op,
- Picture src,
- Picture dst,
+XRenderCompositeText32 (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
_Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
- _Xconst XGlyphElt32 *elts,
- int nelt);
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
+ _Xconst XGlyphElt32 *elts,
+ int nelt);
void
-XRenderFillRectangle (Display *dpy,
- int op,
- Picture dst,
+XRenderFillRectangle (Display *dpy,
+ int op,
+ Picture dst,
_Xconst XRenderColor *color,
- int x,
- int y,
- unsigned int width,
- unsigned int height);
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height);
void
-XRenderFillRectangles (Display *dpy,
- int op,
- Picture dst,
+XRenderFillRectangles (Display *dpy,
+ int op,
+ Picture dst,
_Xconst XRenderColor *color,
_Xconst XRectangle *rectangles,
- int n_rects);
+ int n_rects);
void
-XRenderCompositeTrapezoids (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- _Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- _Xconst XTrapezoid *traps,
- int ntrap);
+XRenderCompositeTrapezoids (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
+ _Xconst XRenderPictFormat *maskFormat,
+ int xSrc,
+ int ySrc,
+ _Xconst XTrapezoid *traps,
+ int ntrap);
void
-XRenderCompositeTriangles (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- _Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- _Xconst XTriangle *triangles,
- int ntriangle);
+XRenderCompositeTriangles (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
+ _Xconst XRenderPictFormat *maskFormat,
+ int xSrc,
+ int ySrc,
+ _Xconst XTriangle *triangles,
+ int ntriangle);
void
-XRenderCompositeTriStrip (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- _Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- _Xconst XPointFixed *points,
- int npoint);
+XRenderCompositeTriStrip (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
+ _Xconst XRenderPictFormat *maskFormat,
+ int xSrc,
+ int ySrc,
+ _Xconst XPointFixed *points,
+ int npoint);
void
-XRenderCompositeTriFan (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- _Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- _Xconst XPointFixed *points,
- int npoint);
+XRenderCompositeTriFan (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
+ _Xconst XRenderPictFormat *maskFormat,
+ int xSrc,
+ int ySrc,
+ _Xconst XPointFixed *points,
+ int npoint);
void
-XRenderCompositeDoublePoly (Display *dpy,
- int op,
- Picture src,
- Picture dst,
- _Xconst XRenderPictFormat *maskFormat,
- int xSrc,
- int ySrc,
- int xDst,
- int yDst,
+XRenderCompositeDoublePoly (Display *dpy,
+ int op,
+ Picture src,
+ Picture dst,
+ _Xconst XRenderPictFormat *maskFormat,
+ int xSrc,
+ int ySrc,
+ int xDst,
+ int yDst,
_Xconst XPointDouble *fpoints,
- int npoints,
- int winding);
+ int npoints,
+ int winding);
Status
-XRenderParseColor(Display *dpy,
- char *spec,
- XRenderColor *def);
+XRenderParseColor(Display *dpy,
+ char *spec,
+ XRenderColor *def);
Cursor
-XRenderCreateCursor (Display *dpy,
- Picture source,
+XRenderCreateCursor (Display *dpy,
+ Picture source,
unsigned int x,
unsigned int y);
@@ -485,22 +485,22 @@ void
XRenderSetPictureFilter (Display *dpy,
Picture picture,
const char *filter,
- XFixed *params,
- int nparams);
+ XFixed *params,
+ int nparams);
Cursor
-XRenderCreateAnimCursor (Display *dpy,
- int ncursor,
- XAnimCursor *cursors);
+XRenderCreateAnimCursor (Display *dpy,
+ int ncursor,
+ XAnimCursor *cursors);
void
-XRenderAddTraps (Display *dpy,
- Picture picture,
- int xOff,
- int yOff,
- _Xconst XTrap *traps,
- int ntrap);
+XRenderAddTraps (Display *dpy,
+ Picture picture,
+ int xOff,
+ int yOff,
+ _Xconst XTrap *traps,
+ int ntrap);
Picture XRenderCreateSolidFill (Display *dpy,
const XRenderColor *color);
diff --git a/x11_extensions/inc/randr.h b/x11_extensions/inc/randr.h
index f4bc2eb096ff..864ddd4fade4 100644
--- a/x11_extensions/inc/randr.h
+++ b/x11_extensions/inc/randr.h
@@ -1,7 +1,7 @@
/*
* $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $
*
- * Copyright © 2000, Compaq Computer Corporation,
+ * Copyright © 2000, Compaq Computer Corporation,
* Copyright © 2002, Hewlett Packard, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -18,7 +18,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc.
@@ -27,48 +27,48 @@
#ifndef _RANDR_H_
#define _RANDR_H_
-typedef unsigned short Rotation;
-typedef unsigned short SizeID;
-typedef unsigned short SubpixelOrder;
+typedef unsigned short Rotation;
+typedef unsigned short SizeID;
+typedef unsigned short SubpixelOrder;
-#define RANDR_NAME "RANDR"
-#define RANDR_MAJOR 1
-#define RANDR_MINOR 1
+#define RANDR_NAME "RANDR"
+#define RANDR_MAJOR 1
+#define RANDR_MINOR 1
-#define RRNumberErrors 0
-#define RRNumberEvents 1
+#define RRNumberErrors 0
+#define RRNumberEvents 1
-#define X_RRQueryVersion 0
+#define X_RRQueryVersion 0
/* we skip 1 to make old clients fail pretty immediately */
-#define X_RROldGetScreenInfo 1
-#define X_RR1_0SetScreenConfig 2
+#define X_RROldGetScreenInfo 1
+#define X_RR1_0SetScreenConfig 2
/* V1.0 apps share the same set screen config request id */
-#define X_RRSetScreenConfig 2
-#define X_RROldScreenChangeSelectInput 3
+#define X_RRSetScreenConfig 2
+#define X_RROldScreenChangeSelectInput 3
/* 3 used to be ScreenChangeSelectInput; deprecated */
-#define X_RRSelectInput 4
-#define X_RRGetScreenInfo 5
+#define X_RRSelectInput 4
+#define X_RRGetScreenInfo 5
/* used in XRRSelectInput */
#define RRScreenChangeNotifyMask (1L << 0)
-#define RRScreenChangeNotify 0
+#define RRScreenChangeNotify 0
/* used in the rotation field; rotation and reflection in 0.1 proto. */
-#define RR_Rotate_0 1
-#define RR_Rotate_90 2
-#define RR_Rotate_180 4
-#define RR_Rotate_270 8
+#define RR_Rotate_0 1
+#define RR_Rotate_90 2
+#define RR_Rotate_180 4
+#define RR_Rotate_270 8
/* new in 1.0 protocol, to allow reflection of screen */
-#define RR_Reflect_X 16
-#define RR_Reflect_Y 32
+#define RR_Reflect_X 16
+#define RR_Reflect_Y 32
-#define RRSetConfigSuccess 0
-#define RRSetConfigInvalidConfigTime 1
-#define RRSetConfigInvalidTime 2
-#define RRSetConfigFailed 3
+#define RRSetConfigSuccess 0
+#define RRSetConfigInvalidConfigTime 1
+#define RRSetConfigInvalidTime 2
+#define RRSetConfigFailed 3
-#endif /* _RANDR_H_ */
+#endif /* _RANDR_H_ */
diff --git a/x11_extensions/inc/randrproto.h b/x11_extensions/inc/randrproto.h
index 714cacda4ae2..04d62fc0476d 100644
--- a/x11_extensions/inc/randrproto.h
+++ b/x11_extensions/inc/randrproto.h
@@ -18,7 +18,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Jim Gettys, Hewlett-Packard Company, Inc.
@@ -59,7 +59,7 @@ typedef struct {
} xScreenSizes;
#define sz_xScreenSizes 8
-/*
+/*
* requests and replies
*/
@@ -84,7 +84,7 @@ typedef struct {
CARD32 pad4 B32;
CARD32 pad5 B32;
} xRRQueryVersionReply;
-#define sz_xRRQueryVersionReply 32
+#define sz_xRRQueryVersionReply 32
typedef struct {
CARD8 reqType;
@@ -94,7 +94,7 @@ typedef struct {
} xRRGetScreenInfoReq;
#define sz_xRRGetScreenInfoReq 8
-/*
+/*
* the xRRScreenInfoReply structure is followed by:
*
* the size information
@@ -116,7 +116,7 @@ typedef struct {
CARD16 nrateEnts B16;
CARD16 pad B16;
} xRRGetScreenInfoReply;
-#define sz_xRRGetScreenInfoReply 32
+#define sz_xRRGetScreenInfoReply 32
typedef struct {
CARD8 reqType;
@@ -149,7 +149,7 @@ typedef struct {
CARD8 status;
CARD16 sequenceNumber B16;
CARD32 length B32;
- Time newTimestamp B32;
+ Time newTimestamp B32;
Time newConfigTimestamp B32;
Window root;
CARD16 subpixelOrder B16;
@@ -175,21 +175,21 @@ typedef struct {
* event
*/
typedef struct {
- CARD8 type; /* always evBase + ScreenChangeNotify */
- CARD8 rotation; /* new rotation */
+ CARD8 type; /* always evBase + ScreenChangeNotify */
+ CARD8 rotation; /* new rotation */
CARD16 sequenceNumber B16;
- Time timestamp B32; /* time screen was changed */
- Time configTimestamp B32; /* time config data was changed */
- Window root B32; /* root window */
- Window window B32; /* window requesting notification */
- SizeID sizeID B16; /* new size ID */
- CARD16 subpixelOrder B16; /* subpixel order */
- CARD16 widthInPixels B16; /* new size */
+ Time timestamp B32; /* time screen was changed */
+ Time configTimestamp B32; /* time config data was changed */
+ Window root B32; /* root window */
+ Window window B32; /* window requesting notification */
+ SizeID sizeID B16; /* new size ID */
+ CARD16 subpixelOrder B16; /* subpixel order */
+ CARD16 widthInPixels B16; /* new size */
CARD16 heightInPixels B16;
CARD16 widthInMillimeters B16;
CARD16 heightInMillimeters B16;
} xRRScreenChangeNotifyEvent;
-#define sz_xRRScreenChangeNotifyEvent 32
+#define sz_xRRScreenChangeNotifyEvent 32
#undef Window
#undef Drawable
diff --git a/x11_extensions/inc/render.h b/x11_extensions/inc/render.h
index aff7c47959d0..497af6d10415 100644
--- a/x11_extensions/inc/render.h
+++ b/x11_extensions/inc/render.h
@@ -26,159 +26,159 @@
#ifndef _RENDER_H_
#define _RENDER_H_
-typedef XID Glyph;
-typedef XID GlyphSet;
-typedef XID Picture;
-typedef XID PictFormat;
-
-#define RENDER_NAME "RENDER"
-#define RENDER_MAJOR 0
-#define RENDER_MINOR 10
-
-#define X_RenderQueryVersion 0
-#define X_RenderQueryPictFormats 1
-#define X_RenderQueryPictIndexValues 2 /* 0.7 */
-#define X_RenderQueryDithers 3
-#define X_RenderCreatePicture 4
-#define X_RenderChangePicture 5
+typedef XID Glyph;
+typedef XID GlyphSet;
+typedef XID Picture;
+typedef XID PictFormat;
+
+#define RENDER_NAME "RENDER"
+#define RENDER_MAJOR 0
+#define RENDER_MINOR 10
+
+#define X_RenderQueryVersion 0
+#define X_RenderQueryPictFormats 1
+#define X_RenderQueryPictIndexValues 2 /* 0.7 */
+#define X_RenderQueryDithers 3
+#define X_RenderCreatePicture 4
+#define X_RenderChangePicture 5
#define X_RenderSetPictureClipRectangles 6
-#define X_RenderFreePicture 7
-#define X_RenderComposite 8
-#define X_RenderScale 9
-#define X_RenderTrapezoids 10
-#define X_RenderTriangles 11
-#define X_RenderTriStrip 12
-#define X_RenderTriFan 13
-#define X_RenderColorTrapezoids 14
-#define X_RenderColorTriangles 15
-/* #define X_RenderTransform 16 */
-#define X_RenderCreateGlyphSet 17
-#define X_RenderReferenceGlyphSet 18
-#define X_RenderFreeGlyphSet 19
-#define X_RenderAddGlyphs 20
-#define X_RenderAddGlyphsFromPicture 21
-#define X_RenderFreeGlyphs 22
-#define X_RenderCompositeGlyphs8 23
-#define X_RenderCompositeGlyphs16 24
-#define X_RenderCompositeGlyphs32 25
-#define X_RenderFillRectangles 26
+#define X_RenderFreePicture 7
+#define X_RenderComposite 8
+#define X_RenderScale 9
+#define X_RenderTrapezoids 10
+#define X_RenderTriangles 11
+#define X_RenderTriStrip 12
+#define X_RenderTriFan 13
+#define X_RenderColorTrapezoids 14
+#define X_RenderColorTriangles 15
+/* #define X_RenderTransform 16 */
+#define X_RenderCreateGlyphSet 17
+#define X_RenderReferenceGlyphSet 18
+#define X_RenderFreeGlyphSet 19
+#define X_RenderAddGlyphs 20
+#define X_RenderAddGlyphsFromPicture 21
+#define X_RenderFreeGlyphs 22
+#define X_RenderCompositeGlyphs8 23
+#define X_RenderCompositeGlyphs16 24
+#define X_RenderCompositeGlyphs32 25
+#define X_RenderFillRectangles 26
/* 0.5 */
-#define X_RenderCreateCursor 27
+#define X_RenderCreateCursor 27
/* 0.6 */
-#define X_RenderSetPictureTransform 28
-#define X_RenderQueryFilters 29
-#define X_RenderSetPictureFilter 30
+#define X_RenderSetPictureTransform 28
+#define X_RenderQueryFilters 29
+#define X_RenderSetPictureFilter 30
/* 0.8 */
-#define X_RenderCreateAnimCursor 31
+#define X_RenderCreateAnimCursor 31
/* 0.9 */
-#define X_RenderAddTraps 32
+#define X_RenderAddTraps 32
/* 0.10 */
#define X_RenderCreateSolidFill 33
#define X_RenderCreateLinearGradient 34
#define X_RenderCreateRadialGradient 35
#define X_RenderCreateConicalGradient 36
-#define RenderNumberRequests (X_RenderCreateConicalGradient+1)
-
-#define BadPictFormat 0
-#define BadPicture 1
-#define BadPictOp 2
-#define BadGlyphSet 3
-#define BadGlyph 4
-#define RenderNumberErrors (BadGlyph+1)
-
-#define PictTypeIndexed 0
-#define PictTypeDirect 1
-
-#define PictOpMinimum 0
-#define PictOpClear 0
-#define PictOpSrc 1
-#define PictOpDst 2
-#define PictOpOver 3
-#define PictOpOverReverse 4
-#define PictOpIn 5
-#define PictOpInReverse 6
-#define PictOpOut 7
-#define PictOpOutReverse 8
-#define PictOpAtop 9
-#define PictOpAtopReverse 10
-#define PictOpXor 11
-#define PictOpAdd 12
-#define PictOpSaturate 13
-#define PictOpMaximum 13
+#define RenderNumberRequests (X_RenderCreateConicalGradient+1)
+
+#define BadPictFormat 0
+#define BadPicture 1
+#define BadPictOp 2
+#define BadGlyphSet 3
+#define BadGlyph 4
+#define RenderNumberErrors (BadGlyph+1)
+
+#define PictTypeIndexed 0
+#define PictTypeDirect 1
+
+#define PictOpMinimum 0
+#define PictOpClear 0
+#define PictOpSrc 1
+#define PictOpDst 2
+#define PictOpOver 3
+#define PictOpOverReverse 4
+#define PictOpIn 5
+#define PictOpInReverse 6
+#define PictOpOut 7
+#define PictOpOutReverse 8
+#define PictOpAtop 9
+#define PictOpAtopReverse 10
+#define PictOpXor 11
+#define PictOpAdd 12
+#define PictOpSaturate 13
+#define PictOpMaximum 13
/*
* Operators only available in version 0.2
*/
-#define PictOpDisjointMinimum 0x10
-#define PictOpDisjointClear 0x10
-#define PictOpDisjointSrc 0x11
-#define PictOpDisjointDst 0x12
-#define PictOpDisjointOver 0x13
-#define PictOpDisjointOverReverse 0x14
-#define PictOpDisjointIn 0x15
-#define PictOpDisjointInReverse 0x16
-#define PictOpDisjointOut 0x17
-#define PictOpDisjointOutReverse 0x18
-#define PictOpDisjointAtop 0x19
-#define PictOpDisjointAtopReverse 0x1a
-#define PictOpDisjointXor 0x1b
-#define PictOpDisjointMaximum 0x1b
-
-#define PictOpConjointMinimum 0x20
-#define PictOpConjointClear 0x20
-#define PictOpConjointSrc 0x21
-#define PictOpConjointDst 0x22
-#define PictOpConjointOver 0x23
-#define PictOpConjointOverReverse 0x24
-#define PictOpConjointIn 0x25
-#define PictOpConjointInReverse 0x26
-#define PictOpConjointOut 0x27
-#define PictOpConjointOutReverse 0x28
-#define PictOpConjointAtop 0x29
-#define PictOpConjointAtopReverse 0x2a
-#define PictOpConjointXor 0x2b
-#define PictOpConjointMaximum 0x2b
-
-#define PolyEdgeSharp 0
-#define PolyEdgeSmooth 1
-
-#define PolyModePrecise 0
-#define PolyModeImprecise 1
-
-#define CPRepeat (1 << 0)
-#define CPAlphaMap (1 << 1)
-#define CPAlphaXOrigin (1 << 2)
-#define CPAlphaYOrigin (1 << 3)
-#define CPClipXOrigin (1 << 4)
-#define CPClipYOrigin (1 << 5)
-#define CPClipMask (1 << 6)
-#define CPGraphicsExposure (1 << 7)
-#define CPSubwindowMode (1 << 8)
-#define CPPolyEdge (1 << 9)
-#define CPPolyMode (1 << 10)
-#define CPDither (1 << 11)
-#define CPComponentAlpha (1 << 12)
-#define CPLastBit 12
+#define PictOpDisjointMinimum 0x10
+#define PictOpDisjointClear 0x10
+#define PictOpDisjointSrc 0x11
+#define PictOpDisjointDst 0x12
+#define PictOpDisjointOver 0x13
+#define PictOpDisjointOverReverse 0x14
+#define PictOpDisjointIn 0x15
+#define PictOpDisjointInReverse 0x16
+#define PictOpDisjointOut 0x17
+#define PictOpDisjointOutReverse 0x18
+#define PictOpDisjointAtop 0x19
+#define PictOpDisjointAtopReverse 0x1a
+#define PictOpDisjointXor 0x1b
+#define PictOpDisjointMaximum 0x1b
+
+#define PictOpConjointMinimum 0x20
+#define PictOpConjointClear 0x20
+#define PictOpConjointSrc 0x21
+#define PictOpConjointDst 0x22
+#define PictOpConjointOver 0x23
+#define PictOpConjointOverReverse 0x24
+#define PictOpConjointIn 0x25
+#define PictOpConjointInReverse 0x26
+#define PictOpConjointOut 0x27
+#define PictOpConjointOutReverse 0x28
+#define PictOpConjointAtop 0x29
+#define PictOpConjointAtopReverse 0x2a
+#define PictOpConjointXor 0x2b
+#define PictOpConjointMaximum 0x2b
+
+#define PolyEdgeSharp 0
+#define PolyEdgeSmooth 1
+
+#define PolyModePrecise 0
+#define PolyModeImprecise 1
+
+#define CPRepeat (1 << 0)
+#define CPAlphaMap (1 << 1)
+#define CPAlphaXOrigin (1 << 2)
+#define CPAlphaYOrigin (1 << 3)
+#define CPClipXOrigin (1 << 4)
+#define CPClipYOrigin (1 << 5)
+#define CPClipMask (1 << 6)
+#define CPGraphicsExposure (1 << 7)
+#define CPSubwindowMode (1 << 8)
+#define CPPolyEdge (1 << 9)
+#define CPPolyMode (1 << 10)
+#define CPDither (1 << 11)
+#define CPComponentAlpha (1 << 12)
+#define CPLastBit 12
/* Filters included in 0.6 */
-#define FilterNearest "nearest"
-#define FilterBilinear "bilinear"
+#define FilterNearest "nearest"
+#define FilterBilinear "bilinear"
/* Filters included in 0.10 */
-#define FilterConvolution "convolution"
+#define FilterConvolution "convolution"
-#define FilterFast "fast"
-#define FilterGood "good"
-#define FilterBest "best"
+#define FilterFast "fast"
+#define FilterGood "good"
+#define FilterBest "best"
-#define FilterAliasNone -1
+#define FilterAliasNone -1
/* Subpixel orders included in 0.6 */
-#define SubPixelUnknown 0
-#define SubPixelHorizontalRGB 1
-#define SubPixelHorizontalBGR 2
-#define SubPixelVerticalRGB 3
-#define SubPixelVerticalBGR 4
-#define SubPixelNone 5
+#define SubPixelUnknown 0
+#define SubPixelHorizontalRGB 1
+#define SubPixelHorizontalBGR 2
+#define SubPixelVerticalRGB 3
+#define SubPixelVerticalBGR 4
+#define SubPixelNone 5
/* Extended repeat attributes included in 0.10 */
#define RepeatNone 0
@@ -186,4 +186,4 @@ typedef XID PictFormat;
#define RepeatPad 2
#define RepeatReflect 3
-#endif /* _RENDER_H_ */
+#endif /* _RENDER_H_ */
diff --git a/x11_extensions/inc/renderproto.h b/x11_extensions/inc/renderproto.h
index 2b2c708d982f..ffe06395d081 100644
--- a/x11_extensions/inc/renderproto.h
+++ b/x11_extensions/inc/renderproto.h
@@ -42,9 +42,9 @@
#define KeyCode CARD8
#define KeySym CARD32
-#define Picture CARD32
+#define Picture CARD32
#define PictFormat CARD32
-#define Fixed INT32
+#define Fixed INT32
#define Glyphset CARD32
/*
@@ -65,86 +65,86 @@ typedef struct {
#define sz_xDirectFormat 16
typedef struct {
- PictFormat id B32;
- CARD8 type;
- CARD8 depth;
- CARD16 pad1 B16;
+ PictFormat id B32;
+ CARD8 type;
+ CARD8 depth;
+ CARD16 pad1 B16;
xDirectFormat direct;
- Colormap colormap;
+ Colormap colormap;
} xPictFormInfo;
#define sz_xPictFormInfo 28
typedef struct {
- VisualID visual;
- PictFormat format;
+ VisualID visual;
+ PictFormat format;
} xPictVisual;
-#define sz_xPictVisual 8
+#define sz_xPictVisual 8
typedef struct {
- CARD8 depth;
- CARD8 pad1;
- CARD16 nPictVisuals B16;
- CARD32 pad2 B32;
+ CARD8 depth;
+ CARD8 pad1;
+ CARD16 nPictVisuals B16;
+ CARD32 pad2 B32;
} xPictDepth;
-#define sz_xPictDepth 8
+#define sz_xPictDepth 8
typedef struct {
- CARD32 nDepth B32;
- PictFormat fallback B32;
+ CARD32 nDepth B32;
+ PictFormat fallback B32;
} xPictScreen;
-#define sz_xPictScreen 8
+#define sz_xPictScreen 8
typedef struct {
- CARD32 pixel B32;
- CARD16 red B16;
- CARD16 green B16;
- CARD16 blue B16;
- CARD16 alpha B16;
+ CARD32 pixel B32;
+ CARD16 red B16;
+ CARD16 green B16;
+ CARD16 blue B16;
+ CARD16 alpha B16;
} xIndexValue;
-#define sz_xIndexValue 12
+#define sz_xIndexValue 12
typedef struct {
- CARD16 red B16;
- CARD16 green B16;
- CARD16 blue B16;
- CARD16 alpha B16;
+ CARD16 red B16;
+ CARD16 green B16;
+ CARD16 blue B16;
+ CARD16 alpha B16;
} xRenderColor;
-#define sz_xRenderColor 8
+#define sz_xRenderColor 8
typedef struct {
- Fixed x B32;
- Fixed y B32;
+ Fixed x B32;
+ Fixed y B32;
} xPointFixed;
-#define sz_xPointFixed 8
+#define sz_xPointFixed 8
typedef struct {
- xPointFixed p1;
+ xPointFixed p1;
xPointFixed p2;
} xLineFixed;
-#define sz_xLineFixed 16
+#define sz_xLineFixed 16
typedef struct {
- xPointFixed p1, p2, p3;
+ xPointFixed p1, p2, p3;
} xTriangle;
-#define sz_xTriangle 24
+#define sz_xTriangle 24
typedef struct {
- Fixed top B32;
- Fixed bottom B32;
- xLineFixed left;
- xLineFixed right;
+ Fixed top B32;
+ Fixed bottom B32;
+ xLineFixed left;
+ xLineFixed right;
} xTrapezoid;
-#define sz_xTrapezoid 40
+#define sz_xTrapezoid 40
typedef struct {
CARD16 width B16;
@@ -155,7 +155,7 @@ typedef struct {
INT16 yOff B16;
} xGlyphInfo;
-#define sz_xGlyphInfo 12
+#define sz_xGlyphInfo 12
typedef struct {
CARD8 len;
@@ -165,19 +165,19 @@ typedef struct {
INT16 deltay;
} xGlyphElt;
-#define sz_xGlyphElt 8
+#define sz_xGlyphElt 8
typedef struct {
Fixed l, r, y;
} xSpanFix;
-#define sz_xSpanFix 12
+#define sz_xSpanFix 12
typedef struct {
- xSpanFix top, bot;
+ xSpanFix top, bot;
} xTrap;
-#define sz_xTrap 24
+#define sz_xTrap 24
/*
* requests and replies
@@ -205,7 +205,7 @@ typedef struct {
CARD32 pad5 B32;
} xRenderQueryVersionReply;
-#define sz_xRenderQueryVersionReply 32
+#define sz_xRenderQueryVersionReply 32
typedef struct {
CARD8 reqType;
@@ -213,7 +213,7 @@ typedef struct {
CARD16 length B16;
} xRenderQueryPictFormatsReq;
-#define sz_xRenderQueryPictFormatsReq 4
+#define sz_xRenderQueryPictFormatsReq 4
typedef struct {
BYTE type; /* X_Reply */
@@ -224,17 +224,17 @@ typedef struct {
CARD32 numScreens B32;
CARD32 numDepths B32;
CARD32 numVisuals B32;
- CARD32 numSubpixel B32; /* Version 0.6 */
+ CARD32 numSubpixel B32; /* Version 0.6 */
CARD32 pad5 B32;
} xRenderQueryPictFormatsReply;
-#define sz_xRenderQueryPictFormatsReply 32
+#define sz_xRenderQueryPictFormatsReply 32
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
CARD16 length B16;
- PictFormat format B32;
+ PictFormat format B32;
} xRenderQueryPictIndexValuesReq;
#define sz_xRenderQueryPictIndexValuesReq 8
@@ -255,37 +255,37 @@ typedef struct {
#define sz_xRenderQueryPictIndexValuesReply 32
typedef struct {
- CARD8 reqType;
- CARD8 renderReqType;
- CARD16 length B16;
- Picture pid B32;
- Drawable drawable B32;
- PictFormat format B32;
- CARD32 mask B32;
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Picture pid B32;
+ Drawable drawable B32;
+ PictFormat format B32;
+ CARD32 mask B32;
} xRenderCreatePictureReq;
-#define sz_xRenderCreatePictureReq 20
+#define sz_xRenderCreatePictureReq 20
typedef struct {
- CARD8 reqType;
- CARD8 renderReqType;
- CARD16 length B16;
- Picture picture B32;
- CARD32 mask B32;
+ CARD8 reqType;
+ CARD8 renderReqType;
+ CARD16 length B16;
+ Picture picture B32;
+ CARD32 mask B32;
} xRenderChangePictureReq;
-#define sz_xRenderChangePictureReq 12
+#define sz_xRenderChangePictureReq 12
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
CARD16 length B16;
Picture picture B32;
- INT16 xOrigin B16;
- INT16 yOrigin B16;
+ INT16 xOrigin B16;
+ INT16 yOrigin B16;
} xRenderSetPictureClipRectanglesReq;
-#define sz_xRenderSetPictureClipRectanglesReq 12
+#define sz_xRenderSetPictureClipRectanglesReq 12
typedef struct {
CARD8 reqType;
@@ -294,121 +294,121 @@ typedef struct {
Picture picture B32;
} xRenderFreePictureReq;
-#define sz_xRenderFreePictureReq 8
+#define sz_xRenderFreePictureReq 8
typedef struct {
CARD8 reqType;
CARD8 renderReqType;
CARD16 length B16;
- CARD8