replace obsolete "master" branch with README that points at new repoHEAD master-deleted master

author: Michael Stahl <mstahl@redhat.com> 2012-01-28 20:55:43 +0100
committer: Michael Stahl <mstahl@redhat.com> 2012-01-28 20:55:43 +0100
commit: 4217d797c07ce2d4cc2f8de9a539b7e75d98245f (patch)
tree: 9e9f67205cd5b72f1031721273e1534a3a1e5b0f
parent: 6cdd564f90f3765a451e982611b2b583e310af19 (diff)
361 files changed, 20 insertions, 114340 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c2d7258..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# backup and temporary files
-*~
-.*.sw[op]
-
-.gitattributes
-
-# the build directories
-/*/unxlng??
-/*/unxlng??.pro
-/*/wntmsc???
-/*/wntmsc???.pro
-/*/wntgcc?
-/*/wntgcc?.pro
-/*/unxmac??
-/*/unxmac??.pro
-/*/unxios?
-/*/unxios?.pro
-/*/unxand?
-/*/unxand?.pro
-
-/external/*/*.dll
-/external/*/*.txt
-/external/msi/*.exe
-/external/msv*/*.manifest
-/external/vcredist/vcredist_x64.exe
-/external/vcredist/vcredist_x86.exe
diff --git a/Mesa/inc/gl.h b/Mesa/inc/gl.h
deleted file mode 100644
index 4380a15..0000000
--- a/Mesa/inc/gl.h
+++ /dev/null
@@ -1,2252 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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
- * BRIAN PAUL 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.
- */
-
-
-#ifndef __gl_h_
-#define __gl_h_
-
-#if defined(USE_MGL_NAMESPACE)
-#include "gl_mangle.h"
-#endif
-
-
-/**********************************************************************
- * Begin system-specific stuff. Do not do any of this when building
- * for SciTech SNAP, as this is all done before this header file is
- * included.
- */
-#if !defined(__SCITECH_SNAP__)
-
-#if defined(__BEOS__)
-#include <stdlib.h>     /* to get some BeOS-isms */
-#endif
-
-#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
-#define OPENSTEP
-#endif
-
-#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
-#define __WIN32__
-#endif
-
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
-#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
-#    define GLAPI __declspec(dllexport)
-#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define GLAPI __declspec(dllimport)
-#  else /* for use with static link lib build of Win32 edition only */
-#    define GLAPI extern
-#  endif /* _STATIC_MESA support */
-#  define GLAPIENTRY __stdcall
-#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
-#  define GLAPI extern
-#  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
-#  define GLAPI __attribute__((visibility("default")))
-#  define GLAPIENTRY
-#endif /* WIN32 && !CYGWIN */
-
-#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
-#  define PRAGMA_EXPORT_SUPPORTED		1
-#endif
-
-/*
- * WINDOWS: Include windows.h here to define APIENTRY.
- * It is also useful when applications include this file by
- * including only glut.h, since glut.h depends on windows.h.
- * Applications needing to include windows.h with parms other
- * than "WIN32_LEAN_AND_MEAN" may include windows.h before
- * glut.h or gl.h.
- */
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
-     && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
-#include <GL/mesa_wgl.h>
-#endif
-
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import on
-#endif
-
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY GLAPIENTRY
-#endif
-
-/* "P" suffix to be used for a pointer to a function */
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-
-#ifndef GLAPIENTRYP
-#define GLAPIENTRYP GLAPIENTRY *
-#endif
-
-#ifdef CENTERLINE_CLPP
-#define signed
-#endif
-
-#if defined(PRAGMA_EXPORT_SUPPORTED)
-#pragma export on
-#endif
-
-#endif /* !__SCITECH_SNAP__ */
-/*
- * End system-specific stuff.
- **********************************************************************/
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-#define GL_VERSION_1_1   1
-#define GL_VERSION_1_2   1
-#define GL_VERSION_1_3   1
-#define GL_ARB_imaging   1
-
-
-/*
- * 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] */
-
-
-
-/*
- * Constants
- */
-
-/* Boolean values */
-#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
-
-/* 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
-
-/* 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
-
-/* Matrix Mode */
-#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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* Alpha testing */
-#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
-
-/* Render Mode */
-#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
-
-/* Selection */
-#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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* Scissor box */
-#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
-
-/* 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
-
-/* Utility */
-#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
-
-/* 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
-
-
-/* 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
-
-
-
-/*
- * Miscellaneous
- */
-
-GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
-
-GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
-
-GLAPI void GLAPIENTRY glClear( GLbitfield mask );
-
-GLAPI void GLAPIENTRY glIndexMask( GLuint mask );
-
-GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
-
-GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref );
-
-GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
-
-GLAPI void GLAPIENTRY glLogicOp( GLenum opcode );
-
-GLAPI void GLAPIENTRY glCullFace( GLenum mode );
-
-GLAPI void GLAPIENTRY glFrontFace( GLenum mode );
-
-GLAPI void GLAPIENTRY glPointSize( GLfloat size );
-
-GLAPI void GLAPIENTRY glLineWidth( GLfloat width );
-
-GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern );
-
-GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode );
-
-GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
-
-GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask );
-
-GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask );
-
-GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag );
-
-GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag );
-
-GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
-
-GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
-
-GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
-
-GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode );
-
-GLAPI void GLAPIENTRY glReadBuffer( GLenum mode );
-
-GLAPI void GLAPIENTRY glEnable( GLenum cap );
-
-GLAPI void GLAPIENTRY glDisable( GLenum cap );
-
-GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap );
-
-
-GLAPI void GLAPIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
-
-GLAPI void GLAPIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
-
-
-GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
-
-GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params );
-
-GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params );
-
-GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params );
-
-
-GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask );
-
-GLAPI void GLAPIENTRY glPopAttrib( void );
-
-
-GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
-
-GLAPI void GLAPIENTRY glPopClientAttrib( void );  /* 1.1 */
-
-
-GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
-
-GLAPI GLenum GLAPIENTRY glGetError( void );
-
-GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
-
-GLAPI void GLAPIENTRY glFinish( void );
-
-GLAPI void GLAPIENTRY glFlush( void );
-
-GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
-
-
-/*
- * Depth Buffer
- */
-
-GLAPI void GLAPIENTRY glClearDepth( GLclampd depth );
-
-GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
-
-GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
-
-GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
-
-
-/*
- * Accumulation Buffer
- */
-
-GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-
-GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
-
-
-/*
- * Transformation
- */
-
-GLAPI void GLAPIENTRY glMatrixMode( GLenum mode );
-
-GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right,
-                                 GLdouble bottom, GLdouble top,
-                                 GLdouble near_val, GLdouble far_val );
-
-GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right,
-                                   GLdouble bottom, GLdouble top,
-                                   GLdouble near_val, GLdouble far_val );
-
-GLAPI void GLAPIENTRY glViewport( GLint x, GLint y,
-                                    GLsizei width, GLsizei height );
-
-GLAPI void GLAPIENTRY glPushMatrix( void );
-
-GLAPI void GLAPIENTRY glPopMatrix( void );
-
-GLAPI void GLAPIENTRY glLoadIdentity( void );
-
-GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m );
-GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m );
-
-GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m );
-GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m );
-
-GLAPI void GLAPIENTRY glRotated( GLdouble angle,
-                                   GLdouble x, GLdouble y, GLdouble z );
-GLAPI void GLAPIENTRY glRotatef( GLfloat angle,
-                                   GLfloat x, GLfloat y, GLfloat z );
-
-GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
-
-GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
-
-
-/*
- * Display Lists
- */
-
-GLAPI GLboolean GLAPIENTRY glIsList( GLuint list );
-
-GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range );
-
-GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range );
-
-GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode );
-
-GLAPI void GLAPIENTRY glEndList( void );
-
-GLAPI void GLAPIENTRY glCallList( GLuint list );
-
-GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
-                                     const GLvoid *lists );
-
-GLAPI void GLAPIENTRY glListBase( GLuint base );
-
-
-/*
- * Drawing Functions
- */
-
-GLAPI void GLAPIENTRY glBegin( GLenum mode );
-
-GLAPI void GLAPIENTRY glEnd( void );
-
-
-GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y );
-GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y );
-GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y );
-GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y );
-
-GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z );
-GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
-
-GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
-GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
-GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
-
-GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glVertex2iv( const GLint *v );
-GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glVertex3iv( const GLint *v );
-GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glVertex4iv( const GLint *v );
-GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v );
-
-
-GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
-GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
-GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
-GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
-GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
-
-GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v );
-GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glNormal3iv( const GLint *v );
-GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v );
-
-
-GLAPI void GLAPIENTRY glIndexd( GLdouble c );
-GLAPI void GLAPIENTRY glIndexf( GLfloat c );
-GLAPI void GLAPIENTRY glIndexi( GLint c );
-GLAPI void GLAPIENTRY glIndexs( GLshort c );
-GLAPI void GLAPIENTRY glIndexub( GLubyte c );  /* 1.1 */
-
-GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c );
-GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c );
-GLAPI void GLAPIENTRY glIndexiv( const GLint *c );
-GLAPI void GLAPIENTRY glIndexsv( const GLshort *c );
-GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
-
-GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
-GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
-GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
-GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue );
-GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
-GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
-GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
-GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
-
-GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green,
-                                   GLbyte blue, GLbyte alpha );
-GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green,
-                                   GLdouble blue, GLdouble alpha );
-GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green,
-                                   GLfloat blue, GLfloat alpha );
-GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green,
-                                   GLint blue, GLint alpha );
-GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green,
-                                   GLshort blue, GLshort alpha );
-GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green,
-                                    GLubyte blue, GLubyte alpha );
-GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green,
-                                    GLuint blue, GLuint alpha );
-GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green,
-                                    GLushort blue, GLushort alpha );
-
-
-GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v );
-GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glColor3iv( const GLint *v );
-GLAPI void GLAPIENTRY glColor3sv( const GLshort *v );
-GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v );
-GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v );
-GLAPI void GLAPIENTRY glColor3usv( const GLushort *v );
-
-GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v );
-GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glColor4iv( const GLint *v );
-GLAPI void GLAPIENTRY glColor4sv( const GLshort *v );
-GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v );
-GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v );
-GLAPI void GLAPIENTRY glColor4usv( const GLushort *v );
-
-
-GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s );
-GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s );
-GLAPI void GLAPIENTRY glTexCoord1i( GLint s );
-GLAPI void GLAPIENTRY glTexCoord1s( GLshort s );
-
-GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t );
-GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t );
-GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t );
-GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t );
-
-GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
-GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
-GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
-GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
-
-GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
-GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
-GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
-GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
-
-GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v );
-GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v );
-GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v );
-GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v );
-GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v );
-
-
-GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y );
-GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y );
-GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y );
-GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y );
-
-GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
-GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
-
-GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
-GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
-GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
-
-GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v );
-GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v );
-GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v );
-
-GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v );
-GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v );
-GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v );
-GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v );
-
-
-GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
-GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
-GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
-GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
-
-
-GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
-GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
-GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
-GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
-
-
-/*
- * Vertex Arrays  (1.1)
- */
-
-GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type,
-                                       GLsizei stride, const GLvoid *ptr );
-
-GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride,
-                                       const GLvoid *ptr );
-
-GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type,
-                                      GLsizei stride, const GLvoid *ptr );
-
-GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride,
-                                      const GLvoid *ptr );
-
-GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type,
-                                         GLsizei stride, const GLvoid *ptr );
-
-GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
-
-GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params );
-
-GLAPI void GLAPIENTRY glArrayElement( GLint i );
-
-GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
-
-GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
-                                      GLenum type, const GLvoid *indices );
-
-GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
-                                           const GLvoid *pointer );
-
-/*
- * Lighting
- */
-
-GLAPI void GLAPIENTRY glShadeModel( GLenum mode );
-
-GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param );
-GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname,
-                                 const GLfloat *params );
-GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname,
-                                 const GLint *params );
-
-GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname,
-                                    GLfloat *params );
-GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname,
-                                    GLint *params );
-
-GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param );
-GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
-GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params );
-
-GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
-GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
-GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
-
-GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
-GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
-
-GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
-
-
-/*
- * Raster functions
- */
-
-GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
-
-GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param );
-
-GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param );
-
-GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize,
-                                    const GLfloat *values );
-GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize,
-                                     const GLuint *values );
-GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize,
-                                     const GLushort *values );
-
-GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
-GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
-GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
-
-GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height,
-                                GLfloat xorig, GLfloat yorig,
-                                GLfloat xmove, GLfloat ymove,
-                                const GLubyte *bitmap );
-
-GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y,
-                                    GLsizei width, GLsizei height,
-                                    GLenum format, GLenum type,
-                                    GLvoid *pixels );
-
-GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height,
-                                    GLenum format, GLenum type,
-                                    const GLvoid *pixels );
-
-GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
-                                    GLsizei width, GLsizei height,
-                                    GLenum type );
-
-/*
- * Stenciling
- */
-
-GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
-
-GLAPI void GLAPIENTRY glStencilMask( GLuint mask );
-
-GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
-
-GLAPI void GLAPIENTRY glClearStencil( GLint s );
-
-
-
-/*
- * Texture mapping
- */
-
-GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
-GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
-
-GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
-GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
-GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
-
-GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
-GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
-GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
-
-
-GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
-
-GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
-
-GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
-
-
-GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
-GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
-
-GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname,
-                                          const GLfloat *params );
-GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname,
-                                          const GLint *params );
-
-GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target,
-                                           GLenum pname, GLfloat *params);
-GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target,
-                                           GLenum pname, GLint *params );
-
-GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level,
-                                                GLenum pname, GLfloat *params );
-GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level,
-                                                GLenum pname, GLint *params );
-
-
-GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level,
-                                    GLint internalFormat,
-                                    GLsizei width, GLint border,
-                                    GLenum format, GLenum type,
-                                    const GLvoid *pixels );
-
-GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level,
-                                    GLint internalFormat,
-                                    GLsizei width, GLsizei height,
-                                    GLint border, GLenum format, GLenum type,
-                                    const GLvoid *pixels );
-
-GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
-                                     GLenum format, GLenum type,
-                                     GLvoid *pixels );
-
-
-/* 1.1 functions */
-
-GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
-
-GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
-
-GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture );
-
-GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n,
-                                            const GLuint *textures,
-                                            const GLclampf *priorities );
-
-GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n,
-                                                  const GLuint *textures,
-                                                  GLboolean *residences );
-
-GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture );
-
-
-GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level,
-                                       GLint xoffset,
-                                       GLsizei width, GLenum format,
-                                       GLenum type, const GLvoid *pixels );
-
-
-GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level,
-                                       GLint xoffset, GLint yoffset,
-                                       GLsizei width, GLsizei height,
-                                       GLenum format, GLenum type,
-                                       const GLvoid *pixels );
-
-
-GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level,
-                                        GLenum internalformat,
-                                        GLint x, GLint y,
-                                        GLsizei width, GLint border );
-
-
-GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level,
-                                        GLenum internalformat,
-                                        GLint x, GLint y,
-                                        GLsizei width, GLsizei height,
-                                        GLint border );
-
-
-GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level,
-                                           GLint xoffset, GLint x, GLint y,
-                                           GLsizei width );
-
-
-GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
-                                           GLint xoffset, GLint yoffset,
-                                           GLint x, GLint y,
-                                           GLsizei width, GLsizei height );
-
-
-/*
- * Evaluators
- */
-
-GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2,
-                               GLint stride,
-                               GLint order, const GLdouble *points );
-GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2,
-                               GLint stride,
-                               GLint order, const GLfloat *points );
-
-GLAPI void GLAPIENTRY glMap2d( GLenum target,
-             GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
-             GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
-             const GLdouble *points );
-GLAPI void GLAPIENTRY glMap2f( GLenum target,
-             GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
-             GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
-             const GLfloat *points );
-
-GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
-GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
-GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
-
-GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u );
-GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u );
-
-GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u );
-GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u );
-
-GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
-GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
-
-GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u );
-GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u );
-
-GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
-GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
-
-GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2,
-                                   GLint vn, GLdouble v1, GLdouble v2 );
-GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2,
-                                   GLint vn, GLfloat v1, GLfloat v2 );
-
-GLAPI void GLAPIENTRY glEvalPoint1( GLint i );
-
-GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j );
-
-GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
-
-GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
-
-
-/*
- * Fog
- */
-
-GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param );
-
-GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param );
-
-GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
-
-GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
-
-
-/*
- * Selection and Feedback
- */
-
-GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
-
-GLAPI void GLAPIENTRY glPassThrough( GLfloat token );
-
-GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
-
-GLAPI void GLAPIENTRY glInitNames( void );
-
-GLAPI void GLAPIENTRY glLoadName( GLuint name );
-
-GLAPI void GLAPIENTRY glPushName( GLuint name );
-
-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
-
-GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
-    GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
-
-GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
-                                      GLint internalFormat,
-                                      GLsizei width, GLsizei height,
-                                      GLsizei depth, GLint border,
-                                      GLenum format, GLenum type,
-                                      const GLvoid *pixels );
-
-GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
-                                         GLint xoffset, GLint yoffset,
-                                         GLint zoffset, GLsizei width,
-                                         GLsizei height, GLsizei depth,
-                                         GLenum format,
-                                         GLenum type, const GLvoid *pixels);
-
-GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
-                                             GLint xoffset, GLint yoffset,
-                                             GLint zoffset, GLint x,
-                                             GLint y, GLsizei width,
-                                             GLsizei height );
-
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-
-
-/*
- * 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
-
-
-GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
-                                    GLsizei width, GLenum format,
-                                    GLenum type, const GLvoid *table );
-
-GLAPI void GLAPIENTRY glColorSubTable( GLenum target,
-                                       GLsizei start, GLsizei count,
-                                       GLenum format, GLenum type,
-                                       const GLvoid *data );
-
-GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname,
-                                              const GLint *params);
-
-GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname,
-                                              const GLfloat *params);
-
-GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start,
-                                           GLint x, GLint y, GLsizei width );
-
-GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat,
-                                        GLint x, GLint y, GLsizei width );
-
-GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format,
-                                       GLenum type, GLvoid *table );
-
-GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname,
-                                                  GLfloat *params );
-
-GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname,
-                                                  GLint *params );
-
-GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
-
-GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green,
-                                    GLclampf blue, GLclampf alpha );
-
-GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width,
-                   GLenum internalformat, GLboolean sink );
-
-GLAPI void GLAPIENTRY glResetHistogram( GLenum target );
-
-GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset,
-                      GLenum format, GLenum type,
-                      GLvoid *values );
-
-GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname,
-                         GLfloat *params );
-
-GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname,
-                         GLint *params );
-
-GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat,
-                GLboolean sink );
-
-GLAPI void GLAPIENTRY glResetMinmax( GLenum target );
-
-GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset,
-                                   GLenum format, GLenum types,
-                                   GLvoid *values );
-
-GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname,
-                          GLfloat *params );
-
-GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname,
-                          GLint *params );
-
-GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target,
-    GLenum internalformat, GLsizei width, GLenum format, GLenum type,
-    const GLvoid *image );
-
-GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target,
-    GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
-    GLenum type, const GLvoid *image );
-
-GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname,
-    GLfloat params );
-
-GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname,
-    const GLfloat *params );
-
-GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname,
-    GLint params );
-
-GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname,
-    const GLint *params );
-
-GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target,
-    GLenum internalformat, GLint x, GLint y, GLsizei width );
-
-GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target,
-    GLenum internalformat, GLint x, GLint y, GLsizei width,
-    GLsizei height);
-
-GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format,
-    GLenum type, GLvoid *image );
-
-GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname,
-    GLfloat *params );
-
-GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname,
-    GLint *params );
-
-GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
-    GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
-    GLenum type, const GLvoid *row, const GLvoid *column );
-
-GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
-    GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
-
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-
-
-
-/*
- * OpenGL 1.3
- */
-
-/* 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
-/* 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
-/* 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
-/* 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
-/* 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
-/* 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
-/* texture_env_dot3 */
-#define GL_DOT3_RGB				0x86AE
-#define GL_DOT3_RGBA				0x86AF
-/* texture_border_clamp */
-#define GL_CLAMP_TO_BORDER			0x812D
-
-GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
-
-GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
-
-GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
-
-GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
-
-GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
-
-GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
-
-GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
-
-GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
-
-GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
-
-GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
-
-GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
-
-GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
-
-GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
-
-
-GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
-
-GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
-
-GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
-
-GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
-
-GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
-
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
-
-
-/*
- * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
- */
-#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
-
-GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
-GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
-GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
-GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
-GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
-GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
-GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
-GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
-GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
-GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
-GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
-GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
-GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
-GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
-GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
-GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
-GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
-
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-
-#endif /* GL_ARB_multitexture */
-
-
-
-/*
- * Define this token if you want "old-style" header file behaviour (extensions
- * defined in gl.h).  Otherwise, extensions will be included from glext.h.
- */
-#if defined(GL_GLEXT_LEGACY)
-
-/* All extensions that used to be here are now found in glext.h */
-
-#else  /* GL_GLEXT_LEGACY */
-
-#include <GL/glext.h>
-
-#endif  /* GL_GLEXT_LEGACY */
-
-
-
-#if GL_ARB_shader_objects
-
-#ifndef GL_MESA_shader_debug
-#define GL_MESA_shader_debug 1
-
-#define GL_DEBUG_OBJECT_MESA              0x8759
-#define GL_DEBUG_PRINT_MESA               0x875A
-#define GL_DEBUG_ASSERT_MESA              0x875B
-
-GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
-GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
-GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
-                                         GLsizei *length, GLcharARB *debugLog);
-GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
-
-#endif /* GL_MESA_shader_debug */
-
-#endif /* GL_ARB_shader_objects */
-
-
-/*
- * ???. GL_MESA_packed_depth_stencil
- * XXX obsolete
- */
-#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
-
-#endif /* GL_MESA_packed_depth_stencil */
-
-
-#ifndef GL_MESA_program_debug
-#define GL_MESA_program_debug 1
-
-#define GL_FRAGMENT_PROGRAM_POSITION_MESA       0x8bb0
-#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA       0x8bb1
-#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA  0x8bb2
-#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA  0x8bb3
-#define GL_VERTEX_PROGRAM_POSITION_MESA         0x8bb4
-#define GL_VERTEX_PROGRAM_CALLBACK_MESA         0x8bb5
-#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA    0x8bb6
-#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA    0x8bb7
-
-typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
-
-GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
-
-GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
-
-#endif /* GL_MESA_program_debug */
-
-
-#ifndef GL_ATI_blend_equation_separate
-#define GL_ATI_blend_equation_separate 1
-
-#define GL_ALPHA_BLEND_EQUATION_ATI	        0x883D
-
-GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA );
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA);
-
-#endif /* GL_ATI_blend_equation_separate */
-
-
-
-/**
- ** NOTE!!!!!  If you add new functions to this file, or update
- ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
- ** in that file for details.
- **/
-
-
-
-/**********************************************************************
- * Begin system-specific stuff
- */
-#if defined(PRAGMA_EXPORT_SUPPORTED)
-#pragma export off
-#endif
-
-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
-#pragma import off
-#endif
-/*
- * End system-specific stuff
- **********************************************************************/
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl_h_ */
diff --git a/Mesa/inc/gl_mangle.h b/Mesa/inc/gl_mangle.h
deleted file mode 100644
index 863a2c9..0000000
--- a/Mesa/inc/gl_mangle.h
+++ /dev/null
@@ -1,1568 +0,0 @@
-#if 0
-#define GL_MANGLE_C1 "DO NOT EDIT!!! - TO REGENERATE from gl.h, EXECUTE THIS FILE IN SHELL (/bin/sh) and save the output"
-#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
-    echo ""
-#define GL_MANGLE_C4 get aliases
-    grep '^GLAPI' $files | sed -e 's/.*ENTRY gl\([^( ]*\).*$/#define gl\1		MANGLE(\1)/' | sort | uniq
-    echo ""
-    echo "#endif /* GL_MANGLE_H */"
-    exit
-#endif /* REGENERATION */
-
-/*
- * If you compile Mesa with USE_MGL_NAMESPACE defined then you can link
- * your application both with OpenGL and Mesa.  The Mesa functions will
- * be redefined so they are prefixed with "mgl" instead of "gl".
- * Mgl contributed by Randy Frank (rfrank@rsinc.com)
- * Regneration code contributed by Ray Tice (rayt@ma.ultra.net)
- */
-
-#ifndef GL_MANGLE_H
-#define GL_MANGLE_H
-
-#ifndef   MANGLE
-#define   MANGLE(x) mgl##x
-#endif  /*MANGLE*/
-
-/*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)
-
-#endif /* GL_MANGLE_H */
diff --git a/Mesa/inc/glext.h b/Mesa/inc/glext.h
deleted file mode 100644
index eca4659..0000000
--- a/Mesa/inc/glext.h
+++ /dev/null
@@ -1,7271 +0,0 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE 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 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
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2008/03/24 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 40
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#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_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_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#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_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#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
-#endif
-
-#ifndef 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_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#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_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_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_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_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#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_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#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_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_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_CLAMP_TO_BORDER                0x812D
-#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_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
-#define GL_PIXEL_PACK_BUFFER              0x88EB
-#define GL_PIXEL_UNPACK_BUFFER            0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
-#define GL_FLOAT_MAT2x3                   0x8B65
-#define GL_FLOAT_MAT2x4                   0x8B66
-#define GL_FLOAT_MAT3x2                   0x8B67
-#define GL_FLOAT_MAT3x4                   0x8B68
-#define GL_FLOAT_MAT4x2                   0x8B69
-#define GL_FLOAT_MAT4x3                   0x8B6A
-#define GL_SRGB                           0x8C40
-#define GL_SRGB8                          0x8C41
-#define GL_SRGB_ALPHA                     0x8C42
-#define GL_SRGB8_ALPHA8                   0x8C43
-#define GL_SLUMINANCE_ALPHA               0x8C44
-#define GL_SLUMINANCE8_ALPHA8             0x8C45
-#define GL_SLUMINANCE                     0x8C46
-#define GL_SLUMINANCE8                    0x8C47
-#define GL_COMPRESSED_SRGB                0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
-#define GL_COMPRESSED_SLUMINANCE          0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
-#endif
-
-#ifndef GL_ARB_multitexture
-#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
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_DEPTH_STENCIL_EXT              0x84F9
-#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
-#define GL_DEPTH24_STENCIL8_EXT           0x88F0
-#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_STENCIL_TAG_BITS_EXT           0x88F2
-#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_SRGB_EXT                       0x8C40
-#define GL_SRGB8_EXT                      0x8C41
-#define GL_SRGB_ALPHA_EXT                 0x8C42
-#define GL_SRGB8_ALPHA8_EXT               0x8C43
-#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
-#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
-#define GL_SLUMINANCE_EXT                 0x8C46
-#define GL_SLUMINANCE8_EXT                0x8C47
-#define GL_COMPRESSED_SRGB_EXT            0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
-#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
-#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
-#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
-#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
-#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
-#define GL_MAX_SAMPLES_EXT                0x8D57
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_TEXTURE_1D_STACK_MESAX         0x8759
-#define GL_TEXTURE_2D_STACK_MESAX         0x875A
-#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
-#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
-#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
-#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_TIME_ELAPSED_EXT               0x88BF
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
-#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
-#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
-#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
-#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
-#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
-#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
-#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_LINES_ADJACENCY_EXT            0x000A
-#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
-#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
-#define GL_GEOMETRY_PROGRAM_NV            0x8C26
-#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
-#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
-#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
-#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
-#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
-#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_GEOMETRY_SHADER_EXT            0x8DD9
-/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
-/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
-/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
-/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
-#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
-#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
-#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
-/* reuse GL_LINES_ADJACENCY_EXT */
-/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
-/* reuse GL_TRIANGLES_ADJACENCY_EXT */
-/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
-/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-/* reuse GL_PROGRAM_POINT_SIZE_EXT */
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
-#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
-#define GL_SAMPLER_BUFFER_EXT             0x8DC2
-#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
-#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
-#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
-#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
-#define GL_INT_SAMPLER_1D_EXT             0x8DC9
-#define GL_INT_SAMPLER_2D_EXT             0x8DCA
-#define GL_INT_SAMPLER_3D_EXT             0x8DCB
-#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
-#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
-#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
-#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_R11F_G11F_B10F_EXT             0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
-#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
-#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
-#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
-/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_TEXTURE_BUFFER_EXT             0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
-#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_RGB9_E5_EXT                    0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
-#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
-#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
-#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
-#endif
-
-#ifndef GL_NV_fragment_program4
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
-#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
-#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
-#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
-#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
-#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
-#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
-#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
-#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
-#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
-#define GL_TEXTURE_COORD_NV               0x8C79
-#define GL_CLIP_DISTANCE_NV               0x8C7A
-#define GL_VERTEX_ID_NV                   0x8C7B
-#define GL_PRIMITIVE_ID_NV                0x8C7C
-#define GL_GENERIC_ATTRIB_NV              0x8C7D
-#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
-#define GL_ACTIVE_VARYINGS_NV             0x8C81
-#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
-#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
-#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
-#define GL_PRIMITIVES_GENERATED_NV        0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
-#define GL_RASTERIZER_DISCARD_NV          0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
-#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
-#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
-#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
-#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
-#define GL_UNIFORM_BUFFER_EXT             0x8DEE
-#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_RGBA32UI_EXT                   0x8D70
-#define GL_RGB32UI_EXT                    0x8D71
-#define GL_ALPHA32UI_EXT                  0x8D72
-#define GL_INTENSITY32UI_EXT              0x8D73
-#define GL_LUMINANCE32UI_EXT              0x8D74
-#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
-#define GL_RGBA16UI_EXT                   0x8D76
-#define GL_RGB16UI_EXT                    0x8D77
-#define GL_ALPHA16UI_EXT                  0x8D78
-#define GL_INTENSITY16UI_EXT              0x8D79
-#define GL_LUMINANCE16UI_EXT              0x8D7A
-#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
-#define GL_RGBA8UI_EXT                    0x8D7C
-#define GL_RGB8UI_EXT                     0x8D7D
-#define GL_ALPHA8UI_EXT                   0x8D7E
-#define GL_INTENSITY8UI_EXT               0x8D7F
-#define GL_LUMINANCE8UI_EXT               0x8D80
-#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
-#define GL_RGBA32I_EXT                    0x8D82
-#define GL_RGB32I_EXT                     0x8D83
-#define GL_ALPHA32I_EXT                   0x8D84
-#define GL_INTENSITY32I_EXT               0x8D85
-#define GL_LUMINANCE32I_EXT               0x8D86
-#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
-#define GL_RGBA16I_EXT                    0x8D88
-#define GL_RGB16I_EXT                     0x8D89
-#define GL_ALPHA16I_EXT                   0x8D8A
-#define GL_INTENSITY16I_EXT               0x8D8B
-#define GL_LUMINANCE16I_EXT               0x8D8C
-#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
-#define GL_RGBA8I_EXT                     0x8D8E
-#define GL_RGB8I_EXT                      0x8D8F
-#define GL_ALPHA8I_EXT                    0x8D90
-#define GL_INTENSITY8I_EXT                0x8D91
-#define GL_LUMINANCE8I_EXT                0x8D92
-#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
-#define GL_RED_INTEGER_EXT                0x8D94
-#define GL_GREEN_INTEGER_EXT              0x8D95
-#define GL_BLUE_INTEGER_EXT               0x8D96
-#define GL_ALPHA_INTEGER_EXT              0x8D97
-#define GL_RGB_INTEGER_EXT                0x8D98
-#define GL_RGBA_INTEGER_EXT               0x8D99
-#define GL_BGR_INTEGER_EXT                0x8D9A
-#define GL_BGRA_INTEGER_EXT               0x8D9B
-#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
-#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
-#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#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 */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GL_EXT_timer_query
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_SGI_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-#ifndef GL_EXT_packed_depth_stencil
-#define GL_EXT_packed_depth_stencil 1
-#endif
-
-#ifndef GL_EXT_stencil_clear_tag
-#define GL_EXT_stencil_clear_tag 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
-#endif
-
-#ifndef GL_EXT_texture_sRGB
-#define GL_EXT_texture_sRGB 1
-#endif
-
-#ifndef GL_EXT_framebuffer_blit
-#define GL_EXT_framebuffer_blit 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-#endif
-
-#ifndef GL_EXT_framebuffer_multisample
-#define GL_EXT_framebuffer_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_MESAX_texture_stack
-#define GL_MESAX_texture_stack 1
-#endif
-
-#ifndef GL_EXT_timer_query
-#define GL_EXT_timer_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
-GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
-#endif
-
-#ifndef GL_EXT_gpu_program_parameters
-#define GL_EXT_gpu_program_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-#endif
-
-#ifndef GL_APPLE_flush_buffer_range
-#define GL_APPLE_flush_buffer_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
-#endif
-
-#ifndef GL_NV_gpu_program4
-#define GL_NV_gpu_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
-GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
-GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
-#endif
-
-#ifndef GL_NV_geometry_program4
-#define GL_NV_geometry_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
-GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-#endif
-
-#ifndef GL_EXT_geometry_shader4
-#define GL_EXT_geometry_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-#endif
-
-#ifndef GL_NV_vertex_program4
-#define GL_NV_vertex_program4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
-GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_EXT_gpu_shader4
-#define GL_EXT_gpu_shader4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
-GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
-GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
-GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
-GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
-#endif
-
-#ifndef GL_EXT_draw_instanced
-#define GL_EXT_draw_instanced 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_packed_float
-#define GL_EXT_packed_float 1
-#endif
-
-#ifndef GL_EXT_texture_array
-#define GL_EXT_texture_array 1
-#endif
-
-#ifndef GL_EXT_texture_buffer_object
-#define GL_EXT_texture_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-#endif
-
-#ifndef GL_EXT_texture_compression_latc
-#define GL_EXT_texture_compression_latc 1
-#endif
-
-#ifndef GL_EXT_texture_compression_rgtc
-#define GL_EXT_texture_compression_rgtc 1
-#endif
-
-#ifndef GL_EXT_texture_shared_exponent
-#define GL_EXT_texture_shared_exponent 1
-#endif
-
-#ifndef GL_NV_depth_buffer_float
-#define GL_NV_depth_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
-GLAPI void APIENTRY glClearDepthdNV (GLdouble);
-GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
-typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
-#endif
-
-#ifndef GL_NV_fragment_program4
-#define GL_NV_fragment_program4 1
-#endif
-
-#ifndef GL_NV_framebuffer_multisample_coverage
-#define GL_NV_framebuffer_multisample_coverage 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_framebuffer_sRGB
-#define GL_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GL_NV_geometry_shader4
-#define GL_NV_geometry_shader4 1
-#endif
-
-#ifndef GL_NV_parameter_buffer_object
-#define GL_NV_parameter_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
-GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
-typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
-#endif
-
-#ifndef GL_EXT_draw_buffers2
-#define GL_EXT_draw_buffers2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
-GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
-GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
-GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
-#endif
-
-#ifndef GL_NV_transform_feedback
-#define GL_NV_transform_feedback 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
-GLAPI void APIENTRY glEndTransformFeedbackNV (void);
-GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
-GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
-GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
-GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
-GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
-GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
-typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
-typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
-#endif
-
-#ifndef GL_EXT_bindable_uniform
-#define GL_EXT_bindable_uniform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
-GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
-GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
-typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
-#endif
-
-#ifndef GL_EXT_texture_integer
-#define GL_EXT_texture_integer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
-GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
-GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
-typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
-#endif
-
-#ifndef GL_GREMEDY_frame_terminator
-#define GL_GREMEDY_frame_terminator 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Mesa/inc/glu.h b/Mesa/inc/glu.h
deleted file mode 100644
index d7f5de9..0000000
--- a/Mesa/inc/glu.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#ifndef __glu_h__
-#define __glu_h__
-
-#if defined(USE_MGL_NAMESPACE)
-#include "glu_mangle.h"
-#endif
-
-#include <GL/gl.h>
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#ifndef GLAPIENTRYP
-#define GLAPIENTRYP GLAPIENTRY *
-#endif
-
-#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
-# undef GLAPI
-# define GLAPI __declspec(dllexport)
-#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL)
-/* tag specifying we're building for DLL runtime support */
-# undef GLAPI
-# define GLAPI __declspec(dllimport)
-#elif !defined(GLAPI)
-/* for use with static link lib build of Win32 edition only */
-# define GLAPI extern
-#endif /* _STATIC_MESA support */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*************************************************************/
-
-/* Extensions */
-#define GLU_EXT_object_space_tess          1
-#define GLU_EXT_nurbs_tessellator          1
-
-/* Boolean */
-#define GLU_FALSE                          0
-#define GLU_TRUE                           1
-
-/* Version */
-#define GLU_VERSION_1_1                    1
-#define GLU_VERSION_1_2                    1
-#define GLU_VERSION_1_3                    1
-
-/* StringName */
-#define GLU_VERSION                        100800
-#define GLU_EXTENSIONS                     100801
-
-/* ErrorCode */
-#define GLU_INVALID_ENUM                   100900
-#define GLU_INVALID_VALUE                  100901
-#define GLU_OUT_OF_MEMORY                  100902
-#define GLU_INCOMPATIBLE_GL_VERSION        100903
-#define GLU_INVALID_OPERATION              100904
-
-/* NurbsDisplay */
-/*      GLU_FILL */
-#define GLU_OUTLINE_POLYGON                100240
-#define GLU_OUTLINE_PATCH                  100241
-
-/* NurbsCallback */
-#define GLU_NURBS_ERROR                    100103
-#define GLU_ERROR                          100103
-#define GLU_NURBS_BEGIN                    100164
-#define GLU_NURBS_BEGIN_EXT                100164
-#define GLU_NURBS_VERTEX                   100165
-#define GLU_NURBS_VERTEX_EXT               100165
-#define GLU_NURBS_NORMAL                   100166
-#define GLU_NURBS_NORMAL_EXT               100166
-#define GLU_NURBS_COLOR                    100167
-#define GLU_NURBS_COLOR_EXT                100167
-#define GLU_NURBS_TEXTURE_COORD            100168
-#define GLU_NURBS_TEX_COORD_EXT            100168
-#define GLU_NURBS_END                      100169
-#define GLU_NURBS_END_EXT                  100169
-#define GLU_NURBS_BEGIN_DATA               100170
-#define GLU_NURBS_BEGIN_DATA_EXT           100170
-#define GLU_NURBS_VERTEX_DATA              100171
-#define GLU_NURBS_VERTEX_DATA_EXT          100171
-#define GLU_NURBS_NORMAL_DATA              100172
-#define GLU_NURBS_NORMAL_DATA_EXT          100172
-#define GLU_NURBS_COLOR_DATA               100173
-#define GLU_NURBS_COLOR_DATA_EXT           100173
-#define GLU_NURBS_TEXTURE_COORD_DATA       100174
-#define GLU_NURBS_TEX_COORD_DATA_EXT       100174
-#define GLU_NURBS_END_DATA                 100175
-#define GLU_NURBS_END_DATA_EXT             100175
-
-/* NurbsError */
-#define GLU_NURBS_ERROR1                   100251
-#define GLU_NURBS_ERROR2                   100252
-#define GLU_NURBS_ERROR3                   100253
-#define GLU_NURBS_ERROR4                   100254
-#define GLU_NURBS_ERROR5                   100255
-#define GLU_NURBS_ERROR6                   100256
-#define GLU_NURBS_ERROR7                   100257
-#define GLU_NURBS_ERROR8                   100258
-#define GLU_NURBS_ERROR9                   100259
-#define GLU_NURBS_ERROR10                  100260
-#define GLU_NURBS_ERROR11                  100261
-#define GLU_NURBS_ERROR12                  100262
-#define GLU_NURBS_ERROR13                  100263
-#define GLU_NURBS_ERROR14                  100264
-#define GLU_NURBS_ERROR15                  100265
-#define GLU_NURBS_ERROR16                  100266
-#define GLU_NURBS_ERROR17                  100267
-#define GLU_NURBS_ERROR18                  100268
-#define GLU_NURBS_ERROR19                  100269
-#define GLU_NURBS_ERROR20                  100270
-#define GLU_NURBS_ERROR21                  100271
-#define GLU_NURBS_ERROR22                  100272
-#define GLU_NURBS_ERROR23                  100273
-#define GLU_NURBS_ERROR24                  100274
-#define GLU_NURBS_ERROR25                  100275
-#define GLU_NURBS_ERROR26                  100276
-#define GLU_NURBS_ERROR27                  100277
-#define GLU_NURBS_ERROR28                  100278
-#define GLU_NURBS_ERROR29                  100279
-#define GLU_NURBS_ERROR30                  100280
-#define GLU_NURBS_ERROR31                  100281
-#define GLU_NURBS_ERROR32                  100282
-#define GLU_NURBS_ERROR33                  100283
-#define GLU_NURBS_ERROR34                  100284
-#define GLU_NURBS_ERROR35                  100285
-#define GLU_NURBS_ERROR36                  100286
-#define GLU_NURBS_ERROR37                  100287
-
-/* NurbsProperty */
-#define GLU_AUTO_LOAD_MATRIX               100200
-#define GLU_CULLING                        100201
-#define GLU_SAMPLING_TOLERANCE             100203
-#define GLU_DISPLAY_MODE                   100204
-#define GLU_PARAMETRIC_TOLERANCE           100202
-#define GLU_SAMPLING_METHOD                100205
-#define GLU_U_STEP                         100206
-#define GLU_V_STEP                         100207
-#define GLU_NURBS_MODE                     100160
-#define GLU_NURBS_MODE_EXT                 100160
-#define GLU_NURBS_TESSELLATOR              100161
-#define GLU_NURBS_TESSELLATOR_EXT          100161
-#define GLU_NURBS_RENDERER                 100162
-#define GLU_NURBS_RENDERER_EXT             100162
-
-/* NurbsSampling */
-#define GLU_OBJECT_PARAMETRIC_ERROR        100208
-#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
-#define GLU_OBJECT_PATH_LENGTH             100209
-#define GLU_OBJECT_PATH_LENGTH_EXT         100209
-#define GLU_PATH_LENGTH                    100215
-#define GLU_PARAMETRIC_ERROR               100216
-#define GLU_DOMAIN_DISTANCE                100217
-
-/* NurbsTrim */
-#define GLU_MAP1_TRIM_2                    100210
-#define GLU_MAP1_TRIM_3                    100211
-
-/* QuadricDrawStyle */
-#define GLU_POINT                          100010
-#define GLU_LINE                           100011
-#define GLU_FILL                           100012
-#define GLU_SILHOUETTE                     100013
-
-/* QuadricCallback */
-/*      GLU_ERROR */
-
-/* QuadricNormal */
-#define GLU_SMOOTH                         100000
-#define GLU_FLAT                           100001
-#define GLU_NONE                           100002
-
-/* QuadricOrientation */
-#define GLU_OUTSIDE                        100020
-#define GLU_INSIDE                         100021
-
-/* TessCallback */
-#define GLU_TESS_BEGIN                     100100
-#define GLU_BEGIN                          100100
-#define GLU_TESS_VERTEX                    100101
-#define GLU_VERTEX                         100101
-#define GLU_TESS_END                       100102
-#define GLU_END                            100102
-#define GLU_TESS_ERROR                     100103
-#define GLU_TESS_EDGE_FLAG                 100104
-#define GLU_EDGE_FLAG                      100104
-#define GLU_TESS_COMBINE                   100105
-#define GLU_TESS_BEGIN_DATA                100106
-#define GLU_TESS_VERTEX_DATA               100107
-#define GLU_TESS_END_DATA                  100108
-#define GLU_TESS_ERROR_DATA                100109
-#define GLU_TESS_EDGE_FLAG_DATA            100110
-#define GLU_TESS_COMBINE_DATA              100111
-
-/* TessContour */
-#define GLU_CW                             100120
-#define GLU_CCW                            100121
-#define GLU_INTERIOR                       100122
-#define GLU_EXTERIOR                       100123
-#define GLU_UNKNOWN                        100124
-
-/* TessProperty */
-#define GLU_TESS_WINDING_RULE              100140
-#define GLU_TESS_BOUNDARY_ONLY             100141
-#define GLU_TESS_TOLERANCE                 100142
-
-/* TessError */
-#define GLU_TESS_ERROR1                    100151
-#define GLU_TESS_ERROR2                    100152
-#define GLU_TESS_ERROR3                    100153
-#define GLU_TESS_ERROR4                    100154
-#define GLU_TESS_ERROR5                    100155
-#define GLU_TESS_ERROR6                    100156
-#define GLU_TESS_ERROR7                    100157
-#define GLU_TESS_ERROR8                    100158
-#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
-#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
-#define GLU_TESS_MISSING_END_POLYGON       100153
-#define GLU_TESS_MISSING_END_CONTOUR       100154
-#define GLU_TESS_COORD_TOO_LARGE           100155
-#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
-
-/* TessWinding */
-#define GLU_TESS_WINDING_ODD               100130
-#define GLU_TESS_WINDING_NONZERO           100131
-#define GLU_TESS_WINDING_POSITIVE          100132
-#define GLU_TESS_WINDING_NEGATIVE          100133
-#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
-
-/*************************************************************/
-
-
-#ifdef __cplusplus
-class GLUnurbs;
-class GLUquadric;
-class GLUtesselator;
-#else
-typedef struct GLUnurbs GLUnurbs;
-typedef struct GLUquadric GLUquadric;
-typedef struct GLUtesselator GLUtesselator;
-#endif
-
-typedef GLUnurbs GLUnurbsObj;
-typedef GLUquadric GLUquadricObj;
-typedef GLUtesselator GLUtesselatorObj;
-typedef GLUtesselator GLUtriangulatorObj;
-
-#define GLU_TESS_MAX_COORD 1.0e150
-
-/* Internal convenience typedefs */
-typedef void (GLAPIENTRYP _GLUfuncptr)();
-
-GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb);
-GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
-GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
-GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad);
-GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
-GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb);
-GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error);
-GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
-GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name);
-GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
-GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
-GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
-GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void);
-GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void);
-GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void);
-GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
-GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
-GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
-GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
-GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
-GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
-GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
-GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
-GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
-GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
-GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
-GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
-GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
-GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);
-GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
-GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);
-GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
-GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
-GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
-GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
-GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
-GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
-GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
-GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __glu_h__ */
diff --git a/Mesa/inc/glu_mangle.h b/Mesa/inc/glu_mangle.h
deleted file mode 100644
index 9c25aa8..0000000
--- a/Mesa/inc/glu_mangle.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef GLU_MANGLE_H
-#define GLU_MANGLE_H
-
-
-#define gluLookAt mgluLookAt
-#define gluOrtho2D mgluOrtho2D
-#define gluPerspective mgluPerspective
-#define gluPickMatrix mgluPickMatrix
-#define gluProject mgluProject
-#define gluUnProject mgluUnProject
-#define gluErrorString mgluErrorString
-#define gluScaleImage mgluScaleImage
-#define gluBuild1DMipmaps mgluBuild1DMipmaps
-#define gluBuild2DMipmaps mgluBuild2DMipmaps
-#define gluNewQuadric mgluNewQuadric
-#define gluDeleteQuadric mgluDeleteQuadric
-#define gluQuadricDrawStyle mgluQuadricDrawStyle
-#define gluQuadricOrientation mgluQuadricOrientation
-#define gluQuadricNormals mgluQuadricNormals
-#define gluQuadricTexture mgluQuadricTexture
-#define gluQuadricCallback mgluQuadricCallback
-#define gluCylinder mgluCylinder
-#define gluSphere mgluSphere
-#define gluDisk mgluDisk
-#define gluPartialDisk mgluPartialDisk
-#define gluNewNurbsRenderer mgluNewNurbsRenderer
-#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
-#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
-#define gluNurbsProperty mgluNurbsProperty
-#define gluGetNurbsProperty mgluGetNurbsProperty
-#define gluBeginCurve mgluBeginCurve
-#define gluEndCurve mgluEndCurve
-#define gluNurbsCurve mgluNurbsCurve
-#define gluBeginSurface mgluBeginSurface
-#define gluEndSurface mgluEndSurface
-#define gluNurbsSurface mgluNurbsSurface
-#define gluBeginTrim mgluBeginTrim
-#define gluEndTrim mgluEndTrim
-#define gluPwlCurve mgluPwlCurve
-#define gluNurbsCallback mgluNurbsCallback
-#define gluNewTess mgluNewTess
-#define gluDeleteTess mgluDeleteTess
-#define gluTessBeginPolygon mgluTessBeginPolygon
-#define gluTessBeginContour mgluTessBeginContour
-#define gluTessVertex mgluTessVertex
-#define gluTessEndPolygon mgluTessEndPolygon
-#define gluTessEndContour mgluTessEndContour
-#define gluTessProperty mgluTessProperty
-#define gluTessNormal mgluTessNormal
-#define gluTessCallback mgluTessCallback
-#define gluGetTessProperty mgluGetTessProperty
-#define gluBeginPolygon mgluBeginPolygon
-#define gluNextContour mgluNextContour
-#define gluEndPolygon mgluEndPolygon
-#define gluGetString mgluGetString
-#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
-#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
-#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
-#define gluBuild3DMipmaps mgluBuild3DMipmaps
-#define gluCheckExtension mgluCheckExtension
-#define gluUnProject4 mgluUnProject4
-#define gluNurbsCallbackData mgluNurbsCallbackData
-#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
-
-#endif
diff --git a/Mesa/inc/glx.h b/Mesa/inc/glx.h
deleted file mode 100644
index c4706cb..0000000
--- a/Mesa/inc/glx.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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
- * BRIAN PAUL 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.
- */
-
-
-#ifndef GLX_H
-#define GLX_H
-
-
-#ifdef __VMS
-#include <GL/vms_x_fix.h>
-# ifdef __cplusplus
-/* VMS Xlib.h gives problems with C++.
- * this avoids a bunch of trivial warnings */
-#pragma message disable nosimpint
-#endif
-#endif
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#ifdef __VMS
-# ifdef __cplusplus
-#pragma message enable nosimpint
-#endif
-#endif
-#include <GL/gl.h>
-
-
-#if defined(USE_MGL_NAMESPACE)
-#include "glx_mangle.h"
-#endif
-
-
-#ifdef __cplusplus
-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_EXTENSION_NAME   "GLX"
-
-
-
-/*
- * 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
-
-
-/*
- * 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
-
-
-/*
- * GLX 1.1 and later:
- */
-#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_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
-
-
-/*
- * GLX 1.4 and later:
- */
-#define GLX_SAMPLE_BUFFERS              0x186a0 /*100000*/
-#define GLX_SAMPLES                     0x186a1 /*100001*/
-
-
-
-typedef struct __GLXcontextRec *GLXContext;
-typedef XID GLXPixmap;
-typedef XID GLXDrawable;
-/* GLX 1.3 and later */
-typedef struct __GLXFBConfigRec *GLXFBConfig;
-typedef XID GLXFBConfigID;
-typedef XID GLXContextID;
-typedef XID GLXWindow;
-typedef XID GLXPbuffer;
-
-
-
-extern XVisualInfo* glXChooseVisual( Display *dpy, int screen,
-                     int *attribList );
-
-extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis,
-                    GLXContext shareList, Bool direct );
-
-extern void glXDestroyContext( Display *dpy, GLXContext ctx );
-
-extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
-                GLXContext ctx);
-
-extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-                unsigned long mask );
-
-extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
-
-extern GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *visual,
-                     Pixmap pixmap );
-
-extern void glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern Bool glXQueryExtension( Display *dpy, int *errorb, int *event );
-
-extern Bool glXQueryVersion( Display *dpy, int *maj, int *min );
-
-extern Bool glXIsDirect( Display *dpy, GLXContext ctx );
-
-extern int glXGetConfig( Display *dpy, XVisualInfo *visual,
-             int attrib, int *value );
-
-extern GLXContext glXGetCurrentContext( void );
-
-extern GLXDrawable glXGetCurrentDrawable( void );
-
-extern void glXWaitGL( void );
-
-extern void glXWaitX( void );
-
-extern void glXUseXFont( Font font, int first, int count, int list );
-
-
-
-/* GLX 1.1 and later */
-extern const char *glXQueryExtensionsString( Display *dpy, int screen );
-
-extern const char *glXQueryServerString( Display *dpy, int screen, int name );
-
-extern const char *glXGetClientString( Display *dpy, int name );
-
-
-/* GLX 1.2 and later */
-extern Display *glXGetCurrentDisplay( void );
-
-
-/* GLX 1.3 and later */
-extern GLXFBConfig *glXChooseFBConfig( Display *dpy, int screen,
-                                       const int *attribList, int *nitems );
-
-extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
-                                 int attribute, int *value );
-
-extern GLXFBConfig *glXGetFBConfigs( Display *dpy, int screen,
-                                     int *nelements );
-
-extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
-                                              GLXFBConfig config );
-
-extern GLXWindow glXCreateWindow( Display *dpy, GLXFBConfig config,
-                                  Window win, const int *attribList );
-
-extern void glXDestroyWindow( Display *dpy, GLXWindow window );
-
-extern GLXPixmap glXCreatePixmap( Display *dpy, GLXFBConfig config,
-                                  Pixmap pixmap, const int *attribList );
-
-extern void glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern GLXPbuffer glXCreatePbuffer( Display *dpy, GLXFBConfig config,
-                                    const int *attribList );
-
-extern void glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
-
-extern void glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
-                              unsigned int *value );
-
-extern GLXContext glXCreateNewContext( Display *dpy, GLXFBConfig config,
-                                       int renderType, GLXContext shareList,
-                                       Bool direct );
-
-extern Bool glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
-                                   GLXDrawable read, GLXContext ctx );
-
-extern GLXDrawable glXGetCurrentReadDrawable( void );
-
-extern int glXQueryContext( Display *dpy, GLXContext ctx, int attribute,
-                            int *value );
-
-extern void glXSelectEvent( Display *dpy, GLXDrawable drawable,
-                            unsigned long mask );
-
-extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
-                                 unsigned long *mask );
-
-
-/* GLX 1.4 and later */
-extern void (*glXGetProcAddress(const GLubyte *procname))( void );
-
-
-#ifndef GLX_GLXEXT_LEGACY
-
-#include <GL/glxext.h>
-
-#else
-
-
-
-/*
- * ARB 2. GLX_ARB_get_proc_address
- */
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-
-typedef void (*__GLXextFuncPtr)(void);
-extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-
-#endif /* GLX_ARB_get_proc_address */
-
-
-
-#endif /* GLX_GLXEXT_LEGACY */
-
-
-/**
- ** The following aren't in glxext.h yet.
- **/
-
-
-/*
- * ???. GLX_NV_vertex_array_range
- */
-#ifndef GLX_NV_vertex_array_range
-#define GLX_NV_vertex_array_range
-
-extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-extern void glXFreeMemoryNV(GLvoid *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
-
-#endif /* GLX_NV_vertex_array_range */
-
-
-/*
- * ???. GLX_MESA_allocate_memory
- */
-#ifndef GLX_MESA_allocate_memory
-#define GLX_MESA_allocate_memory 1
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-extern GLuint glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYMESAPROC) (Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-typedef void ( * PFNGLXFREEMEMORYMESAPROC) (Display *dpy, int scrn, void *pointer);
-typedef GLuint (* PFNGLXGETMEMORYOFFSETMESAPROC) (Display *dpy, int scrn, const void *pointer);
-
-#endif /* GLX_MESA_allocate_memory */
-
-
-/*
- * ARB ?. GLX_ARB_render_texture
- * XXX This was never finalized!
- */
-#ifndef GLX_ARB_render_texture
-#define GLX_ARB_render_texture 1
-
-extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
-
-#endif /* GLX_ARB_render_texture */
-
-
-/*
- * Remove this when glxext.h is updated.
- */
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-
-#define GLX_FLOAT_COMPONENTS_NV         0x20B0
-
-#endif /* GLX_NV_float_buffer */
-
-
-
-/*
- * #?. GLX_MESA_swap_frame_usage
- */
-#ifndef GLX_MESA_swap_frame_usage
-#define GLX_MESA_swap_frame_usage 1
-
-extern int glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable, float *usage);
-extern int glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable);
-extern int glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable);
-extern int glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable, int64_t *swapCount, int64_t *missedFrames, float *lastMissedUsage);
-
-typedef int (*PFNGLXGETFRAMEUSAGEMESAPROC) (Display *dpy, GLXDrawable drawable, float *usage);
-typedef int (*PFNGLXBEGINFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable);
-typedef int (*PFNGLXENDFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable);
-typedef int (*PFNGLXQUERYFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable, int64_t *swapCount, int64_t *missedFrames, float *lastMissedUsage);
-
-#endif /* GLX_MESA_swap_frame_usage */
-
-
-
-/*
- * #?. GLX_MESA_swap_control
- */
-#ifndef GLX_MESA_swap_control
-#define GLX_MESA_swap_control 1
-
-extern int glXSwapIntervalMESA(unsigned int interval);
-extern int glXGetSwapIntervalMESA(void);
-
-typedef int (*PFNGLXSWAPINTERVALMESAPROC)(unsigned int interval);
-typedef int (*PFNGLXGETSWAPINTERVALMESAPROC)(void);
-
-#endif /* GLX_MESA_swap_control */
-
-
-
-/*
- * #?. GLX_EXT_texture_from_pixmap
- * XXX not finished?
- */
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_EXT_texture_from_pixmap 1
-
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-
-#define GLX_FRONT_LEFT_EXT                 0x20DE
-#define GLX_FRONT_RIGHT_EXT                0x20DF
-#define GLX_BACK_LEFT_EXT                  0x20E0
-#define GLX_BACK_RIGHT_EXT                 0x20E1
-#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
-#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
-#define GLX_AUX0_EXT                       0x20E2
-#define GLX_AUX1_EXT                       0x20E3
-#define GLX_AUX2_EXT                       0x20E4
-#define GLX_AUX3_EXT                       0x20E5
-#define GLX_AUX4_EXT                       0x20E6
-#define GLX_AUX5_EXT                       0x20E7
-#define GLX_AUX6_EXT                       0x20E8
-#define GLX_AUX7_EXT                       0x20E9
-#define GLX_AUX8_EXT                       0x20EA
-#define GLX_AUX9_EXT                       0x20EB
-
-extern void glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
-extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
-
-#endif /* GLX_EXT_texture_from_pixmap */
-
-
-
-
-/*** Should these go here, or in another header? */
-/*
-** 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 x, y;
-    int width, height;
-    int count;			/* if nonzero, at least this many more */
-} GLXPbufferClobberEvent;
-
-typedef union __GLXEvent {
-    GLXPbufferClobberEvent glxpbufferclobber;
-    long pad[24];
-} GLXEvent;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Mesa/inc/glx_mangle.h b/Mesa/inc/glx_mangle.h
deleted file mode 100644
index b0d3d39..0000000
--- a/Mesa/inc/glx_mangle.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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
- * BRIAN PAUL 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.
- */
-
-
-#ifndef GLX_MANGLE_H
-#define GLX_MANGLE_H
-
-#define glXChooseVisual mglXChooseVisual
-#define glXCreateContext mglXCreateContext
-#define glXDestroyContext mglXDestroyContext
-#define glXMakeCurrent mglXMakeCurrent
-#define glXCopyContext mglXCopyContext
-#define glXSwapBuffers mglXSwapBuffers
-#define glXCreateGLXPixmap mglXCreateGLXPixmap
-#define glXDestroyGLXPixmap mglXDestroyGLXPixmap
-#define glXQueryExtension mglXQueryExtension
-#define glXQueryVersion mglXQueryVersion
-#define glXIsDirect mglXIsDirect
-#define glXGetConfig mglXGetConfig
-#define glXGetCurrentContext mglXGetCurrentContext
-#define glXGetCurrentDrawable mglXGetCurrentDrawable
-#define glXWaitGL mglXWaitGL
-#define glXWaitX mglXWaitX
-#define glXUseXFont mglXUseXFont
-#define glXQueryExtensionsString mglXQueryExtensionsString
-#define glXQueryServerString mglXQueryServerString
-#define glXGetClientString mglXGetClientString
-#define glXCreateGLXPixmapMESA mglXCreateGLXPixmapMESA
-#define glXReleaseBuffersMESA mglXReleaseBuffersMESA
-#define glXCopySubBufferMESA mglXCopySubBufferMESA
-#define glXGetVideoSyncSGI mglXGetVideoSyncSGI
-#define glXWaitVideoSyncSGI mglXWaitVideoSyncSGI
-
-/* GLX 1.2 */
-#define glXGetCurrentDisplay mglXGetCurrentDisplay
-
-/* GLX 1.3 */
-#define glXChooseFBConfig mglXChooseFBConfig
-#define glXGetFBConfigAttrib mglXGetFBConfigAttrib
-#define glXGetFBConfigs mglXGetFBConfigs
-#define glXGetVisualFromFBConfig mglXGetVisualFromFBConfig
-#define glXCreateWindow mglXCreateWindow
-#define glXDestroyWindow mglXDestroyWindow
-#define glXCreatePixmap mglXCreatePixmap
-#define glXDestroyPixmap mglXDestroyPixmap
-#define glXCreatePbuffer mglXCreatePbuffer
-#define glXDestroyPbuffer mglXDestroyPbuffer
-#define glXQueryDrawable mglXQueryDrawable
-#define glXCreateNewContext mglXCreateNewContext
-#define glXMakeContextCurrent mglXMakeContextCurrent
-#define glXGetCurrentReadDrawable mglXGetCurrentReadDrawable
-#define glXQueryContext mglXQueryContext
-#define glXSelectEvent mglXSelectEvent
-#define glXGetSelectedEvent mglXGetSelectedEvent
-
-/* GLX 1.4 */
-#define glXGetProcAddress mglXGetProcAddress
-
-
-#endif
diff --git a/Mesa/inc/glxext.h b/Mesa/inc/glxext.h
deleted file mode 100644
index 79e2e90..0000000
--- a/Mesa/inc/glxext.h
+++ /dev/null
@@ -1,785 +0,0 @@
-#ifndef __glxext_h_
-#define __glxext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE 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 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
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glxext.h last updated 2007/04/21 */
-/* Current version at http://www.opengl.org/registry/ */
-#define GLX_GLXEXT_VERSION 19
-
-#ifndef GLX_VERSION_1_3
-#define GLX_WINDOW_BIT                     0x00000001
-#define GLX_PIXMAP_BIT                     0x00000002
-#define GLX_PBUFFER_BIT                    0x00000004
-#define GLX_RGBA_BIT                       0x00000001
-#define GLX_COLOR_INDEX_BIT                0x00000002
-#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
-#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_AUX_BUFFERS_BIT                0x00000010
-#define GLX_DEPTH_BUFFER_BIT               0x00000020
-#define GLX_STENCIL_BUFFER_BIT             0x00000040
-#define GLX_ACCUM_BUFFER_BIT               0x00000080
-#define GLX_CONFIG_CAVEAT                  0x20
-#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_DONT_CARE                      0xFFFFFFFF
-#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
-#endif
-
-#ifndef GLX_VERSION_1_4
-#define GLX_SAMPLE_BUFFERS                 100000
-#define GLX_SAMPLES                        100001
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#endif
-
-#ifndef GLX_ARB_multisample
-#define GLX_SAMPLE_BUFFERS_ARB             100000
-#define GLX_SAMPLES_ARB                    100001
-#endif
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
-#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SAMPLE_BUFFERS_SGIS            100000
-#define GLX_SAMPLES_SGIS                   100001
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_X_VISUAL_TYPE_EXT              0x22
-#define GLX_TRANSPARENT_TYPE_EXT           0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
-#define GLX_NONE_EXT                       0x8000
-#define GLX_TRUE_COLOR_EXT                 0x8002
-#define GLX_DIRECT_COLOR_EXT               0x8003
-#define GLX_PSEUDO_COLOR_EXT               0x8004
-#define GLX_STATIC_COLOR_EXT               0x8005
-#define GLX_GRAY_SCALE_EXT                 0x8006
-#define GLX_STATIC_GRAY_EXT                0x8007
-#define GLX_TRANSPARENT_RGB_EXT            0x8008
-#define GLX_TRANSPARENT_INDEX_EXT          0x8009
-#endif
-
-#ifndef GLX_SGI_swap_control
-#endif
-
-#ifndef GLX_SGI_video_sync
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#endif
-
-#ifndef GLX_SGIX_video_source
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_VISUAL_CAVEAT_EXT              0x20
-#define GLX_SLOW_VISUAL_EXT                0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
-/* reuse GLX_NONE_EXT */
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_SHARE_CONTEXT_EXT              0x800A
-#define GLX_VISUAL_ID_EXT                  0x800B
-#define GLX_SCREEN_EXT                     0x800C
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_WINDOW_BIT_SGIX                0x00000001
-#define GLX_PIXMAP_BIT_SGIX                0x00000002
-#define GLX_RGBA_BIT_SGIX                  0x00000001
-#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
-#define GLX_DRAWABLE_TYPE_SGIX             0x8010
-#define GLX_RENDER_TYPE_SGIX               0x8011
-#define GLX_X_RENDERABLE_SGIX              0x8012
-#define GLX_FBCONFIG_ID_SGIX               0x8013
-#define GLX_RGBA_TYPE_SGIX                 0x8014
-#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
-/* reuse GLX_SCREEN_EXT */
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_PBUFFER_BIT_SGIX               0x00000004
-#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
-#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
-#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
-#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
-#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
-#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
-#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
-#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
-#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
-#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
-#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
-#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
-#define GLX_LARGEST_PBUFFER_SGIX           0x801C
-#define GLX_WIDTH_SGIX                     0x801D
-#define GLX_HEIGHT_SGIX                    0x801E
-#define GLX_EVENT_MASK_SGIX                0x801F
-#define GLX_DAMAGED_SGIX                   0x8020
-#define GLX_SAVED_SGIX                     0x8021
-#define GLX_WINDOW_SGIX                    0x8022
-#define GLX_PBUFFER_SGIX                   0x8023
-#endif
-
-#ifndef GLX_SGI_cushion
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SYNC_FRAME_SGIX                0x00000000
-#define GLX_SYNC_SWAP_SGIX                 0x00000001
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#endif
-
-#ifndef GLX_SGIS_blended_overlay
-#define GLX_BLENDED_RGBA_SGIS              0x8025
-#endif
-
-#ifndef GLX_SGIS_shared_multisample
-#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
-#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#endif
-
-#ifndef GLX_3DFX_multisample
-#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
-#define GLX_SAMPLES_3DFX                   0x8051
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_3DFX_WINDOW_MODE_MESA          0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
-#endif
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
-#endif
-
-#ifndef GLX_OML_swap_method
-#define GLX_SWAP_METHOD_OML                0x8060
-#define GLX_SWAP_EXCHANGE_OML              0x8061
-#define GLX_SWAP_COPY_OML                  0x8062
-#define GLX_SWAP_UNDEFINED_OML             0x8063
-#endif
-
-#ifndef GLX_OML_sync_control
-#endif
-
-#ifndef GLX_NV_float_buffer
-#define GLX_FLOAT_COMPONENTS_NV            0x20B0
-#endif
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
-#define GLX_BAD_HYPERPIPE_CONFIG_SGIX      91
-#define GLX_BAD_HYPERPIPE_SGIX             92
-#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX    0x00000001
-#define GLX_HYPERPIPE_RENDER_PIPE_SGIX     0x00000002
-#define GLX_PIPE_RECT_SGIX                 0x00000001
-#define GLX_PIPE_RECT_LIMITS_SGIX          0x00000002
-#define GLX_HYPERPIPE_STEREO_SGIX          0x00000003
-#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX   0x00000004
-#define GLX_HYPERPIPE_ID_SGIX              0x8030
-#endif
-
-#ifndef GLX_MESA_agp_offset
-#endif
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
-#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
-#endif
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
-#endif
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-#define GLX_FRONT_LEFT_EXT                 0x20DE
-#define GLX_FRONT_RIGHT_EXT                0x20DF
-#define GLX_BACK_LEFT_EXT                  0x20E0
-#define GLX_BACK_RIGHT_EXT                 0x20E1
-#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
-#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
-#define GLX_AUX0_EXT                       0x20E2
-#define GLX_AUX1_EXT                       0x20E3
-#define GLX_AUX2_EXT                       0x20E4
-#define GLX_AUX3_EXT                       0x20E5
-#define GLX_AUX4_EXT                       0x20E6
-#define GLX_AUX5_EXT                       0x20E7
-#define GLX_AUX6_EXT                       0x20E8
-#define GLX_AUX7_EXT                       0x20E9
-#define GLX_AUX8_EXT                       0x20EA
-#define GLX_AUX9_EXT                       0x20EB
-#endif
-
-
-/*************************************************************/
-
-#ifndef GLX_ARB_get_proc_address
-typedef void (*__GLXextFuncPtr)(void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-typedef XID GLXVideoSourceSGIX;
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-typedef XID GLXFBConfigIDSGIX;
-typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-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*/
-    int x, y;
-    int width, height;
-    int count;		  /* if nonzero, at least this many more */
-} GLXBufferClobberEventSGIX;
-#endif
-
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GLX_OML_sync_control extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-#endif
-
-#ifndef GLX_VERSION_1_3
-#define GLX_VERSION_1_3 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
-extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
-extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
-extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
-extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
-extern void glXDestroyWindow (Display *, GLXWindow);
-extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
-extern void glXDestroyPixmap (Display *, GLXPixmap);
-extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
-extern void glXDestroyPbuffer (Display *, GLXPbuffer);
-extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
-extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
-extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawable (void);
-extern Display * glXGetCurrentDisplay (void);
-extern int glXQueryContext (Display *, GLXContext, int, int *);
-extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
-typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
-typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
-typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
-typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
-typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
-typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
-typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
-typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
-#endif
-
-#ifndef GLX_VERSION_1_4
-#define GLX_VERSION_1_4 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_ARB_multisample
-#define GLX_ARB_multisample 1
-#endif
-
-#ifndef GLX_ARB_fbconfig_float
-#define GLX_ARB_fbconfig_float 1
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SGIS_multisample 1
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info 1
-#endif
-
-#ifndef GLX_SGI_swap_control
-#define GLX_SGI_swap_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXSwapIntervalSGI (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
-#endif
-
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetVideoSyncSGI (unsigned int *);
-extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
-typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#define GLX_SGI_make_current_read 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-#define GLX_SGIX_video_source 1
-#ifdef _VL_H
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
-extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
-typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
-#endif /* _VL_H */
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating 1
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Display * glXGetCurrentDisplayEXT (void);
-extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
-extern GLXContextID glXGetContextIDEXT (const GLXContext);
-extern GLXContext glXImportContextEXT (Display *, GLXContextID);
-extern void glXFreeContextEXT (Display *, GLXContext);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
-typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
-typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
-typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_SGIX_fbconfig 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
-extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
-extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
-extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
-extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
-extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
-typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
-typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
-typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_SGIX_pbuffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
-extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
-extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
-extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
-typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
-typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
-typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
-#endif
-
-#ifndef GLX_SGI_cushion
-#define GLX_SGI_cushion 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCushionSGI (Display *, Window, float);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SGIX_video_resize 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
-extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
-extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
-typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
-typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
-typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
-typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_SGIX_dmbuffer 1
-#ifdef _DM_BUFFER_H_
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
-#endif /* _DM_BUFFER_H_ */
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#define GLX_SGIX_swap_group 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#define GLX_SGIX_swap_barrier 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
-extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
-typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#define GLX_SUN_get_transparent_index 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXSet3DfxModeMESA (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
-#endif
-
-#ifndef GLX_SGIX_visual_select_group
-#define GLX_SGIX_visual_select_group 1
-#endif
-
-#ifndef GLX_OML_swap_method
-#define GLX_OML_swap_method 1
-#endif
-
-#ifndef GLX_OML_sync_control
-#define GLX_OML_sync_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
-extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
-extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
-extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
-extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
-typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
-typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
-typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
-typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
-#endif
-
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-#endif
-
-#ifndef GLX_SGIX_hyperpipe
-#define GLX_SGIX_hyperpipe 1
-
-typedef struct {
-    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int     networkId;
-} GLXHyperpipeNetworkSGIX;
-
-typedef struct {
-    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int     channel;
-    unsigned int
-      participationType;
-    int     timeSlice;
-} GLXHyperpipeConfigSGIX;
-
-typedef struct {
-    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int srcXOrigin, srcYOrigin, srcWidth, srcHeight;
-    int destXOrigin, destYOrigin, destWidth, destHeight;
-} GLXPipeRect;
-
-typedef struct {
-    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
-    int XOrigin, YOrigin, maxHeight, maxWidth;
-} GLXPipeRectLimits;
-
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXHyperpipeNetworkSGIX * glXQueryHyperpipeNetworkSGIX (Display *, int *);
-extern int glXHyperpipeConfigSGIX (Display *, int, int, GLXHyperpipeConfigSGIX *, int *);
-extern GLXHyperpipeConfigSGIX * glXQueryHyperpipeConfigSGIX (Display *, int, int *);
-extern int glXDestroyHyperpipeConfigSGIX (Display *, int);
-extern int glXBindHyperpipeSGIX (Display *, int);
-extern int glXQueryHyperpipeBestAttribSGIX (Display *, int, int, int, void *, void *);
-extern int glXHyperpipeAttribSGIX (Display *, int, int, int, void *);
-extern int glXQueryHyperpipeAttribSGIX (Display *, int, int, int, void *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
-typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
-typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
-typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
-typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
-typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
-typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
-#endif
-
-#ifndef GLX_MESA_agp_offset
-#define GLX_MESA_agp_offset 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern unsigned int glXGetAGPOffsetMESA (const void *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
-#endif
-
-#ifndef GLX_EXT_fbconfig_packed_float
-#define GLX_EXT_fbconfig_packed_float 1
-#endif
-
-#ifndef GLX_EXT_framebuffer_sRGB
-#define GLX_EXT_framebuffer_sRGB 1
-#endif
-
-#ifndef GLX_EXT_texture_from_pixmap
-#define GLX_EXT_texture_from_pixmap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindTexImageEXT (Display *, GLXDrawable, int, const int *);
-extern void glXReleaseTexImageEXT (Display *, GLXDrawable, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
-typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Mesa/inc/vms_x_fix.h b/Mesa/inc/vms_x_fix.h
deleted file mode 100644
index 70454e3..0000000
--- a/Mesa/inc/vms_x_fix.h
+++ /dev/null
@@ -1,1224 +0,0 @@
-/***************************************************************************
- *                                                                         *
- * Author : Jouk Jansen (joukj@hrem.nano.tudelft.nl)                       *
- *                                                                         *
- * Last revision : 31 August 2006                                          *
- *                                                                         *
- * Repair definitions of Runtime library functions when compiling with     *
- * /name=(as_is) on OpenVMS                                                *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef VMS_X_FIX
-#define VMS_X_FIX
-
-#define decw$_select DECW$_SELECT
-#define DtSaverGetWindows DTSAVERGETWINDOWS
-#define MrmFetchWidget MRMFETCHWIDGET
-#define MrmInitialize MRMINITIALIZE
-#define MrmOpenHierarchy MRMOPENHIERARCHY
-#define MrmRegisterNames MRMREGISTERNAMES
-#define XAddExtension XADDEXTENSION
-#define XAddHosts XADDHOSTS
-#define XAllocClassHint XALLOCCLASSHINT
-#define XAllocColor XALLOCCOLOR
-#define XAllocColorCells XALLOCCOLORCELLS
-#define XAllocIconSize XALLOCICONSIZE
-#define XAllocNamedColor XALLOCNAMEDCOLOR
-#define XAllocSizeHints XALLOCSIZEHINTS
-#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP
-#define XAllocWMHints XALLOCWMHINTS
-#define XAllowEvents XALLOWEVENTS
-#define XAutoRepeatOff XAUTOREPEATOFF
-#define XAutoRepeatOn XAUTOREPEATON
-#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET
-#define XBell XBELL
-#define XBitmapPad XBITMAPPAD
-#define XBlackPixel XBLACKPIXEL
-#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN
-#define XCellsOfScreen XCELLSOFSCREEN
-#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
-#define XChangeGC XCHANGEGC
-#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
-#define XChangePointerControl XCHANGEPOINTERCONTROL
-#define XChangeProperty XCHANGEPROPERTY
-#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
-#define XCheckIfEvent XCHECKIFEVENT
-#define XCheckMaskEvent XCHECKMASKEVENT
-#define XCheckTypedEvent XCHECKTYPEDEVENT
-#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
-#define XCheckWindowEvent XCHECKWINDOWEVENT
-#define XClearArea XCLEARAREA
-#define XClearWindow XCLEARWINDOW
-#define XClipBox XCLIPBOX
-#define XCloseDisplay XCLOSEDISPLAY
-#define XCloseIM XCLOSEIM
-#define XConfigureWindow XCONFIGUREWINDOW
-#define XConvertSelection XCONVERTSELECTION
-#define XCopyArea XCOPYAREA
-#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE
-#define XCopyGC XCOPYGC
-#define XCopyPlane XCOPYPLANE
-#define XCreateBitmapFromData XCREATEBITMAPFROMDATA
-#define XCreateColormap XCREATECOLORMAP
-#define XCreateFontCursor XCREATEFONTCURSOR
-#define XCreateFontSet XCREATEFONTSET
-#define XCreateGC XCREATEGC
-#define XCreateGlyphCursor XCREATEGLYPHCURSOR
-#define XCreateIC XCREATEIC
-#define XCreateImage XCREATEIMAGE
-#define XCreatePixmap XCREATEPIXMAP
-#define XCreatePixmapCursor XCREATEPIXMAPCURSOR
-#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA
-#define XCreateRegion XCREATEREGION
-#define XCreateSimpleWindow XCREATESIMPLEWINDOW
-#define XCreateWindow XCREATEWINDOW
-#define XDefaultColormap XDEFAULTCOLORMAP
-#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
-#define XDefaultDepth XDEFAULTDEPTH
-#define XDefaultDepthOfScreen XDEFAULTDEPTHOFSCREEN
-#define XDefaultGC XDEFAULTGC
-#define XDefaultRootWindow XDEFAULTROOTWINDOW
-#define XDefaultScreen XDEFAULTSCREEN
-#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
-#define XDefaultVisual XDEFAULTVISUAL
-#define XDefaultVisualOfScreen XDEFAULTVISUALOFSCREEN
-#define XDefineCursor XDEFINECURSOR
-#define XDeleteContext XDELETECONTEXT
-#define XDeleteProperty XDELETEPROPERTY
-#define XDestroyIC XDESTROYIC
-#define XDestroyRegion XDESTROYREGION
-#define XDestroySubwindows XDESTROYSUBWINDOWS
-#define XDestroyWindow XDESTROYWINDOW
-#define XDisableAccessControl XDISABLEACCESSCONTROL
-#define XDisplayCells XDISPLAYCELLS
-#define XDisplayHeight XDISPLAYHEIGHT
-#define XDisplayKeycodes XDISPLAYKEYCODES
-#define XDisplayName XDISPLAYNAME
-#define XDisplayOfIM XDISPLAYOFIM
-#define XDisplayOfScreen XDISPLAYOFSCREEN
-#define XDisplayString XDISPLAYSTRING
-#define XDisplayWidth XDISPLAYWIDTH
-#define XDoesBackingStore XDOESBACKINGSTORE
-#define XDrawArc XDRAWARC
-#define XDrawArcs XDRAWARCS
-#define XDrawImageString XDRAWIMAGESTRING
-#define XDrawImageString16 XDRAWIMAGESTRING16
-#define XDrawLine XDRAWLINE
-#define XDrawLines XDRAWLINES
-#define XDrawPoint XDRAWPOINT
-#define XDrawPoints XDRAWPOINTS
-#define XDrawRectangle XDRAWRECTANGLE
-#define XDrawRectangles XDRAWRECTANGLES
-#define XDrawSegments XDRAWSEGMENTS
-#define XDrawString XDRAWSTRING
-#define XDrawString16 XDRAWSTRING16
-#define XDrawText XDRAWTEXT
-#define XDrawText16 XDRAWTEXT16
-#define XESetCloseDisplay XESETCLOSEDISPLAY
-#define XEmptyRegion XEMPTYREGION
-#define XEnableAccessControl XENABLEACCESSCONTROL
-#define XEqualRegion XEQUALREGION
-#define XEventsQueued XEVENTSQUEUED
-#define XExtendedMaxRequestSize XEXTENDEDMAXREQUESTSIZE
-#define XExtentsOfFontSet XEXTENTSOFFONTSET
-#define XFetchBuffer XFETCHBUFFER
-#define XFetchBytes XFETCHBYTES
-#define XFetchName XFETCHNAME
-#define XFillArc XFILLARC
-#define XFillArcs XFILLARCS
-#define XFillPolygon XFILLPOLYGON
-#define XFillRectangle XFILLRECTANGLE
-#define XFillRectangles XFILLRECTANGLES
-#define XFilterEvent XFILTEREVENT
-#define XFindContext XFINDCONTEXT
-#define XFlush XFLUSH
-#define XFontsOfFontSet XFONTSOFFONTSET
-#define XForceScreenSaver XFORCESCREENSAVER
-#define XFree XFREE
-#define XFreeColormap XFREECOLORMAP
-#define XFreeColors XFREECOLORS
-#define XFreeCursor XFREECURSOR
-#define XFreeDeviceList XFREEDEVICELIST
-#define XFreeDeviceState XFREEDEVICESTATE
-#define XFreeFont XFREEFONT
-#define XFreeFontInfo XFREEFONTINFO
-#define XFreeFontNames XFREEFONTNAMES
-#define XFreeFontSet XFREEFONTSET
-#define XFreeGC XFREEGC
-#define XFreeModifiermap XFREEMODIFIERMAP
-#define XFreePixmap XFREEPIXMAP
-#define XFreeStringList XFREESTRINGLIST
-#define XGContextFromGC XGCONTEXTFROMGC
-#define XGeometry XGEOMETRY
-#define XGetAtomName XGETATOMNAME
-#define XGetClassHint XGETCLASSHINT
-#define XGetCommand XGETCOMMAND
-#define XGetDefault XGETDEFAULT
-#define XGetErrorDatabaseText XGETERRORDATABASETEXT
-#define XGetErrorText XGETERRORTEXT
-#define XGetExtensionVersion XGETEXTENSIONVERSION
-#define XGetFontProperty XGETFONTPROPERTY
-#define XGetGCValues XGETGCVALUES
-#define XGetGeometry XGETGEOMETRY
-#define XGetICValues XGETICVALUES
-#define XGetIMValues XGETIMVALUES
-#define XGetIconName XGETICONNAME
-#define XGetIconSizes XGETICONSIZES
-#define XGetImage XGETIMAGE
-#define XGetInputFocus XGETINPUTFOCUS
-#define XGetKeyboardControl XGETKEYBOARDCONTROL
-#define XGetKeyboardMapping XGETKEYBOARDMAPPING
-#define XGetModifierMapping XGETMODIFIERMAPPING
-#define XGetMotionEvents XGETMOTIONEVENTS
-#define XGetNormalHints XGETNORMALHINTS
-#define XGetPointerControl XGETPOINTERCONTROL
-#define XGetPointerMapping XGETPOINTERMAPPING
-#define XGetRGBColormaps XGETRGBCOLORMAPS
-#define XGetScreenSaver XGETSCREENSAVER
-#define XGetSelectionOwner XGETSELECTIONOWNER
-#define XGetStandardColormap XGETSTANDARDCOLORMAP
-#define XGetSubImage XGETSUBIMAGE
-#define XGetTextProperty XGETTEXTPROPERTY
-#define XGetVisualInfo XGETVISUALINFO
-#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
-#define XGetWMHints XGETWMHINTS
-#define XGetWMIconName XGETWMICONNAME
-#define XGetWMName XGETWMNAME
-#define XGetWMNormalHints XGETWMNORMALHINTS
-#define XGetWindowAttributes XGETWINDOWATTRIBUTES
-#define XGetWindowProperty XGETWINDOWPROPERTY
-#define XGrabButton XGRABBUTTON
-#define XGrabKeyboard XGRABKEYBOARD
-#define XGrabPointer XGRABPOINTER
-#define XGrabServer XGRABSERVER
-#define XHeightMMOfScreen XHEIGHTMMOFSCREEN
-#define XHeightOfScreen XHEIGHTOFSCREEN
-#define XIconifyWindow XICONIFYWINDOW
-#define XIfEvent XIFEVENT
-#define XInitExtension XINITEXTENSION
-#define XInitImage XINITIMAGE
-#define XInstallColormap XINSTALLCOLORMAP
-#define XInternAtom XINTERNATOM
-#define XInternAtoms XINTERNATOMS
-#define XIntersectRegion XINTERSECTREGION
-#define XKeycodeToKeysym XKEYCODETOKEYSYM
-#define XKeysymToKeycode XKEYSYMTOKEYCODE
-#define XKeysymToString XKEYSYMTOSTRING
-#define XKillClient XKILLCLIENT
-#define XListDepths XLISTDEPTHS
-#define XListFonts XLISTFONTS
-#define XListFontsWithInfo XLISTFONTSWITHINFO
-#define XListHosts XLISTHOSTS
-#define XListInputDevices XLISTINPUTDEVICES
-#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS
-#define XListPixmapFormats XLISTPIXMAPFORMATS
-#define XListProperties XLISTPROPERTIES
-#define XLoadFont XLOADFONT
-#define XLoadQueryFont XLOADQUERYFONT
-#define XLookupColor XLOOKUPCOLOR
-#define XLookupKeysym XLOOKUPKEYSYM
-#define XLookupString XLOOKUPSTRING
-#define XLowerWindow XLOWERWINDOW
-#define XMapRaised XMAPRAISED
-#define XMapSubwindows XMAPSUBWINDOWS
-#define XMapWindow XMAPWINDOW
-#define XMaskEvent XMASKEVENT
-#define XMatchVisualInfo XMATCHVISUALINFO
-#define XMaxRequestSize XMAXREQUESTSIZE
-#define XMissingExtension XMISSINGEXTENSION
-#define XMoveResizeWindow XMOVERESIZEWINDOW
-#define XMoveWindow XMOVEWINDOW
-#define XNextEvent XNEXTEVENT
-#define XNextRequest XNEXTREQUEST
-#define XNoOp XNOOP
-#define XOffsetRegion XOFFSETREGION
-#define XOpenDevice XOPENDEVICE
-#define XOpenDisplay XOPENDISPLAY
-#define XOpenIM XOPENIM
-#define XParseColor XPARSECOLOR
-#define XParseGeometry XPARSEGEOMETRY
-#define XPeekEvent XPEEKEVENT
-#define XPeekIfEvent XPEEKIFEVENT
-#define XPending XPENDING
-#define XPointInRegion XPOINTINREGION
-#define XPolygonRegion XPOLYGONREGION
-#define XPutBackEvent XPUTBACKEVENT
-#define XPutImage XPUTIMAGE
-#define XQLength XQLENGTH
-#define XQueryBestCursor XQUERYBESTCURSOR
-#define XQueryBestStipple XQUERYBESTSTIPPLE
-#define XQueryColor XQUERYCOLOR
-#define XQueryColors XQUERYCOLORS
-#define XQueryDeviceState XQUERYDEVICESTATE
-#define XQueryExtension XQUERYEXTENSION
-#define XQueryFont XQUERYFONT
-#define XQueryKeymap XQUERYKEYMAP
-#define XQueryPointer XQUERYPOINTER
-#define XQueryTree XQUERYTREE
-#define XRaiseWindow XRAISEWINDOW
-#define XReadBitmapFile XREADBITMAPFILE
-#define XRecolorCursor XRECOLORCURSOR
-#define XReconfigureWMWindow XRECONFIGUREWMWINDOW
-#define XRectInRegion XRECTINREGION
-#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
-#define XRemoveHosts XREMOVEHOSTS
-#define XReparentWindow XREPARENTWINDOW
-#define XResetScreenSaver XRESETSCREENSAVER
-#define XResizeWindow XRESIZEWINDOW
-#define XResourceManagerString XRESOURCEMANAGERSTRING
-#define XRestackWindows XRESTACKWINDOWS
-#define XRotateBuffers XROTATEBUFFERS
-#define XRootWindow XROOTWINDOW
-#define XRootWindowOfScreen XROOTWINDOWOFSCREEN
-#define XSaveContext XSAVECONTEXT
-#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN
-#define XScreenOfDisplay XSCREENOFDISPLAY
-#define XSelectAsyncEvent XSELECTASYNCEVENT
-#define XSelectAsyncInput XSELECTASYNCINPUT
-#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
-#define XSelectInput XSELECTINPUT
-#define XSendEvent XSENDEVENT
-#define XServerVendor XSERVERVENDOR
-#define XSetArcMode XSETARCMODE
-#define XSetBackground XSETBACKGROUND
-#define XSetClassHint XSETCLASSHINT
-#define XSetClipMask XSETCLIPMASK
-#define XSetClipOrigin XSETCLIPORIGIN
-#define XSetClipRectangles XSETCLIPRECTANGLES
-#define XSetCloseDownMode XSETCLOSEDOWNMODE
-#define XSetCommand XSETCOMMAND
-#define XSetDashes XSETDASHES
-#define XSetErrorHandler XSETERRORHANDLER
-#define XSetExtensionErrorHandler XSETEXTENSIONERRORHANDLER
-#define XSetFillRule XSETFILLRULE
-#define XSetFillStyle XSETFILLSTYLE
-#define XSetFont XSETFONT
-#define XSetForeground XSETFOREGROUND
-#define XSetFunction XSETFUNCTION
-#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
-#define XSetICFocus XSETICFOCUS
-#define XSetICValues XSETICVALUES
-#define XSetIOErrorHandler XSETIOERRORHANDLER
-#define XSetIconName XSETICONNAME
-#define XSetInputFocus XSETINPUTFOCUS
-#define XSetLineAttributes XSETLINEATTRIBUTES
-#define XSetLocaleModifiers XSETLOCALEMODIFIERS
-#define XSetNormalHints XSETNORMALHINTS
-#define XSetPlaneMask XSETPLANEMASK
-#define XSetRegion XSETREGION
-#define XSetRGBColormaps XSETRGBCOLORMAPS
-#define XSetScreenSaver XSETSCREENSAVER
-#define XSetSelectionOwner XSETSELECTIONOWNER
-#define XSetStandardProperties XSETSTANDARDPROPERTIES
-#define XSetState XSETSTATE
-#define XSetStipple XSETSTIPPLE
-#define XSetSubwindowMode XSETSUBWINDOWMODE
-#define XSetTSOrigin XSETTSORIGIN
-#define XSetTextProperty XSETTEXTPROPERTY
-#define XSetTile XSETTILE
-#define XSetTransientForHint XSETTRANSIENTFORHINT
-#define XSetWMClientMachine XSETWMCLIENTMACHINE
-#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
-#define XSetWMHints XSETWMHINTS
-#define XSetWMIconName XSETWMICONNAME
-#define XSetWMName XSETWMNAME
-#define XSetWMNormalHints XSETWMNORMALHINTS
-#define XSetWMProperties XSETWMPROPERTIES
-#define XSetWMProtocols XSETWMPROTOCOLS
-#define XSetWMSizeHints XSETWMSIZEHINTS
-#define XSetWindowBackground XSETWINDOWBACKGROUND
-#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
-#define XSetWindowBorder XSETWINDOWBORDER
-#define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP
-#define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
-#define XSetWindowColormap XSETWINDOWCOLORMAP
-#define XShapeCombineMask XSHAPECOMBINEMASK
-#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
-#define XShapeGetRectangles XSHAPEGETRECTANGLES
-#define XShapeQueryExtension XSHAPEQUERYEXTENSION
-#define XShmAttach XSHMATTACH
-#define XShmCreateImage XSHMCREATEIMAGE
-#define XShmCreatePixmap XSHMCREATEPIXMAP
-#define XShmDetach XSHMDETACH
-#define XShmGetEventBase XSHMGETEVENTBASE
-#define XShmPutImage XSHMPUTIMAGE
-#define XShmQueryExtension XSHMQUERYEXTENSION
-#define XShmQueryVersion XSHMQUERYVERSION
-#define XShrinkRegion XSHRINKREGION
-#define XStoreBuffer XSTOREBUFFER
-#define XStoreBytes XSTOREBYTES
-#define XStoreColor XSTORECOLOR
-#define XStoreColors XSTORECOLORS
-#define XStoreName XSTORENAME
-#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY
-#define XStringToKeysym XSTRINGTOKEYSYM
-#define XSubtractRegion XSUBTRACTREGION
-#define XSupportsLocale XSUPPORTSLOCALE
-#define XSync XSYNC
-#define XSynchronize XSYNCHRONIZE
-#define XTextExtents XTEXTEXTENTS
-#define XTextExtents16 XTEXTEXTENTS16
-#define XTextPropertyToStringList XTEXTPROPERTYTOSTRINGLIST
-#define XTextWidth XTEXTWIDTH
-#define XTextWidth16 XTEXTWIDTH16
-#define XTranslateCoordinates XTRANSLATECOORDINATES
-#define XUndefineCursor XUNDEFINECURSOR
-#define XUngrabButton XUNGRABBUTTON
-#define XUngrabKeyboard XUNGRABKEYBOARD
-#define XUngrabPointer XUNGRABPOINTER
-#define XUngrabServer XUNGRABSERVER
-#define XUninstallColormap XUNINSTALLCOLORMAP
-#define XUnionRectWithRegion XUNIONRECTWITHREGION
-#define XUnionRegion XUNIONREGION
-#define XUniqueContext XUNIQUECONTEXT
-#define XUnloadFont XUNLOADFONT
-#define XUnmapWindow XUNMAPWINDOW
-#define XUnsetICFocus XUNSETICFOCUS
-#define XVaCreateNestedList XVACREATENESTEDLIST
-#define XVisualIDFromVisual XVISUALIDFROMVISUAL
-#define XWMGeometry XWMGEOMETRY
-#define XWarpPointer XWARPPOINTER
-#define XWhitePixel XWHITEPIXEL
-#define XWhitePixelOfScreen XWHITEPIXELOFSCREEN
-#define XWidthMMOfScreen XWIDTHMMOFSCREEN
-#define XWidthOfScreen XWIDTHOFSCREEN
-#define XWindowEvent XWINDOWEVENT
-#define XWithdrawWindow XWITHDRAWWINDOW
-#define XXorRegion XXORREGION
-#define XcmsQueryColor XCMSQUERYCOLOR
-#define XdbeAllocateBackBufferName XDBEALLOCATEBACKBUFFERNAME
-#define XdbeFreeVisualInfo XDBEFREEVISUALINFO
-#define XdbeGetVisualInfo XDBEGETVISUALINFO
-#define XdbeQueryExtension XDBEQUERYEXTENSION
-#define XdbeSwapBuffers XDBESWAPBUFFERS
-#define XextAddDisplay XEXTADDDISPLAY
-#define XextFindDisplay XEXTFINDDISPLAY
-#define XextRemoveDisplay XEXTREMOVEDISPLAY
-#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT
-#define XmActivateProtocol XMACTIVATEPROTOCOL
-#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
-#define XmAddProtocols XMADDPROTOCOLS
-#define XmChangeColor XMCHANGECOLOR
-#define XmClipboardCopy XMCLIPBOARDCOPY
-#define XmClipboardCopyByName XMCLIPBOARDCOPYBYNAME
-#define XmClipboardEndCopy XMCLIPBOARDENDCOPY
-#define XmClipboardEndRetrieve XMCLIPBOARDENDRETRIEVE
-#define XmClipboardInquireCount XMCLIPBOARDINQUIRECOUNT
-#define XmClipboardInquireFormat XMCLIPBOARDINQUIREFORMAT
-#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH
-#define XmClipboardLock XMCLIPBOARDLOCK
-#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE
-#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
-#define XmClipboardStartRetrieve XMCLIPBOARDSTARTRETRIEVE
-#define XmClipboardUnlock XMCLIPBOARDUNLOCK
-#define XmCommandError XMCOMMANDERROR
-#define XmCommandGetChild XMCOMMANDGETCHILD
-#define XmCommandSetValue XMCOMMANDSETVALUE
-#define XmCreateArrowButton XMCREATEARROWBUTTON
-#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
-#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG
-#define XmCreateCascadeButton XMCREATECASCADEBUTTON
-#define XmCreateCascadeButtonGadget XMCREATECASCADEBUTTONGADGET
-#define XmCreateDialogShell XMCREATEDIALOGSHELL
-#define XmCreateDragIcon XMCREATEDRAGICON
-#define XmCreateDrawingArea XMCREATEDRAWINGAREA
-#define XmCreateDrawnButton XMCREATEDRAWNBUTTON
-#define XmCreateErrorDialog XMCREATEERRORDIALOG
-#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX
-#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG
-#define XmCreateForm XMCREATEFORM
-#define XmCreateFormDialog XMCREATEFORMDIALOG
-#define XmCreateFrame XMCREATEFRAME
-#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
-#define XmCreateLabel XMCREATELABEL
-#define XmCreateLabelGadget XMCREATELABELGADGET
-#define XmCreateList XMCREATELIST
-#define XmCreateMainWindow XMCREATEMAINWINDOW
-#define XmCreateMenuBar XMCREATEMENUBAR
-#define XmCreateMessageBox XMCREATEMESSAGEBOX
-#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG
-#define XmCreateOptionMenu XMCREATEOPTIONMENU
-#define XmCreatePanedWindow XMCREATEPANEDWINDOW
-#define XmCreatePopupMenu XMCREATEPOPUPMENU
-#define XmCreatePromptDialog XMCREATEPROMPTDIALOG
-#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU
-#define XmCreatePushButton XMCREATEPUSHBUTTON
-#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET
-#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG
-#define XmCreateRadioBox XMCREATERADIOBOX
-#define XmCreateRowColumn XMCREATEROWCOLUMN
-#define XmCreateScale XMCREATESCALE
-#define XmCreateScrollBar XMCREATESCROLLBAR
-#define XmCreateScrolledList XMCREATESCROLLEDLIST
-#define XmCreateScrolledText XMCREATESCROLLEDTEXT
-#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW
-#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG
-#define XmCreateSeparator XMCREATESEPARATOR
-#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET
-#define XmCreateSimpleMenuBar XMCREATESIMPLEMENUBAR
-#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG
-#define XmCreateText XMCREATETEXT
-#define XmCreateTextField XMCREATETEXTFIELD
-#define XmCreateToggleButton XMCREATETOGGLEBUTTON
-#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET
-#define XmCreateWarningDialog XMCREATEWARNINGDIALOG
-#define XmCvtCTToXmString XMCVTCTTOXMSTRING
-#define XmDestroyPixmap XMDESTROYPIXMAP
-#define XmDragStart XMDRAGSTART
-#define XmDropSiteRegister XMDROPSITEREGISTER
-#define XmDropSiteUnregister XMDROPSITEUNREGISTER
-#define XmDropSiteUpdate XMDROPSITEUPDATE
-#define XmDropTransferStart XMDROPTRANSFERSTART
-#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD
-#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH
-#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY
-#define XmFontListCopy XMFONTLISTCOPY
-#define XmFontListCreate XMFONTLISTCREATE
-#define XmFontListEntryCreate XMFONTLISTENTRYCREATE
-#define XmFontListEntryFree XMFONTLISTENTRYFREE
-#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT
-#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG
-#define XmFontListEntryLoad XMFONTLISTENTRYLOAD
-#define XmFontListFree XMFONTLISTFREE
-#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT
-#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT
-#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
-#define XmFontListNextEntry XMFONTLISTNEXTENTRY
-#define XmGetColors XMGETCOLORS
-#define XmGetColorCalculation XMGETCOLORCALCULATION
-#define XmGetFocusWidget XMGETFOCUSWIDGET
-#define XmGetMenuCursor XMGETMENUCURSOR
-#define XmGetPixmap XMGETPIXMAP
-#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH
-#define XmGetTearOffControl XMGETTEAROFFCONTROL
-#define XmGetXmDisplay XMGETXMDISPLAY
-#define XmImMbLookupString XMIMMBLOOKUPSTRING
-#define XmImRegister XMIMREGISTER
-#define XmImSetFocusValues XMIMSETFOCUSVALUES
-#define XmImSetValues XMIMSETVALUES
-#define XmImUnregister XMIMUNREGISTER
-#define XmImUnsetFocus XMIMUNSETFOCUS
-#define XmInstallImage XMINSTALLIMAGE
-#define XmInternAtom XMINTERNATOM
-#define XmIsMotifWMRunning XMISMOTIFWMRUNNING
-#define XmListAddItem XMLISTADDITEM
-#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED
-#define XmListAddItems XMLISTADDITEMS
-#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED
-#define XmListDeleteAllItems XMLISTDELETEALLITEMS
-#define XmListDeleteItem XMLISTDELETEITEM
-#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS
-#define XmListDeletePos XMLISTDELETEPOS
-#define XmListDeselectAllItems XMLISTDESELECTALLITEMS
-#define XmListDeselectPos XMLISTDESELECTPOS
-#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS
-#define XmListGetMatchPos XMLISTGETMATCHPOS
-#define XmListGetSelectedPos XMLISTGETSELECTEDPOS
-#define XmListItemExists XMLISTITEMEXISTS
-#define XmListItemPos XMLISTITEMPOS
-#define XmListPosSelected XMLISTPOSSELECTED
-#define XmListReplaceItems XMLISTREPLACEITEMS
-#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS
-#define XmListSelectItem XMLISTSELECTITEM
-#define XmListSelectPos XMLISTSELECTPOS
-#define XmListSetBottomPos XMLISTSETBOTTOMPOS
-#define XmListSetItem XMLISTSETITEM
-#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS
-#define XmListSetPos XMLISTSETPOS
-#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS
-#define XmMenuPosition XMMENUPOSITION
-#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD
-#define XmOptionButtonGadget XMOPTIONBUTTONGADGET
-#define XmOptionLabelGadget XMOPTIONLABELGADGET
-#define XmProcessTraversal XMPROCESSTRAVERSAL
-#define XmQmotif XMQMOTIF
-#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK
-#define XmRemoveProtocols XMREMOVEPROTOCOLS
-#define XmRemoveTabGroup XMREMOVETABGROUP
-#define XmRepTypeGetId XMREPTYPEGETID
-#define XmRepTypeGetRecord XMREPTYPEGETRECORD
-#define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON
-#define XmRepTypeRegister XMREPTYPEREGISTER
-#define XmRepTypeValidValue XMREPTYPEVALIDVALUE
-#define XmScrollBarGetValues XMSCROLLBARGETVALUES
-#define XmScrollBarSetValues XMSCROLLBARSETVALUES
-#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
-#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD
-#define XmSetColorCalculation XMSETCOLORCALCULATION
-#define XmStringByteCompare XMSTRINGBYTECOMPARE
-#define XmStringCompare XMSTRINGCOMPARE
-#define XmStringConcat XMSTRINGCONCAT
-#define XmStringCopy XMSTRINGCOPY
-#define XmStringCreate XMSTRINGCREATE
-#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED
-#define XmStringCreateLtoR XMSTRINGCREATELTOR
-#define XmStringCreateSimple XMSTRINGCREATESIMPLE
-#define XmStringDraw XMSTRINGDRAW
-#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE
-#define XmStringExtent XMSTRINGEXTENT
-#define XmStringFree XMSTRINGFREE
-#define XmStringFreeContext XMSTRINGFREECONTEXT
-#define XmStringGetLtoR XMSTRINGGETLTOR
-#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT
-#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT
-#define XmStringInitContext XMSTRINGINITCONTEXT
-#define XmStringLength XMSTRINGLENGTH
-#define XmStringLtoRCreate XMSTRINGLTORCREATE
-#define XmStringNConcat XMSTRINGNCONCAT
-#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE
-#define XmStringSeparatorCreate XMSTRINGSEPARATORCREATE
-#define XmStringWidth XMSTRINGWIDTH
-#define XmTextClearSelection XMTEXTCLEARSELECTION
-#define XmTextCopy XMTEXTCOPY
-#define XmTextCut XMTEXTCUT
-#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION
-#define XmTextFieldCopy XMTEXTFIELDCOPY
-#define XmTextFieldCut XMTEXTFIELDCUT
-#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE
-#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION
-#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION
-#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH
-#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION
-#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION
-#define XmTextFieldGetString XMTEXTFIELDGETSTRING
-#define XmTextFieldInsert XMTEXTFIELDINSERT
-#define XmTextFieldPaste XMTEXTFIELDPASTE
-#define XmTextFieldRemove XMTEXTFIELDREMOVE
-#define XmTextFieldReplace XMTEXTFIELDREPLACE
-#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE
-#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT
-#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION
-#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH
-#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION
-#define XmTextFieldSetString XMTEXTFIELDSETSTRING
-#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION
-#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION
-#define XmTextGetEditable XMTEXTGETEDITABLE
-#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION
-#define XmTextGetLastPosition XMTEXTGETLASTPOSITION
-#define XmTextGetMaxLength XMTEXTGETMAXLENGTH
-#define XmTextGetSelection XMTEXTGETSELECTION
-#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION
-#define XmTextGetString XMTEXTGETSTRING
-#define XmTextInsert XMTEXTINSERT
-#define XmTextPaste XMTEXTPASTE
-#define XmTextPosToXY XMTEXTPOSTOXY
-#define XmTextRemove XMTEXTREMOVE
-#define XmTextReplace XMTEXTREPLACE
-#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION
-#define XmTextSetEditable XMTEXTSETEDITABLE
-#define XmTextSetHighlight XMTEXTSETHIGHLIGHT
-#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
-#define XmTextSetSelection XMTEXTSETSELECTION
-#define XmTextSetString XMTEXTSETSTRING
-#define XmTextSetTopCharacter XMTEXTSETTOPCHARACTER
-#define XmTextShowPosition XMTEXTSHOWPOSITION
-#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
-#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE
-#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE
-#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE
-#define XmUninstallImage XMUNINSTALLIMAGE
-#define XmUpdateDisplay XMUPDATEDISPLAY
-#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX
-#define XmbDrawString XMBDRAWSTRING
-#define XmbLookupString XMBLOOKUPSTRING
-#define XmbResetIC XMBRESETIC
-#define XmbSetWMProperties XMBSETWMPROPERTIES
-#define XmbTextEscapement XMBTEXTESCAPEMENT
-#define XmbTextExtents XMBTEXTEXTENTS
-#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY
-#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST
-#define XmbufCreateBuffers XMBUFCREATEBUFFERS
-#define XmbufDestroyBuffers XMBUFDESTROYBUFFERS
-#define XmbufDisplayBuffers XMBUFDISPLAYBUFFERS
-#define XmbufQueryExtension XMBUFQUERYEXTENSION
-#define Xmemory_free XMEMORY_FREE
-#define Xmemory_malloc XMEMORY_MALLOC
-#define XmuClientWindow XMUCLIENTWINDOW
-#define XmuConvertStandardSelection XMUCONVERTSTANDARDSELECTION
-#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP
-#define XmuInternAtom XMUINTERNATOM
-#define XmuInternStrings XMUINTERNSTRINGS
-#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
-#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
-#define XrmCombineDatabase XRMCOMBINEDATABASE
-#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE
-#define XrmDestroyDatabase XRMDESTROYDATABASE
-#define XrmGetDatabase XRMGETDATABASE
-#define XrmGetFileDatabase XRMGETFILEDATABASE
-#define XrmGetResource XRMGETRESOURCE
-#define XrmGetStringDatabase XRMGETSTRINGDATABASE
-#define XrmInitialize XRMINITIALIZE
-#define XrmMergeDatabases XRMMERGEDATABASES
-#define XrmParseCommand XRMPARSECOMMAND
-#define XrmPermStringToQuark XRMPERMSTRINGTOQUARK
-#define XrmPutFileDatabase XRMPUTFILEDATABASE
-#define XrmPutLineResource XRMPUTLINERESOURCE
-#define XrmPutStringResource XRMPUTSTRINGRESOURCE
-#define XrmQGetResource XRMQGETRESOURCE
-#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
-#define XrmQuarkToString XRMQUARKTOSTRING
-#define XrmSetDatabase XRMSETDATABASE
-#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
-#define XrmStringToQuark XRMSTRINGTOQUARK
-#define XtAddCallback XTADDCALLBACK
-#define XtAddCallbacks XTADDCALLBACKS
-#define XtAddConverter XTADDCONVERTER
-#define XtAddEventHandler XTADDEVENTHANDLER
-#define XtAddExposureToRegion XTADDEXPOSURETOREGION
-#define XtAddGrab XTADDGRAB
-#define XtAddRawEventHandler XTADDRAWEVENTHANDLER
-#define XtAllocateGC XTALLOCATEGC
-#define XtAppAddActions XTAPPADDACTIONS
-#define XtAppAddInput XTAPPADDINPUT
-#define XtAppAddTimeOut XTAPPADDTIMEOUT
-#define XtAppAddWorkProc XTAPPADDWORKPROC
-#define XtAppCreateShell XTAPPCREATESHELL
-#define XtAppError XTAPPERROR
-#define XtAppErrorMsg XTAPPERRORMSG
-#define XtAppGetErrorDatabase XTAPPGETERRORDATABASE
-#define XtAppGetErrorDatabaseText XTAPPGETERRORDATABASETEXT
-#define XtAppSetErrorMsgHandler XTAPPSETERRORMSGHANDLER
-#define XtAppInitialize XTAPPINITIALIZE
-#define XtAppMainLoop XTAPPMAINLOOP
-#define XtAppNextEvent XTAPPNEXTEVENT
-#define XtAppPeekEvent XTAPPPEEKEVENT
-#define XtAppPending XTAPPPENDING
-#define XtAppProcessEvent XTAPPPROCESSEVENT
-#define XtAppSetErrorHandler XTAPPSETERRORHANDLER
-#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES
-#define XtAppSetTypeConverter XTAPPSETTYPECONVERTER
-#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER
-#define XtAppWarningMsg XTAPPWARNINGMSG
-#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
-#define XtAppWarning XTAPPWARNING
-#define XtAugmentTranslations XTAUGMENTTRANSLATIONS
-#define XtCallActionProc XTCALLACTIONPROC
-#define XtCallCallbackList XTCALLCALLBACKLIST
-#define XtCallCallbacks XTCALLCALLBACKS
-#define XtCallConverter XTCALLCONVERTER
-#define XtCalloc XTCALLOC
-#ifndef NOXTDISPLAY
-#define XtClass XTCLASS
-#endif
-#define XtCloseDisplay XTCLOSEDISPLAY
-#define XtConfigureWidget XTCONFIGUREWIDGET
-#define XtConvert XTCONVERT
-#define XtConvertAndStore XTCONVERTANDSTORE
-#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
-#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
-#define XtCreatePopupShell XTCREATEPOPUPSHELL
-#define XtCreateWidget XTCREATEWIDGET
-#define XtCreateWindow XTCREATEWINDOW
-#define XtCvtStringToFont XTCVTSTRINGTOFONT
-#define XtDatabase XTDATABASE
-#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
-#define XtDestroyWidget XTDESTROYWIDGET
-#define XtDisownSelection XTDISOWNSELECTION
-#define XtDispatchEvent XTDISPATCHEVENT
-#ifndef NOXTDISPLAY
-#define XtDisplay XTDISPLAY
-#endif
-#define XtDisplayInitialize XTDISPLAYINITIALIZE
-#define XtDisplayOfObject XTDISPLAYOFOBJECT
-#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
-#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
-#define XtError XTERROR
-#define XtErrorMsg XTERRORMSG
-#define XtFree XTFREE
-#define XtGetActionKeysym XTGETACTIONKEYSYM
-#define XtGetActionList XTGETACTIONLIST
-#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
-#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES
-#define XtGetClassExtension XTGETCLASSEXTENSION
-#define XtGetConstraintResourceList XTGETCONSTRAINTRESOURCELIST
-#define XtGetGC XTGETGC
-#define XtGetMultiClickTime XTGETMULTICLICKTIME
-#define XtGetResourceList XTGETRESOURCELIST
-#define XtGetSelectionValue XTGETSELECTIONVALUE
-#define XtGetSelectionValues XTGETSELECTIONVALUES
-#define XtGetSubresources XTGETSUBRESOURCES
-#define XtGetValues XTGETVALUES
-#define XtGrabButton XTGRABBUTTON
-#define XtGrabKeyboard XTGRABKEYBOARD
-#define XtGrabPointer XTGRABPOINTER
-#define XtHasCallbacks XTHASCALLBACKS
-#define XtInitialize XTINITIALIZE
-#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
-#define XtInsertEventHandler XTINSERTEVENTHANDLER
-#define XtInsertRawEventHandler XTINSERTRAWEVENTHANDLER
-#define XtInstallAccelerators XTINSTALLACCELERATORS
-#define XtIsManaged XTISMANAGED
-#define XtIsObject XTISOBJECT
-#ifndef NOXTDISPLAY
-#define XtIsRealized XTISREALIZED
-#endif
-#define XtIsSensitive XTISSENSITIVE
-#define XtIsSubclass XTISSUBCLASS
-#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
-#define XtMainLoop XTMAINLOOP
-#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST
-#define XtMakeResizeRequest XTMAKERESIZEREQUEST
-#define XtMalloc XTMALLOC
-#define XtManageChild XTMANAGECHILD
-#define XtManageChildren XTMANAGECHILDREN
-#define XtMergeArgLists XTMERGEARGLISTS
-#define XtMoveWidget XTMOVEWIDGET
-#define XtName XTNAME
-#define XtNameToWidget XTNAMETOWIDGET
-#define XtOpenApplication XTOPENAPPLICATION
-#define XtOpenDisplay XTOPENDISPLAY
-#define XtOverrideTranslations XTOVERRIDETRANSLATIONS
-#define XtOwnSelection XTOWNSELECTION
-#ifndef NOXTDISPLAY
-#define XtParent XTPARENT
-#endif
-#define XtParseAcceleratorTable XTPARSEACCELERATORTABLE
-#define XtParseTranslationTable XTPARSETRANSLATIONTABLE
-#define XtPopdown XTPOPDOWN
-#define XtPopup XTPOPUP
-#define XtPopupSpringLoaded XTPOPUPSPRINGLOADED
-#define XtQueryGeometry XTQUERYGEOMETRY
-#define XtRealizeWidget XTREALIZEWIDGET
-#define XtRealloc XTREALLOC
-#define XtRegisterDrawable _XTREGISTERWINDOW
-#define XtRegisterGrabAction XTREGISTERGRABACTION
-#define XtReleaseGC XTRELEASEGC
-#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
-#define XtRemoveCallback XTREMOVECALLBACK
-#define XtRemoveEventHandler XTREMOVEEVENTHANDLER
-#define XtRemoveGrab XTREMOVEGRAB
-#define XtRemoveInput XTREMOVEINPUT
-#define XtRemoveTimeOut XTREMOVETIMEOUT
-#define XtRemoveWorkProc XTREMOVEWORKPROC
-#define XtResizeWidget XTRESIZEWIDGET
-#define XtResolvePathname XTRESOLVEPATHNAME
-#ifndef NOXTDISPLAY
-#define XtScreen XTSCREEN
-#endif
-#define XtScreenDatabase XTSCREENDATABASE
-#define XtScreenOfObject XTSCREENOFOBJECT
-#define XtSessionReturnToken XTSESSIONRETURNTOKEN
-#define XtSetErrorHandler XTSETERRORHANDLER
-#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
-#define XtSetLanguageProc XTSETLANGUAGEPROC
-#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
-#define XtSetSensitive XTSETSENSITIVE
-#define XtSetTypeConverter XTSETTYPECONVERTER
-#define XtSetValues XTSETVALUES
-#define XtShellStrings XTSHELLSTRINGS
-#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING
-#define XtStrings XTSTRINGS
-#define XtToolkitInitialize XTTOOLKITINITIALIZE
-#define XtTranslateCoords XTTRANSLATECOORDS
-#define XtTranslateKeycode XTTRANSLATEKEYCODE
-#define XtUngrabButton XTUNGRABBUTTON
-#define XtUngrabKeyboard XTUNGRABKEYBOARD
-#define XtUngrabPointer XTUNGRABPOINTER
-#define XtUnmanageChild XTUNMANAGECHILD
-#define XtUnmanageChildren XTUNMANAGECHILDREN
-#define XtUnrealizeWidget XTUNREALIZEWIDGET
-#define XtUnregisterDrawable _XTUNREGISTERWINDOW
-#define XtVaAppCreateShell XTVAAPPCREATESHELL
-#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
-#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
-#define XtVaCreateWidget XTVACREATEWIDGET
-#define XtVaGetApplicationResources XTVAGETAPPLICATIONRESOURCES
-#define XtVaGetValues XTVAGETVALUES
-#define XtVaSetValues XTVASETVALUES
-#define XtWarning XTWARNING
-#define XtWarningMsg XTWARNINGMSG
-#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
-#ifndef NOXTDISPLAY
-#define XtWindow XTWINDOW
-#endif
-#define XtWindowOfObject XTWINDOWOFOBJECT
-#define XtWindowToWidget XTWINDOWTOWIDGET
-#define XwcDrawImageString XWCDRAWIMAGESTRING
-#define XwcDrawString XWCDRAWSTRING
-#define XwcFreeStringList XWCFREESTRINGLIST
-#define XwcTextEscapement XWCTEXTESCAPEMENT
-#define XwcTextExtents XWCTEXTEXTENTS
-#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
-#define XwcLookupString XWCLOOKUPSTRING
-#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
-#define _XAllocTemp _XALLOCTEMP
-#define _XDeqAsyncHandler _XDEQASYNCHANDLER
-#define _XEatData _XEATDATA
-#define _XFlush _XFLUSH
-#define _XFreeTemp _XFREETEMP
-#define _XGetAsyncReply _XGETASYNCREPLY
-#define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
-#define _XRead _XREAD
-#define _XReadPad _XREADPAD
-#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE
-#define _XReply _XREPLY
-#define _XSend _XSEND
-#define _XUnregisterFilter _XUNREGISTERFILTER
-#define _XVIDtoVisual _XVIDTOVISUAL
-#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT
-#define _XmClearBorder _XMCLEARBORDER
-#define _XmConfigureObject _XMCONFIGUREOBJECT
-#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK
-#define _XmDrawArrow _XMDRAWARROW
-#define _XmDrawShadows _XMDRAWSHADOWS
-#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT
-#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS
-#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS
-#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR
-#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST
-#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON
-#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA
-#define _XmGrabKeyboard _XMGRABKEYBOARD
-#define _XmGrabPointer _XMGRABPOINTER
-#define _XmInheritClass _XMINHERITCLASS
-#define _XmInputForGadget _XMINPUTFORGADGET
-#define _XmInputInGadget _XMINPUTINGADGET
-#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
-#define _XmMenuPopDown _XMMENUPOPDOWN
-#define _XmMoveObject _XMMOVEOBJECT
-#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED
-#define _XmOSBuildFileList _XMOSBUILDFILELIST
-#define _XmOSFileCompare _XMOSFILECOMPARE
-#define _XmOSFindPatternPart _XMOSFINDPATTERNPART
-#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC
-#define _XmPostPopupMenu _XMPOSTPOPUPMENU
-#define _XmPrimitiveEnter _XMPRIMITIVEENTER
-#define _XmPrimitiveLeave _XMPRIMITIVELEAVE
-#define _XmRedisplayGadgets _XMREDISPLAYGADGETS
-#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE
-#define _XmStringDraw _XMSTRINGDRAW
-#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT
-#define _XmStrings _XMSTRINGS
-#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS
-#define _XmToVerticalPixels _XMTOVERTICALPIXELS
-#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
-#define _Xm_fastPtr _XM_FASTPTR
-#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG
-#define _XtCopyFromArg _XTCOPYFROMARG
-#define _XtCountVaList _XTCOUNTVALIST
-#define _XtInherit _XTINHERIT
-#define _XtInheritTranslations _XTINHERITTRANSLATIONS
-#define _XtIsSubclassOf _XTISSUBCLASSOF
-#define _XtVaToArgList _XTVATOARGLIST
-#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
-#define cli$dcl_parse CLI$DCL_PARSE
-#define cli$get_value CLI$GET_VALUE
-#define cli$present  CLI$PRESENT
-#define compositeClassRec COMPOSITECLASSREC
-#define compositeWidgetClass COMPOSITEWIDGETCLASS
-#define constraintClassRec CONSTRAINTCLASSREC
-#define constraintWidgetClass CONSTRAINTWIDGETCLASS
-#define coreWidgetClass COREWIDGETCLASS
-#define exe$getspi EXE$GETSPI
-#define lbr$close LBR$CLOSE
-#define lbr$get_header LBR$GET_HEADER
-#define lbr$get_index LBR$GET_INDEX
-#define lbr$get_record LBR$GET_RECORD
-#define lbr$ini_control LBR$INI_CONTROL
-#define lbr$lookup_key LBR$LOOKUP_KEY
-#define lbr$open LBR$OPEN
-#define lbr$output_help LBR$OUTPUT_HELP
-#define lib$add_times LIB$ADD_TIMES
-#define lib$addx LIB$ADDX
-#define lib$create_dir LIB$CREATE_DIR
-#define lib$create_vm_zone LIB$CREATE_VM_ZONE
-#define lib$cvt_from_internal_time LIB$CVT_FROM_INTERNAL_TIME
-#define lib$cvt_htb LIB$CVT_HTB
-#define lib$cvt_vectim LIB$CVT_VECTIM
-#define lib$day LIB$DAY
-#define lib$day_of_week LIB$DAY_OF_WEEK
-#define lib$delete_symbol LIB$DELETE_SYMBOL
-#define lib$delete_vm_zone LIB$DELETE_VM_ZONE
-#define lib$disable_ctrl LIB$DISABLE_CTRL
-#define lib$ediv LIB$EDIV
-#define lib$emul LIB$EMUL
-#define lib$enable_ctrl LIB$ENABLE_CTRL
-#define lib$find_vm_zone LIB$FIND_VM_ZONE
-#define lib$format_date_time LIB$FORMAT_DATE_TIME
-#define lib$free_timer LIB$FREE_TIMER
-#define lib$free_vm LIB$FREE_VM
-#define lib$get_ef LIB$GET_EF
-#define lib$get_foreign LIB$GET_FOREIGN
-#define lib$get_input LIB$GET_INPUT
-#define lib$get_users_language LIB$GET_USERS_LANGUAGE
-#define lib$get_vm LIB$GET_VM
-#define lib$get_symbol LIB$GET_SYMBOL
-#define lib$getdvi LIB$GETDVI
-#define lib$init_date_time_context LIB$INIT_DATE_TIME_CONTEXT
-#define lib$init_timer LIB$INIT_TIMER
-#define lib$find_file LIB$FIND_FILE
-#define lib$find_file_end LIB$FIND_FILE_END
-#define lib$find_image_symbol LIB$FIND_IMAGE_SYMBOL
-#define lib$mult_delta_time LIB$MULT_DELTA_TIME
-#define lib$put_output LIB$PUT_OUTPUT
-#define lib$rename_file LIB$RENAME_FILE
-#define lib$reset_vm_zone LIB$RESET_VM_ZONE
-#define lib$set_symbol LIB$SET_SYMBOL
-#define lib$sfree1_dd LIB$SFREE1_DD
-#define lib$show_vm LIB$SHOW_VM
-#define lib$show_vm_zone LIB$SHOW_VM_ZONE
-#define lib$spawn LIB$SPAWN
-#define lib$stat_timer LIB$STAT_TIMER
-#define lib$subx LIB$SUBX
-#define lib$sub_times LIB$SUB_TIMES
-#define lib$wait LIB$WAIT
-#define mail$send_add_address MAIL$SEND_ADD_ADDRESS
-#define mail$send_add_attribute MAIL$SEND_ADD_ATTRIBUTE
-#define mail$send_add_bodypart MAIL$SEND_ADD_BODYPART
-#define mail$send_begin MAIL$SEND_BEGIN
-#define mail$send_end MAIL$SEND_END
-#define mail$send_message MAIL$SEND_MESSAGE
-#define ncs$convert NCS$CONVERT
-#define ncs$get_cf NCS$GET_CF
-#define objectClass OBJECTCLASS
-#define objectClassRec OBJECTCLASSREC
-#define overrideShellClassRec OVERRIDESHELLCLASSREC
-#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
-#define pthread_attr_create PTHREAD_ATTR_CREATE
-#define pthread_attr_delete PTHREAD_ATTR_DELETE
-#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
-#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
-#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
-#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
-#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
-#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
-#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
-#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY
-#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
-#define pthread_attr_init PTHREAD_ATTR_INIT
-#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
-#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
-#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
-#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
-#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
-#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
-#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
-#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
-#ifndef pthread_attr_setscope
-# define pthread_attr_setscope PTHREAD_ATTR_SETSCOPE
-#endif
-#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
-#define pthread_cancel PTHREAD_CANCEL
-#define pthread_cancel_e PTHREAD_CANCEL_E
-#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
-#define pthread_cond_destroy PTHREAD_COND_DESTROY
-#define pthread_cond_init PTHREAD_COND_INIT
-#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
-#define pthread_cond_signal PTHREAD_COND_SIGNAL
-#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
-#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
-#define pthread_cond_wait PTHREAD_COND_WAIT
-#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
-#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
-#define pthread_condattr_init PTHREAD_CONDATTR_INIT
-#define pthread_create PTHREAD_CREATE
-#define pthread_delay_np PTHREAD_DELAY_NP
-#define pthread_detach PTHREAD_DETACH
-#define pthread_equal PTHREAD_EQUAL
-#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
-#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
-#define pthread_exc_matches_np PTHREAD_EXC_MATCHES_NP
-#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
-#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
-#define pthread_exc_raise_np PTHREAD_EXC_RAISE_NP
-#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
-#define pthread_exit PTHREAD_EXIT
-#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
-#define pthread_getprio PTHREAD_GETPRIO
-#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
-#define pthread_getscheduler PTHREAD_GETSCHEDULER
-#define pthread_getspecific PTHREAD_GETSPECIFIC
-#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
-#define pthread_join PTHREAD_JOIN
-#define pthread_join32 PTHREAD_JOIN32
-#define pthread_key_create PTHREAD_KEY_CREATE
-#define pthread_key_delete PTHREAD_KEY_DELETE
-#define pthread_keycreate PTHREAD_KEYCREATE
-#define pthread_kill PTHREAD_KILL
-#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
-#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
-#define pthread_mutex_init PTHREAD_MUTEX_INIT
-#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
-#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
-#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
-#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
-#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
-#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
-#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
-#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
-#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
-#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
-#define pthread_once PTHREAD_ONCE
-#define pthread_resume_np PTHREAD_RESUME_NP
-#define pthread_self PTHREAD_SELF
-#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
-#define pthread_setcancel PTHREAD_SETCANCEL
-#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
-#define pthread_setcanceltype PTHREAD_SETCANCELTYPE
-#define pthread_setprio PTHREAD_SETPRIO
-#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
-#define pthread_setscheduler PTHREAD_SETSCHEDULER
-#define pthread_setspecific PTHREAD_SETSPECIFIC
-#define pthread_suspend_np PTHREAD_SUSPEND_NP
-#define pthread_testcancel PTHREAD_TESTCANCEL
-#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
-#define pthread_yield PTHREAD_YIELD
-#define pthread_yield_np PTHREAD_YIELD_NP
-#define rectObjClass RECTOBJCLASS
-#define rectObjClassRec RECTOBJCLASSREC
-#define sessionShellWidgetClass SESSIONSHELLWIDGETCLASS
-#define shellWidgetClass SHELLWIDGETCLASS
-#define shmat SHMAT
-#define shmctl SHMCTL
-#define shmdt SHMDT
-#define shmget SHMGET
-#define smg$create_key_table SMG$CREATE_KEY_TABLE
-#define smg$create_virtual_keyboard SMG$CREATE_VIRTUAL_KEYBOARD
-#define smg$read_composed_line SMG$READ_COMPOSED_LINE
-#define sys$add_ident SYS$ADD_IDENT
-#define sys$asctoid SYS$ASCTOID
-#define sys$assign SYS$ASSIGN
-#define sys$bintim SYS$BINTIM
-#define sys$cancel SYS$CANCEL
-#define sys$cantim SYS$CANTIM
-#define sys$check_access SYS$CHECK_ACCESS
-#define sys$close SYS$CLOSE
-#define sys$connect SYS$CONNECT
-#define sys$create SYS$CREATE
-#define sys$create_user_profile SYS$CREATE_USER_PROFILE
-#define sys$crembx SYS$CREMBX
-#define sys$creprc SYS$CREPRC
-#define sys$crmpsc SYS$CRMPSC
-#define sys$dassgn SYS$DASSGN
-#define sys$dclast SYS$DCLAST
-#define sys$dclexh SYS$DCLEXH
-#define sys$delprc SYS$DELPRC
-#define sys$deq SYS$DEQ
-#define sys$dgblsc SYS$DGBLSC
-#define sys$display SYS$DISPLAY
-#define sys$enq SYS$ENQ
-#define sys$enqw SYS$ENQW
-#define sys$erase SYS$ERASE
-#define sys$fao SYS$FAO
-#define sys$faol SYS$FAOL
-#define sys$find_held SYS$FIND_HELD
-#define sys$finish_rdb SYS$FINISH_RDB
-#define sys$flush SYS$FLUSH
-#define sys$forcex SYS$FORCEX
-#define sys$get SYS$GET
-#define sys$get_security SYS$GET_SECURITY
-#define sys$getdviw SYS$GETDVIW
-#define sys$getjpi SYS$GETJPI
-#define sys$getjpiw SYS$GETJPIW
-#define sys$getlkiw SYS$GETLKIW
-#define sys$getmsg SYS$GETMSG
-#define sys$getsyi SYS$GETSYI
-#define sys$getsyiw SYS$GETSYIW
-#define sys$gettim SYS$GETTIM
-#define sys$getuai SYS$GETUAI
-#define sys$grantid SYS$GRANTID
-#define sys$hash_password SYS$HASH_PASSWORD
-#define sys$hiber SYS$HIBER
-#define sys$mgblsc SYS$MGBLSC
-#define sys$numtim SYS$NUMTIM
-#define sys$open SYS$OPEN
-#define sys$parse SYS$PARSE
-#define sys$parse_acl SYS$PARSE_ACL
-#define sys$parse_acl SYS$PARSE_ACL
-#define sys$persona_assume SYS$PERSONA_ASSUME
-#define sys$persona_create SYS$PERSONA_CREATE
-#define sys$persona_delete SYS$PERSONA_DELETE
-#define sys$process_scan SYS$PROCESS_SCAN
-#define sys$put SYS$PUT
-#define sys$qio SYS$QIO
-#define sys$qiow SYS$QIOW
-#define sys$read SYS$READ
-#define sys$resched SYS$RESCHED
-#define sys$rewind SYS$REWIND
-#define sys$search SYS$SEARCH
-#define sys$set_security SYS$SET_SECURITY
-#define sys$setast SYS$SETAST
-#define sys$setef SYS$SETEF
-#define sys$setimr SYS$SETIMR
-#define sys$setpri SYS$SETPRI
-#define sys$setprn SYS$SETPRN
-#define sys$setprv SYS$SETPRV
-#define sys$setswm SYS$SETSWM
-#define sys$setuai SYS$SETUAI
-#define sys$sndopr SYS$SNDOPR
-#define sys$synch SYS$SYNCH
-#define sys$trnlnm SYS$TRNLNM
-#define sys$update SYS$UPDATE
-#define sys$wake SYS$WAKE
-#define sys$write SYS$WRITE
-#define topLevelShellClassRec TOPLEVELSHELLCLASSREC
-#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
-#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
-#define vendorShellClassRec VENDORSHELLCLASSREC
-#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS
-#define widgetClass WIDGETCLASS
-#define widgetClassRec WIDGETCLASSREC
-#define wmShellClassRec WMSHELLCLASSREC
-#define wmShellWidgetClass WMSHELLWIDGETCLASS
-#define x$soft_ast_lib_lock X$SOFT_AST_LIB_LOCK
-#define x$soft_ast_lock_depth X$SOFT_AST_LOCK_DEPTH
-#define x$soft_reenable_asts X$SOFT_REENABLE_ASTS
-#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS
-#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS
-#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
-#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
-#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS
-#define xmCommandWidgetClass XMCOMMANDWIDGETCLASS
-#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
-#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
-#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS
-#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS
-#define xmFormWidgetClass XMFORMWIDGETCLASS
-#define xmFrameWidgetClass XMFRAMEWIDGETCLASS
-#define xmGadgetClass XMGADGETCLASS
-#define xmLabelGadgetClass XMLABELGADGETCLASS
-#define xmLabelWidgetClass XMLABELWIDGETCLASS
-#define xmListWidgetClass XMLISTWIDGETCLASS
-#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS
-#define xmManagerClassRec XMMANAGERCLASSREC
-#define xmManagerWidgetClass XMMANAGERWIDGETCLASS
-#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS
-#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS
-#define xmPrimitiveClassRec XMPRIMITIVECLASSREC
-#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS
-#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC
-#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS
-#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS
-#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS
-#define xmSashWidgetClass XMSASHWIDGETCLASS
-#define xmScaleWidgetClass XMSCALEWIDGETCLASS
-#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS
-#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC
-#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS
-#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS
-#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS
-#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS
-#define xmTextWidgetClass XMTEXTWIDGETCLASS
-#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
-#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
-
-#if (__VMS_VER < 80200000)
-# define SetReqLen(req,n,badlen) \
-    if ((req->length + n) > (unsigned)65535) { \
-        n = badlen; \
-        req->length += n; \
-    } else \
-    req->length += n
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void XtFree(char*);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Mesa/prj/build.lst b/Mesa/prj/build.lst
deleted file mode 100644
index 8910be4..0000000
--- a/Mesa/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-me  Mesa : solenv NULL
-me  Mesa                         usr1    -   u    me_mkout NULL
-me	Mesa\prj                     get     -   all  me_prj NULL
diff --git a/Mesa/prj/d.lst b/Mesa/prj/d.lst
deleted file mode 100644
index 9690bd4..0000000
--- a/Mesa/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\GL
-
-..\inc\*.h %_DEST%\inc\GL\*.h
diff --git a/README b/README
new file mode 100644
index 0000000..2f046a7
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+
+This git repository is part of the "bootstrap" family of Libreoffice repos.
+It is obsolete and its only useful content are the LibreOffice 3.3
+and 3.4 release branches.
+
+If you are interested in the latest and greatest development branch "master",
+or in release branches of LibreOffice versions newer than 3.4, please
+check out the "core" git repository, as described on the Wiki:
+
+  http://wiki.documentfoundation.org/Development/Native_Build
+
+If you want to build the 3.3 or 3.4 release, you need to switch to the
+corresponding release branch:
+
+  ./g checkout libreoffice-3-4
+
+If for some reason you want to look at obsolete in-development code,
+check out the "master-backup" branch in this repository; this is most likely
+to be a complete waste of time though.
+
diff --git a/afms/delzip b/afms/delzip
deleted file mode 100644
index e69de29..0000000
--- a/afms/delzip
+++ /dev/null
diff --git a/afms/makefile.mk b/afms/makefile.mk
deleted file mode 100644
index 5952ada..0000000
--- a/afms/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=afms
-TARGET=afms
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.IF "$(L10N_framework)"==""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=Adobe-Core35_AFMs-314
-TARFILE_MD5=1756c4fa6c616ae15973c104cd8cb256
-TARFILE_ROOTDIR=Adobe-Core35_AFMs-314
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-
-ZIP1DIR         = $(MISC)$/build$/$(TARFILE_NAME)
-ZIP1TARGET      = fontunxafm
-ZIP1LIST        = *.afm -x "*Helvetica-Narrow*"
-
-.ENDIF # L10N_framework
-.INCLUDE : target.mk
-
-.INCLUDE : tg_ext.mk
-.IF "$(L10N_framework)"==""
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN):	$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
-
-.ENDIF          # "$(ZIP1TARGETN)"!=""
-
-.ENDIF # L10N_framework
diff --git a/afms/prj/build.lst b/afms/prj/build.lst
deleted file mode 100644
index ed3d01f..0000000
--- a/afms/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-af	afms : solenv NULL
-af	afms		usr1	-	all	af_mkout NULL
-af	afms		nmake	-	all	af_fonts NULL
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
deleted file mode 100644
index 1652d1f..0000000
--- a/afms/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\pck
-..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
-
diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
deleted file mode 100644
index a65cc64..0000000
--- a/apple_remote/AppleRemote.m
+++ /dev/null
@@ -1,125 +0,0 @@
-/*****************************************************************************
- * RemoteControlWrapper.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "AppleRemote.h"
-
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <IOKit/IOKitLib.h>
-#import <IOKit/IOCFPlugIn.h>
-#import <IOKit/hid/IOHIDKeys.h>
-
-const char* AppleRemoteDeviceName = "AppleIRController";
-
-// the WWDC 07 Leopard Build is missing the constant
-#ifndef NSAppKitVersionNumber10_4
-	#define NSAppKitVersionNumber10_4 824
-#endif
-#ifndef NSAppKitVersionNumber10_5
-	#define NSAppKitVersionNumber10_5 949
-#endif
-
-@implementation AppleRemote
-
-+ (const char*) remoteControlDeviceName {
-	return AppleRemoteDeviceName;
-}
-
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
-    
-    // TODO : avoid such magics 
-	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
-	    #ifdef DEBUG
-	    NSLog( @"setting 10.4 cookies" );
-	    #endif
-		// 10.4.x Tiger
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"14_12_11_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"14_13_11_6_"];		
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"14_7_6_14_7_6_"];			
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"14_8_6_14_8_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"14_9_6_14_9_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"14_10_6_14_10_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"18_14_6_18_14_6_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
-	    #ifdef DEBUG
-	    NSLog( @"setting 10.5 cookies" );
-	    #endif
-		// 10.5.x Leopard
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"31_30_28_19_18_"];	
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"31_20_19_18_31_20_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"31_21_19_18_31_21_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"31_22_19_18_31_22_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"31_23_19_18_31_23_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"31_19_18_4_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"31_19_18_3_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"31_19_18_31_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"35_31_19_18_35_31_19_18_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	}
-	else
-	{
-	    #ifdef DEBUG
-	    NSLog( @"setting 10.6 cookies" );
-	    #endif
-	    // 10.6.x Snow Leopard
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"33_32_30_21_20_2_"];	
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"33_22_21_20_2_33_22_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"33_23_21_20_2_33_23_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"33_24_21_20_2_33_24_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"33_25_21_20_2_33_25_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"33_21_20_14_12_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"33_21_20_13_12_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"33_21_20_2_33_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"37_33_21_20_2_37_33_21_20_2_"];
-		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];
-	}
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
-	if (pressedDown == NO && event == kRemoteButtonMenu_Hold) {
-		// There is no seperate event for pressed down on menu hold. We are simulating that event here
-		[super sendRemoteButtonEvent:event pressedDown:YES];
-	}	
-	
-	[super sendRemoteButtonEvent:event pressedDown:pressedDown];
-	
-	if (pressedDown && (event == kRemoteButtonRight || event == kRemoteButtonLeft || event == kRemoteButtonPlay || event == kRemoteButtonMenu || event == kRemoteButtonPlay_Hold)) {
-		// There is no seperate event when the button is being released. We are simulating that event here
-		[super sendRemoteButtonEvent:event pressedDown:NO];
-	}
-}
-
-@end
diff --git a/apple_remote/GlobalKeyboardDevice.m b/apple_remote/GlobalKeyboardDevice.m
deleted file mode 100644
index 14bf558..0000000
--- a/apple_remote/GlobalKeyboardDevice.m
+++ /dev/null
@@ -1,249 +0,0 @@
-/*****************************************************************************
- * GlobalKeyboardDevice.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "GlobalKeyboardDevice.h"
-
-#define F1 122
-#define F2 120
-#define F3 99
-#define F4 118
-#define F5 96
-#define F6 97
-#define F7 98
-
-/*
- the following default keys are read and shall be used to change the keyboard mapping
- 
- mac.remotecontrols.GlobalKeyboardDevice.plus_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.plus_keycode
- mac.remotecontrols.GlobalKeyboardDevice.minus_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.minus_keycode
- mac.remotecontrols.GlobalKeyboardDevice.play_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.play_keycode
- mac.remotecontrols.GlobalKeyboardDevice.left_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.left_keycode
- mac.remotecontrols.GlobalKeyboardDevice.right_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.right_keycode
- mac.remotecontrols.GlobalKeyboardDevice.menu_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.menu_keycode
- mac.remotecontrols.GlobalKeyboardDevice.playhold_modifiers
- mac.remotecontrols.GlobalKeyboardDevice.playhold_keycode
- */
-
-static OSStatus hotKeyEventHandler(EventHandlerCallRef, EventRef, void*);
-
-@implementation GlobalKeyboardDevice
-
-- (id) initWithDelegate: (id) _remoteControlDelegate {	
-	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
-		hotKeyRemoteEventMapping = [[NSMutableDictionary alloc] init];
-		
-		unsigned int modifiers = cmdKey + shiftKey /*+ optionKey*/ + controlKey;
-				
-		[self mapRemoteButton:kRemoteButtonPlus			defaultKeycode:F1 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonMinus		defaultKeycode:F2 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonPlay			defaultKeycode:F3 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonLeft			defaultKeycode:F4 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonRight		defaultKeycode:F5 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonMenu			defaultKeycode:F6 defaultModifiers:modifiers];
-		[self mapRemoteButton:kRemoteButtonPlay_Hold	defaultKeycode:F7 defaultModifiers:modifiers];		
-	}
-	return self;
-}
-
-- (void) dealloc {
-	[hotKeyRemoteEventMapping release];
-	[super dealloc];
-}
-
-- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers {
-	NSString* defaultsKey = NULL;	
-	
-	switch(remoteButtonIdentifier) {
-		case kRemoteButtonPlus:
-			defaultsKey = @"plus";
-			break;
-		case kRemoteButtonMinus:
-			defaultsKey = @"minus";
-			break;			
-		case kRemoteButtonMenu:
-			defaultsKey = @"menu";
-			break;			
-		case kRemoteButtonPlay:
-			defaultsKey = @"play";
-			break;
-		case kRemoteButtonRight:
-			defaultsKey = @"right";
-			break;			
-		case kRemoteButtonLeft:			
-			defaultsKey = @"left";
-			break;
-		case kRemoteButtonPlay_Hold:
-			defaultsKey = @"playhold";
-			break;			
-		default: 
-#ifdef DEBUG
-			NSLog(@"Unknown global keyboard defaults key for remote button identifier %d", remoteButtonIdentifier);
-#endif
-            break;
-	}
-	
-	NSNumber* modifiersCfg = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_modifiers", defaultsKey]];
-	NSNumber* keycodeCfg   = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_keycode", defaultsKey]];
-	
-	unsigned int modifiers = defaultModifiers;
-	if (modifiersCfg) modifiers = [modifiersCfg unsignedIntValue];
-	
-	unsigned int keycode = defaultKeycode;
-	if (keycodeCfg) keycode = [keycodeCfg unsignedIntValue];
-				  
-    [self registerHotKeyCode: keycode  modifiers: modifiers remoteEventIdentifier: remoteButtonIdentifier];
-}	
-
-- (void) setListeningToRemote: (BOOL) value {
-	if (value == [self isListeningToRemote]) return;
-	if (value) {
-		[self startListening: self];
-	} else {
-		[self stopListening: self];
-	}
-}
-- (BOOL) isListeningToRemote {	
-	return (eventHandlerRef!=NULL);
-}
-
-- (void) startListening: (id) sender {
-	
-	if (eventHandlerRef) return;
-		
-	EventTypeSpec eventSpec[2] = {
-		{ kEventClassKeyboard, kEventHotKeyPressed },
-		{ kEventClassKeyboard, kEventHotKeyReleased }
-	};    
-	
-	InstallEventHandler( GetEventDispatcherTarget(),
-						 (EventHandlerProcPtr)hotKeyEventHandler, 
-						 2, eventSpec, self, &eventHandlerRef);	
-}
-- (void) stopListening: (id) sender {
-	RemoveEventHandler(eventHandlerRef);
-	eventHandlerRef = NULL;
-}
-
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
-	NSEnumerator* values = [hotKeyRemoteEventMapping objectEnumerator];
-	NSNumber* remoteIdentifier;
-	while( (remoteIdentifier = [values nextObject]) ) {
-		if ([remoteIdentifier unsignedIntValue] == identifier) return YES;
-	}
-	return NO;
-}
-
-+ (const char*) remoteControlDeviceName {
-	return "Keyboard";
-}
-
-- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier {	
-	OSStatus err;
-	EventHotKeyID hotKeyID;
-	EventHotKeyRef carbonHotKey;
-
-	hotKeyID.signature = 'PTHk';
-	hotKeyID.id = (long)keycode;
-	
-	err = RegisterEventHotKey(keycode, modifiers, hotKeyID, GetEventDispatcherTarget(), 0, &carbonHotKey );
-	
-	if( err )
-		return NO;
-	
-	[hotKeyRemoteEventMapping setObject: [NSNumber numberWithInt:identifier] forKey: [NSNumber numberWithUnsignedInt: hotKeyID.id]];
-	
-	return YES;
-}
-/*
-- (void)unregisterHotKey: (PTHotKey*)hotKey
-{
-	OSStatus err;
-	EventHotKeyRef carbonHotKey;
-	NSValue* key;
-	
-	if( [[self allHotKeys] containsObject: hotKey] == NO )
-		return;
-	
-	carbonHotKey = [self _carbonHotKeyForHotKey: hotKey];
-	NSAssert( carbonHotKey != nil, @"" );
-	
-	err = UnregisterEventHotKey( carbonHotKey );
-	//Watch as we ignore 'err':
-	
-	key = [NSValue valueWithPointer: carbonHotKey];
-	[mHotKeys removeObjectForKey: key];
-	
-	[self _updateEventHandler];
-	
-	//See that? Completely ignored
-}
-*/
-
-- (RemoteControlEventIdentifier) remoteControlEventIdentifierForID: (unsigned int) id {
-	NSNumber* remoteEventIdentifier = [hotKeyRemoteEventMapping objectForKey:[NSNumber numberWithUnsignedInt: id]];
-	return [remoteEventIdentifier unsignedIntValue];
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
-	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
-}
-
-static RemoteControlEventIdentifier lastEvent;
-
-
-static OSStatus hotKeyEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEvent, void* userData )
-{
-	GlobalKeyboardDevice* keyboardDevice = (GlobalKeyboardDevice*) userData;
-	EventHotKeyID hkCom;
-	GetEventParameter(inEvent,kEventParamDirectObject,typeEventHotKeyID,NULL,sizeof(hkCom),NULL,&hkCom);
-
-	RemoteControlEventIdentifier identifier = [keyboardDevice remoteControlEventIdentifierForID:hkCom.id];
-	if (identifier == 0) return noErr;
-	
-	BOOL pressedDown = YES;
-	if (identifier != lastEvent) {
-		lastEvent = identifier;
-	} else {
-		lastEvent = 0;
-	    pressedDown = NO;
-	}
-	[keyboardDevice sendRemoteButtonEvent: identifier pressedDown: pressedDown];
-	
-	return noErr;
-}
-
-@end
diff --git a/apple_remote/HIDRemoteControlDevice.m b/apple_remote/HIDRemoteControlDevice.m
deleted file mode 100644
index 9421590..0000000
--- a/apple_remote/HIDRemoteControlDevice.m
+++ /dev/null
@@ -1,518 +0,0 @@
-/*****************************************************************************
- * HIDRemoteControlDevice.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "HIDRemoteControlDevice.h"
-
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <IOKit/IOKitLib.h>
-#import <IOKit/IOCFPlugIn.h>
-#import <IOKit/hid/IOHIDKeys.h>
-#import <Carbon/Carbon.h>
-
-@interface HIDRemoteControlDevice (PrivateMethods) 
-- (NSDictionary*) cookieToButtonMapping; // Creates the dictionary using the magics, depending on the remote
-- (IOHIDQueueInterface**) queue;
-- (IOHIDDeviceInterface**) hidDeviceInterface;
-- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues; 
-- (void) removeNotifcationObserver;
-- (void) remoteControlAvailable:(NSNotification *)notification;
-
-@end
-
-@interface HIDRemoteControlDevice (IOKitMethods) 
-+ (io_object_t) findRemoteDevice;
-- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice;
-- (BOOL) initializeCookies;
-- (BOOL) openDevice;
-@end
-
-@implementation HIDRemoteControlDevice
-
-+ (const char*) remoteControlDeviceName {
-	return "";
-}
-
-+ (BOOL) isRemoteAvailable {	
-	io_object_t hidDevice = [self findRemoteDevice];
-	if (hidDevice != 0) {
-		IOObjectRelease(hidDevice);
-		return YES;
-	} else {
-		return NO;		
-	}
-}
-
-- (id) initWithDelegate: (id) _remoteControlDelegate {	
-	if ([[self class] isRemoteAvailable] == NO) return nil;
-	
-	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
-		openInExclusiveMode = YES;
-		queue = NULL;
-		hidDeviceInterface = NULL;
-		cookieToButtonMapping = [[NSMutableDictionary alloc] init];
-		
-		[self setCookieMappingInDictionary: cookieToButtonMapping];
-
-		NSEnumerator* enumerator = [cookieToButtonMapping objectEnumerator];
-		NSNumber* identifier;
-		supportedButtonEvents = 0;
-		while( (identifier = [enumerator nextObject]) ) {
-			supportedButtonEvents |= [identifier intValue];
-		}
-		
-		fixSecureEventInputBug = [[NSUserDefaults standardUserDefaults] boolForKey: @"remoteControlWrapperFixSecureEventInputBug"];
-	}
-	
-	return self;
-}
-
-- (void) dealloc {
-	[self removeNotifcationObserver];
-	[self stopListening:self];
-	[cookieToButtonMapping release];
-	[super dealloc];
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
-	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
-}
-
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping {
-}
-- (int) remoteIdSwitchCookie {
-	return 0;
-}
-
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
-	return (supportedButtonEvents & identifier) == identifier;
-}
-	
-- (BOOL) isListeningToRemote {
-	return (hidDeviceInterface != NULL && allCookies != NULL && queue != NULL);	
-}
-
-- (void) setListeningToRemote: (BOOL) value {
-	if (value == NO) {
-		[self stopListening:self];
-	} else {
-		[self startListening:self];
-	}
-}
-
-- (BOOL) isOpenInExclusiveMode {
-	return openInExclusiveMode;
-}
-- (void) setOpenInExclusiveMode: (BOOL) value {
-	openInExclusiveMode = value;
-}
-
-- (BOOL) processesBacklog {
-	return processesBacklog;
-}
-- (void) setProcessesBacklog: (BOOL) value {
-	processesBacklog = value;
-}
-
-- (void) startListening: (id) sender {	
-	if ([self isListeningToRemote]) return;
-	
-	// 4th July 2007
-	// 
-	// A security update in february of 2007 introduced an odd behavior.
-	// Whenever SecureEventInput is activated or deactivated the exclusive access
-	// to the remote control device is lost. This leads to very strange behavior where
-	// a press on the Menu button activates FrontRow while your app still gets the event.
-	// A great number of people have complained about this.	
-	// 
-	// Enabling the SecureEventInput and keeping it enabled does the trick.
-	//
-	// I'm pretty sure this is a kind of bug at Apple and I'm in contact with the responsible
-	// Apple Engineer. This solution is not a perfect one - I know. 	
-	// One of the side effects is that applications that listen for special global keyboard shortcuts (like Quicksilver)
-	// may get into problems as they no longer get the events.
-	// As there is no official Apple Remote API from Apple I also failed to open a technical incident on this.
-	// 
-	// Note that there is a corresponding DisableSecureEventInput in the stopListening method below.
-	// 
-	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) EnableSecureEventInput();	
-	
-	[self removeNotifcationObserver];
-	
-	io_object_t hidDevice = [[self class] findRemoteDevice];
-	if (hidDevice == 0) return;
-	
-	if ([self createInterfaceForDevice:hidDevice] == NULL) {
-		goto error;
-	}
-	
-	if ([self initializeCookies]==NO) {
-		goto error;
-	}
-
-	if ([self openDevice]==NO) {
-		goto error;
-	}
-	// be KVO friendly
-	[self willChangeValueForKey:@"listeningToRemote"];
-	[self didChangeValueForKey:@"listeningToRemote"];
-	goto cleanup;
-	
-error:
-	[self stopListening:self];
-	DisableSecureEventInput();
-	
-cleanup:	
-	IOObjectRelease(hidDevice);	
-}
-
-- (void) stopListening: (id) sender {
-	if ([self isListeningToRemote]==NO) return;
-	
-	BOOL sendNotification = NO;
-	
-	if (eventSource != NULL) {
-		CFRunLoopRemoveSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
-		CFRelease(eventSource);
-		eventSource = NULL;
-	}
-	if (queue != NULL) {
-		(*queue)->stop(queue);		
-		
-		//dispose of queue
-		(*queue)->dispose(queue);		
-		
-		//release the queue we allocated
-		(*queue)->Release(queue);	
-		
-		queue = NULL;
-		
-		sendNotification = YES;
-	}
-	
-	if (allCookies != nil) {
-		[allCookies autorelease];
-		allCookies = nil;
-	}
-	
-	if (hidDeviceInterface != NULL) {
-		//close the device
-		(*hidDeviceInterface)->close(hidDeviceInterface);
-		
-		//release the interface	
-		(*hidDeviceInterface)->Release(hidDeviceInterface);
-		
-		hidDeviceInterface = NULL;
-	}
-	
-	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) DisableSecureEventInput();
-	
-	if ([self isOpenInExclusiveMode] && sendNotification) {
-		[[self class] sendFinishedNotifcationForAppIdentifier: nil];		
-	}
-	// be KVO friendly
-	[self willChangeValueForKey:@"listeningToRemote"];
-	[self didChangeValueForKey:@"listeningToRemote"];	
-}
-
-@end
-
-@implementation HIDRemoteControlDevice (PrivateMethods) 
-
-- (IOHIDQueueInterface**) queue {
-	return queue;
-}
-
-- (IOHIDDeviceInterface**) hidDeviceInterface {
-	return hidDeviceInterface;
-}
-
-
-- (NSDictionary*) cookieToButtonMapping {
-	return cookieToButtonMapping;
-}
-
-- (NSString*) validCookieSubstring: (NSString*) cookieString {
-	if (cookieString == nil || [cookieString length] == 0) return nil;
-	NSEnumerator* keyEnum = [[self cookieToButtonMapping] keyEnumerator];
-	NSString* key;
-	while( (key = [keyEnum nextObject]) ) {
-		NSRange range = [cookieString rangeOfString:key];
-		if (range.location == 0) return key; 
-	}
-	return nil;
-}
-
-- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues {
-	/*
-	if (previousRemainingCookieString) {
-		cookieString = [previousRemainingCookieString stringByAppendingString: cookieString];
-		NSLog(@"New cookie string is %@", cookieString);
-		[previousRemainingCookieString release], previousRemainingCookieString=nil;							
-	}*/
-	if (cookieString == nil || [cookieString length] == 0) return;
-		
-	NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey: cookieString];
-	if (buttonId != nil) {
-		[self sendRemoteButtonEvent: [buttonId intValue] pressedDown: (sumOfValues>0)];
-	} else {
-		// let's see if a number of events are stored in the cookie string. this does
-		// happen when the main thread is too busy to handle all incoming events in time.
-		NSString* subCookieString;
-		NSString* lastSubCookieString=nil;
-		while( (subCookieString = [self validCookieSubstring: cookieString]) ) {
-			cookieString = [cookieString substringFromIndex: [subCookieString length]];
-			lastSubCookieString = subCookieString;
-			if (processesBacklog) [self handleEventWithCookieString: subCookieString sumOfValues:sumOfValues];
-		}
-		if (processesBacklog == NO && lastSubCookieString != nil) {
-			// process the last event of the backlog and assume that the button is not pressed down any longer.
-			// The events in the backlog do not seem to be in order and therefore (in rare cases) the last event might be 
-			// a button pressed down event while in reality the user has released it. 
-			// NSLog(@"processing last event of backlog");
-			[self handleEventWithCookieString: lastSubCookieString sumOfValues:0];
-		}
-		if ([cookieString length] > 0) {
-			NSLog(@"Unknown button for cookiestring %@", cookieString);
-		}		
-	}
-}
-
-- (void) removeNotifcationObserver {
-	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
-}
-
-- (void) remoteControlAvailable:(NSNotification *)notification {
-	[self removeNotifcationObserver];
-	[self startListening: self];
-}
-
-@end
-
-/*	Callback method for the device queue
-Will be called for any event of any type (cookie) to which we subscribe
-*/
-static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon, void* sender) {	
-	if (target < 0) {
-		NSLog(@"QueueCallbackFunction called with invalid target!");
-		return;
-	}
-	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-	
-	HIDRemoteControlDevice* remote = (HIDRemoteControlDevice*)target;	
-	IOHIDEventStruct event;	
-	AbsoluteTime 	 zeroTime = {0,0};
-	NSMutableString* cookieString = [NSMutableString string];
-	SInt32			 sumOfValues = 0;
-	while (result == kIOReturnSuccess)
-	{
-		result = (*[remote queue])->getNextEvent([remote queue], &event, zeroTime, 0);		
-		if ( result != kIOReturnSuccess )
-			continue;
-	
-		//printf("%d %d %d\n", event.elementCookie, event.value, event.longValue);		
-		
-		if (((int)event.elementCookie)!=5) {
-			sumOfValues+=event.value;
-			[cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]];
-		}
-	}
-	[remote handleEventWithCookieString: cookieString sumOfValues: sumOfValues];
-	
-	[pool release];
-}
-
-@implementation HIDRemoteControlDevice (IOKitMethods)
-
-- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice {
-	io_name_t				className;
-	IOCFPlugInInterface**   plugInInterface = NULL;
-	HRESULT					plugInResult = S_OK;
-	SInt32					score = 0;
-	IOReturn				ioReturnValue = kIOReturnSuccess;
-	
-	hidDeviceInterface = NULL;
-	
-	ioReturnValue = IOObjectGetClass(hidDevice, className);
-	
-	if (ioReturnValue != kIOReturnSuccess) {
-		NSLog(@"Error: Failed to get class name.");
-		return NULL;
-	}
-	
-	ioReturnValue = IOCreatePlugInInterfaceForService(hidDevice,
-													  kIOHIDDeviceUserClientTypeID,
-													  kIOCFPlugInInterfaceID,
-													  &plugInInterface,
-													  &score);
-	if (ioReturnValue == kIOReturnSuccess)
-	{
-		//Call a method of the intermediate plug-in to create the device interface
-		plugInResult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDeviceInterface);
-		
-		if (plugInResult != S_OK) {
-			NSLog(@"Error: Couldn't create HID class device interface");
-		}
-		// Release
-		if (plugInInterface) (*plugInInterface)->Release(plugInInterface);
-	}
-	return hidDeviceInterface;
-}
-
-- (BOOL) initializeCookies {
-	IOHIDDeviceInterface122** handle = (IOHIDDeviceInterface122**)hidDeviceInterface;
-	IOHIDElementCookie		cookie;
-	long					usage;
-	long					usagePage;
-	id						object;
-	NSArray*				elements = nil;
-	NSDictionary*			element;
-	IOReturn success;
-	
-	if (!handle || !(*handle)) return NO;
-	
-	// Copy all elements, since we're grabbing most of the elements
-	// for this device anyway, and thus, it's faster to iterate them
-	// ourselves. When grabbing only one or two elements, a matching
-	// dictionary should be passed in here instead of NULL.
-	success = (*handle)->copyMatchingElements(handle, NULL, (CFArrayRef*)&elements);
-	
-	if (success == kIOReturnSuccess) {
-		
-		[elements autorelease];		
-		/*
-		cookies = calloc(NUMBER_OF_APPLE_REMOTE_ACTIONS, sizeof(IOHIDElementCookie)); 
-		memset(cookies, 0, sizeof(IOHIDElementCookie) * NUMBER_OF_APPLE_REMOTE_ACTIONS);
-		*/
-		allCookies = [[NSMutableArray alloc] init];
-		
-		NSEnumerator *elementsEnumerator = [elements objectEnumerator];
-		
-		while ( (element = [elementsEnumerator nextObject]) ) {						
-			//Get cookie
-			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementCookieKey) ];
-			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;
-			if (object == 0 || CFGetTypeID(object) != CFNumberGetTypeID()) continue;
-			cookie = (IOHIDElementCookie) [object longValue];
-			
-			//Get usage
-			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsageKey) ];
-			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
-			usage = [object longValue];
-			
-			//Get usage page
-			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsagePageKey) ];
-			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
-			usagePage = [object longValue];
-
-			[allCookies addObject: [NSNumber numberWithInt:(int)cookie]];
-		}
-	} else {
-		return NO;
-	}
-	
-	return YES;
-}
-
-- (BOOL) openDevice {
-	HRESULT  result;
-	
-	IOHIDOptionsType openMode = kIOHIDOptionsTypeNone;
-	if ([self isOpenInExclusiveMode]) openMode = kIOHIDOptionsTypeSeizeDevice;	
-	IOReturn ioReturnValue = (*hidDeviceInterface)->open(hidDeviceInterface, openMode);	
-	
-	if (ioReturnValue == KERN_SUCCESS) {		
-		queue = (*hidDeviceInterface)->allocQueue(hidDeviceInterface);
-		if (queue) {
-			result = (*queue)->create(queue, 0, 12);	//depth: maximum number of elements in queue before oldest elements in queue begin to be lost.
-
-			IOHIDElementCookie cookie;
-			NSEnumerator *allCookiesEnumerator = [allCookies objectEnumerator];
-			
-			while ( (cookie = (IOHIDElementCookie)[[allCookiesEnumerator nextObject] intValue]) ) {
-				(*queue)->addElement(queue, cookie, 0);
-			}
-									  
-			// add callback for async events			
-			ioReturnValue = (*queue)->createAsyncEventSource(queue, &eventSource);			
-			if (ioReturnValue == KERN_SUCCESS) {
-				ioReturnValue = (*queue)->setEventCallout(queue,QueueCallbackFunction, self, NULL);
-				if (ioReturnValue == KERN_SUCCESS) {
-					CFRunLoopAddSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
-					
-					//start data delivery to queue
-					(*queue)->start(queue);	
-					return YES;
-				} else {
-					NSLog(@"Error when setting event callback");
-				}
-			} else {
-				NSLog(@"Error when creating async event source");
-			}
-		} else {
-			NSLog(@"Error when opening device");
-		}
-	} else if (ioReturnValue == kIOReturnExclusiveAccess) {
-		// the device is used exclusive by another application
-		
-		// 1. we register for the FINISHED_USING_REMOTE_CONTROL_NOTIFICATION notification
-		[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(remoteControlAvailable:) name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
-		
-		// 2. send a distributed notification that we wanted to use the remote control				
-		[[self class] sendRequestForRemoteControlNotification];
-	}
-	return NO;				
-}
-
-+ (io_object_t) findRemoteDevice {
-	CFMutableDictionaryRef hidMatchDictionary = NULL;
-	IOReturn ioReturnValue = kIOReturnSuccess;	
-	io_iterator_t hidObjectIterator = 0;
-	io_object_t	hidDevice = 0;
-	
-	// Set up a matching dictionary to search the I/O Registry by class
-	// name for all HID class devices
-	hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]);
-	
-	// Now search I/O Registry for matching devices.
-	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
-	
-	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
-		hidDevice = IOIteratorNext(hidObjectIterator);
-	}
-	
-	// release the iterator
-	IOObjectRelease(hidObjectIterator);
-	
-	return hidDevice;
-}
-
-@end
-
diff --git a/apple_remote/KeyspanFrontRowControl.m b/apple_remote/KeyspanFrontRowControl.m
deleted file mode 100644
index dd86475..0000000
--- a/apple_remote/KeyspanFrontRowControl.m
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * KeyspanFrontRowControl.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "KeyspanFrontRowControl.h"
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <IOKit/IOKitLib.h>
-#import <IOKit/IOCFPlugIn.h>
-#import <IOKit/hid/IOHIDKeys.h>
-
-@implementation KeyspanFrontRowControl
-
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		 forKey:@"11_18_99_10_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		 forKey:@"11_18_98_10_"];		
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		 forKey:@"11_18_58_10_"];		
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		 forKey:@"11_18_61_10_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		 forKey:@"11_18_96_10_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		 forKey:@"11_18_97_10_"];
-	/* hold events are not being send by this device
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep]	forKey:@"18_14_6_18_14_6_"];
-	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	*/
-}
-
-+ (io_object_t) findRemoteDevice {
-	CFMutableDictionaryRef hidMatchDictionary = NULL;
-	IOReturn ioReturnValue = kIOReturnSuccess;	
-	io_iterator_t hidObjectIterator = 0;
-	io_object_t	hidDevice = 0;
-	SInt32                  idVendor = 1741;
-	SInt32                  idProduct = 0x420;	
-	
-	// Set up a matching dictionary to search the I/O Registry by class
-	// name for all HID class devices
-	hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
-	
-	CFNumberRef numberRefVendor = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idVendor);
-    if ( numberRefVendor )
-    {
-        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDVendorIDKey), numberRefVendor);
-        CFRelease(numberRefVendor);
-	}
-
-    CFNumberRef numberRefProduct = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idProduct);
-    if ( numberRefProduct )
-    {
-        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDProductIDKey), numberRefProduct);
-        CFRelease(numberRefProduct);	
-	}
-
-	// Now search I/O Registry for matching devices.
-	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
-	
-	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
-		hidDevice = IOIteratorNext(hidObjectIterator);
-	}
-	
-	// release the iterator
-    if ( hidObjectIterator )
-        IOObjectRelease(hidObjectIterator);
-
-	return hidDevice;
-	
-}
-
-@end
diff --git a/apple_remote/MultiClickRemoteBehavior.m b/apple_remote/MultiClickRemoteBehavior.m
deleted file mode 100644
index 03b2497..0000000
--- a/apple_remote/MultiClickRemoteBehavior.m
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************************
- * MultiClickRemoteBehavior.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "MultiClickRemoteBehavior.h"
-
-const NSTimeInterval DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE = 0.35;
-const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
-
-@implementation MultiClickRemoteBehavior
-
-- (id) init {
-	if ( (self = [super init]) ) {
-		maxClickTimeDifference = DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE;
-	}
-	return self;
-}
-
-// Delegates are not retained!
-// http://developer.apple.com/documentation/Cocoa/Conceptual/CocoaFundamentals/CommunicatingWithObjects/chapter_6_section_4.html
-// Delegating objects do not (and should not) retain their delegates. 
-// However, clients of delegating objects (applications, usually) are responsible for ensuring that their delegates are around
-// to receive delegation messages. To do this, they may have to retain the delegate.
-- (void) setDelegate: (id) _delegate {
-	if ( _delegate && ( [_delegate respondsToSelector:@selector(remoteButton:pressedDown:clickCount:)] == NO )) return; // return what ?
-	
-	delegate = _delegate;
-}
-- (id) delegate {
-	return delegate;
-}
-
-- (BOOL) simulateHoldEvent {
-	return simulateHoldEvents;
-}
-- (void) setSimulateHoldEvent: (BOOL) value {
-	simulateHoldEvents = value;
-}
-
-- (BOOL) simulatesHoldForButtonIdentifier: (RemoteControlEventIdentifier) identifier remoteControl: (RemoteControl*) remoteControl {
-	// we do that check only for the normal button identifiers as we would check for hold support for hold events instead
-	if (identifier > (1 << EVENT_TO_HOLD_EVENT_OFFSET)) return NO; 
-	
-	return [self simulateHoldEvent] && [remoteControl sendsEventForButtonIdentifier: (identifier << EVENT_TO_HOLD_EVENT_OFFSET)]==NO;
-}
-
-- (BOOL) clickCountingEnabled {
-	return clickCountEnabledButtons != 0;
-}
-- (void) setClickCountingEnabled: (BOOL) value {
-	if (value) {
-		[self setClickCountEnabledButtons: kRemoteButtonPlus | kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight | kRemoteButtonMenu];
-	} else {
-		[self setClickCountEnabledButtons: 0];
-	}
-}
-
-- (unsigned int) clickCountEnabledButtons {
-	return clickCountEnabledButtons;
-}
-- (void) setClickCountEnabledButtons: (unsigned int)value {
-	clickCountEnabledButtons = value;
-}
-
-- (NSTimeInterval) maximumClickCountTimeDifference {
-	return maxClickTimeDifference;
-}
-- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff {
-	maxClickTimeDifference = timeDiff;
-}
-
-- (void) sendSimulatedHoldEvent: (id) time {
-	BOOL startSimulateHold = NO;
-	RemoteControlEventIdentifier event = lastHoldEvent;
-	@synchronized(self) {
-		startSimulateHold = (lastHoldEvent>0 && lastHoldEventTime == [time doubleValue]);
-	}
-	if (startSimulateHold) {
-		lastEventSimulatedHold = YES;
-		event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
-		[delegate remoteButton:event pressedDown: YES clickCount: 1];
-	}
-}
-
-- (void) executeClickCountEvent: (NSArray*) values {
-	RemoteControlEventIdentifier event = [[values objectAtIndex: 0] unsignedIntValue]; 
-	NSTimeInterval eventTimePoint = [[values objectAtIndex: 1] doubleValue];
-	
-	BOOL finishedClicking = NO;
-	int finalClickCount = eventClickCount;	
-	
-	@synchronized(self) {
-		finishedClicking = (event != lastClickCountEvent || eventTimePoint == lastClickCountEventTime);
-		if (finishedClicking) {
-			eventClickCount = 0;		
-			lastClickCountEvent = 0;
-			lastClickCountEventTime = 0;
-		}
-	}
-	
-	if (finishedClicking) {	
-		[delegate remoteButton:event pressedDown: YES clickCount:finalClickCount];		
-		// trigger a button release event, too
-		[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow:0.1]];
-		[delegate remoteButton:event pressedDown: NO clickCount:finalClickCount];
-	}
-}
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl {	
-	if (!delegate)  return;
-	
-	BOOL clickCountingForEvent = ([self clickCountEnabledButtons] & event) == event;
-
-	if ([self simulatesHoldForButtonIdentifier: event remoteControl: remoteControl] && lastClickCountEvent==0) {
-		if (pressedDown) {
-			// wait to see if it is a hold
-			lastHoldEvent = event;
-			lastHoldEventTime = [NSDate timeIntervalSinceReferenceDate];
-			[self performSelector:@selector(sendSimulatedHoldEvent:) 
-					   withObject:[NSNumber numberWithDouble:lastHoldEventTime]
-					   afterDelay:HOLD_RECOGNITION_TIME_INTERVAL];
-			return;
-		} else {
-			if (lastEventSimulatedHold) {
-				// it was a hold
-				// send an event for "hold release"
-				event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
-				lastHoldEvent = 0;
-				lastEventSimulatedHold = NO;
-
-				[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
-				return;
-			} else {
-				RemoteControlEventIdentifier previousEvent = lastHoldEvent;
-				@synchronized(self) {
-					lastHoldEvent = 0;
-				}						
-				
-				// in case click counting is enabled we have to setup the state for that, too
-				if (clickCountingForEvent) {
-					lastClickCountEvent = previousEvent;
-					lastClickCountEventTime = lastHoldEventTime;
-					NSNumber* eventNumber;
-					NSNumber* timeNumber;		
-					eventClickCount = 1;
-					timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
-					eventNumber= [NSNumber numberWithUnsignedInt:previousEvent];
-					NSTimeInterval diffTime = maxClickTimeDifference-([NSDate timeIntervalSinceReferenceDate]-lastHoldEventTime);
-					[self performSelector: @selector(executeClickCountEvent:) 
-							   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
-							   afterDelay: diffTime];							
-					// we do not return here because we are still in the press-release event
-					// that will be consumed below
-				} else {
-					// trigger the pressed down event that we consumed first
-					[delegate remoteButton:event pressedDown: YES clickCount:1];							
-				}
-			}										
-		}
-	}
-	
-	if (clickCountingForEvent) {
-		if (pressedDown == NO) return;
-
-		NSNumber* eventNumber;
-		NSNumber* timeNumber;
-		@synchronized(self) {
-			lastClickCountEventTime = [NSDate timeIntervalSinceReferenceDate];
-			if (lastClickCountEvent == event) {
-				eventClickCount = eventClickCount + 1;
-			} else {
-				eventClickCount = 1;
-			}
-			lastClickCountEvent = event;
-			timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
-			eventNumber= [NSNumber numberWithUnsignedInt:event];
-		}
-		[self performSelector: @selector(executeClickCountEvent:) 
-				   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
-				   afterDelay: maxClickTimeDifference];
-	} else {
-		[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
-	}		
-
-}
-
-@end
diff --git a/apple_remote/RemoteControl.m b/apple_remote/RemoteControl.m
deleted file mode 100644
index d0812d3..0000000
--- a/apple_remote/RemoteControl.m
+++ /dev/null
@@ -1,146 +0,0 @@
-/*****************************************************************************
- * RemoteControl.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "RemoteControl.h"
-
-// 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
-NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION     = @"mac.remotecontrols.RequestForRemoteControl";
-NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION = @"mac.remotecontrols.FinishedUsingRemoteControl";
-
-// keys used in user objects for distributed notifications
-NSString* kRemoteControlDeviceName = @"RemoteControlDeviceName";
-NSString* kApplicationIdentifier   = @"CFBundleIdentifier";
-// bundle identifier of the application that should get access to the remote control
-// this key is being used in the FINISHED notification only
-NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
-
-
-@implementation RemoteControl
-
-// returns nil if the remote control device is not available
-- (id) initWithDelegate: (id) _remoteControlDelegate {	
-	if ( (self = [super init]) ) {
-		delegate = [_remoteControlDelegate retain];
-#ifdef DEBUG
-        NSLog(@"RemoteControl initWithDelegate ok");
-#endif
-    }
-	return self;
-}
-
-- (void) dealloc {
-	[delegate release];
-	[super dealloc];
-}
-
-- (void) setListeningToRemote: (BOOL) value {
-#ifdef DEBUG
-        NSLog(@"setListeningToRemote ok");
-#endif
-}
-- (BOOL) isListeningToRemote {
-	return NO;
-}
-
-- (void) startListening: (id) sender {
-#ifdef DEBUG
-            NSLog(@"startListening ok");
-#endif
-}
-- (void) stopListening: (id) sender {
-#ifdef DEBUG
-            NSLog(@"stopListening ok");
-#endif
-}
-
-- (BOOL) isOpenInExclusiveMode {
-	return YES;
-}
-- (void) setOpenInExclusiveMode: (BOOL) value {
-}
-
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
-#ifdef DEBUG
-   NSLog(@"sending event for button identifier \n");
-#endif
-	return YES;
-}
-
-+ (void) sendDistributedNotification: (NSString*) notificationName targetBundleIdentifier: (NSString*) targetIdentifier
-{
-    if ( (self = [super init]) ) {
-    NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithCString:[self remoteControlDeviceName] encoding:NSASCIIStringEncoding],
-                            kRemoteControlDeviceName /* key = RemoteControlDeviceName  -> OK */,
-                            [[NSBundle mainBundle] bundleIdentifier] /* value = org.openoffice.script -> OK */,
-                            kApplicationIdentifier/* key = CFBundleIdentifier -> OK */,
-                            targetIdentifier /*value = AppleIRController -> OK */,
-                            kTargetApplicationIdentifier /*targetBundleIdentifier -> does not appear, since the peer is nil*/,
-                            nil];
-#ifdef DEBUG
-    // Debug purpose: returns all the existing dictionary keys. 
-    NSString *s;
-    NSEnumerator *e = [userInfo keyEnumerator];
-    while ( (s = [e nextObject]) ) {
-        NSLog(@"key = %@ ",s);
-    }
-    NSEnumerator *f = [userInfo objectEnumerator ];
-    while ( (s = [f nextObject]) ) {
-        NSLog(@"value = %@ ",s);
-    }
-    NSLog(@"sendDistributedNotification ...");
-#endif
-
-	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:notificationName
-																   object:nil
-																 userInfo:userInfo
-													   deliverImmediately:YES];	
-    }
-}
-
-+ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
-    [self sendDistributedNotification:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION targetBundleIdentifier:identifier];
-#ifdef DEBUG
-    NSLog(@"sendFinishedNotifcationForAppIdentifier ...");
-#endif
-}
-+ (void) sendRequestForRemoteControlNotification {
-    [self sendDistributedNotification:REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION targetBundleIdentifier:nil];
-#ifdef DEBUG
-    NSLog(@"sendRequestForRemoteControlNotification ...");
-#endif
-}
-
-+ (const char*) remoteControlDeviceName {
-	return NULL;
-}
-
-@end
diff --git a/apple_remote/RemoteControlContainer.m b/apple_remote/RemoteControlContainer.m
deleted file mode 100644
index 40a222f..0000000
--- a/apple_remote/RemoteControlContainer.m
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************
- * RemoteControlContainer.m
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "RemoteControlContainer.h"
-
-@implementation RemoteControlContainer
-
-- (id) initWithDelegate: (id) _remoteControlDelegate {
-	if ( (self = [super initWithDelegate:_remoteControlDelegate]) ) {
-		remoteControls = [[NSMutableArray alloc] init];
-#ifdef DEBUG
-        NSLog(@"RemoteControlContainer initWithDelegate ok");
-	}
-    else {
-        NSLog(@"RemoteControlContainer initWithDelegate failed");
-#endif
-    }
-
-	return self;
-}
-
-- (void) dealloc {
-	[self stopListening: self];
-	[remoteControls release];
-	[super dealloc];
-}
-
-- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz {
-    BOOL toReturn = NO;
-    RemoteControl* remoteControl = [[clazz alloc] initWithDelegate: delegate];
-    if (remoteControl) {
-        [remoteControls addObject: remoteControl];
-        [remoteControl addObserver: self forKeyPath:@"listeningToRemote" options:NSKeyValueObservingOptionNew context:nil];
-        toReturn = YES;		
-    }
-#ifdef DEBUG
-    else {
-        NSLog(@"RemoteControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
-        toReturn = NO;	
-    }
-#endif
-    return toReturn;
-}
-
-- (unsigned int) count {
-	return [remoteControls count];
-}
-
-- (void) reset {
-	[self willChangeValueForKey:@"listeningToRemote"];
-	[self didChangeValueForKey:@"listeningToRemote"];
-#ifdef DEBUG
-	// debug purpose
-    NSLog(@"reset... (after listening to remote)");
-#endif
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-	[self reset];
-}
-
-- (void) setListeningToRemote: (BOOL) value {
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] setListeningToRemote: value];
-	}
-	if (value && value != [self isListeningToRemote]) [self performSelector:@selector(reset) withObject:nil afterDelay:0.01];
-}
-- (BOOL) isListeningToRemote {
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		if ([[remoteControls objectAtIndex: i] isListeningToRemote]) {
-			return YES;
-		}
-	}
-	return NO;
-}
-
-- (void) startListening: (id) sender {
-#ifdef DEBUG
-	NSLog(@"startListening to events... ");
-#endif
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] startListening: sender];
-	}	
-}
-- (void) stopListening: (id) sender {
-#ifdef DEBUG
-	NSLog(@"stopListening to events... ");
-#endif
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] stopListening: sender];
-	}	
-}
-
-- (BOOL) isOpenInExclusiveMode {
-	BOOL mode = YES;
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		mode = mode && ([[remoteControls objectAtIndex: i] isOpenInExclusiveMode]);
-	}
-	return mode;	
-}
-- (void) setOpenInExclusiveMode: (BOOL) value {
-	int i;
-	for(i=0; i < [remoteControls count]; i++) {
-		[[remoteControls objectAtIndex: i] setOpenInExclusiveMode:value];
-	}	
-}
-
-@end
diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m
deleted file mode 100644
index 5b3b893..0000000
--- a/apple_remote/RemoteMainController.m
+++ /dev/null
@@ -1,177 +0,0 @@
-/*****************************************************************************
- * RemoteMainController.m
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 "RemoteMainController.h"
-#import "AppleRemote.h"
-#import "KeyspanFrontRowControl.h"
-#import "GlobalKeyboardDevice.h"
-#import "RemoteControlContainer.h"
-#import "MultiClickRemoteBehavior.h"
-
-// -------------------------------------------------------------------------------------------
-// Sample Code 3: Multi Click Behavior and Hold Event Simulation
-// -------------------------------------------------------------------------------------------
-
-@implementation MainController
-
-- (id) init {
-    self = [super init];  // because we redefined our own init instead of use the fu..nny awakeFromNib 
-    if (self != nil) {
-
-        // 1. instantiate the desired behavior for the remote control device
-        remoteControlBehavior = [[MultiClickRemoteBehavior alloc] init];	
-
-        // 2. configure the behavior
-        [remoteControlBehavior setDelegate: self];
-		
-        // 3. a Remote Control Container manages a number of devices and conforms to the RemoteControl interface
-        //    Therefore you can enable or disable all the devices of the container with a single "startListening:" call.
-        RemoteControlContainer* container = [[RemoteControlContainer alloc] initWithDelegate: remoteControlBehavior];
-
-        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] != 0 ) {
-#ifdef DEBUG
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] successfull");
-        }
-        else {
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] failed");
-#endif
-        }
-
-        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] != 0 ) {
-#ifdef DEBUG
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] successfull");
-        }
-        else {
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] failed");
-#endif
-        }
-
-        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] != 0 ) {
-#ifdef DEBUG
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] successfull");
-        }
-        else {
-            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] failed");
-#endif
-        }	
-        // to give the binding mechanism a chance to see the change of the attribute
-        [self setValue: container forKey: @"remoteControl"];	
-#ifdef DEBUG
-            NSLog(@"MainController init done");
-#endif
-    }
-    else 
-        NSLog(@"MainController init failed");
-    return self;
-}
-
-- (void) postTheEvent: (short int)buttonIdentifier modifierFlags:(int)modifierFlags
-{
-    [NSApp postEvent: 
-    [NSEvent    otherEventWithType:NSApplicationDefined
-                location:NSZeroPoint
-                modifierFlags:modifierFlags
-                timestamp: 0
-                windowNumber:[[NSApp keyWindow] windowNumber]
-                context:nil
-                subtype:AppleRemoteControlEvent
-                data1: buttonIdentifier 
-                data2: 0]
-    atStart: NO];
-}
-
-
-- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int)clickCount
-{
-    NSString* pressed = @"";
-#ifdef DEBUG
-    NSString* buttonName = nil;
-#endif
-    if (pressedDown)
-    {
-        pressed = @"(pressed)";
-
-#ifdef DEBUG
-        switch(buttonIdentifier) 
-        {
-            case kRemoteButtonPlus:         buttonName = @"Volume up";              break;  // MEDIA_COMMAND_VOLUME_UP  ( see vcl/inc/vcl/cmdevt.hxx )
-            case kRemoteButtonMinus:        buttonName = @"Volume down";            break;  // MEDIA_COMMAND_VOLUME_DOWN
-            case kRemoteButtonMenu:         buttonName = @"Menu";                   break;  // MEDIA_COMMAND_MENU
-            case kRemoteButtonPlay:         buttonName = @"Play";                   break;  // MEDIA_COMMAND_PLAY
-            case kRemoteButtonRight:        buttonName = @"Next slide";             break;  // MEDIA_COMMAND_NEXTTRACK
-            case kRemoteButtonLeft:         buttonName = @"Left";                   break;  // MEDIA_COMMAND_PREVIOUSTRACK
-            case kRemoteButtonRight_Hold:   buttonName = @"Last slide";             break;  // MEDIA_COMMAND_NEXTTRACK_HOLD
-            case kRemoteButtonLeft_Hold:    buttonName = @"First slide";            break;  // MEDIA_COMMAND_PREVIOUSTRACK_HOLD
-            case kRemoteButtonPlus_Hold:    buttonName = @"Volume up holding";      break;
-            case kRemoteButtonMinus_Hold:   buttonName = @"Volume down holding";    break;
-            case kRemoteButtonPlay_Hold:    buttonName = @"Play (sleep mode)";      break;  // MEDIA_COMMAND_PLAY_HOLD
-            case kRemoteButtonMenu_Hold:    buttonName = @"Menu (long)";            break;  // MEDIA_COMMAND_MENU_HOLD
-            case kRemoteControl_Switched:   buttonName = @"Remote Control Switched";break;
-
-            default:    NSLog(@"Unmapped event for button %d", buttonIdentifier);   break;
-        }
-#endif
-        [ self postTheEvent:buttonIdentifier modifierFlags: 0 ];
-    }
-    else // not pressed
-    {
-        pressed = @"(released)";
-    }
-
-#ifdef DEBUG
-	//NSLog(@"Button %@ pressed %@", buttonName, pressed);
-	NSString* clickCountString = @"";
-	if (clickCount > 1) clickCountString = [NSString stringWithFormat: @"%d clicks", clickCount];
-	NSString* feedbackString = [NSString stringWithFormat:@"(Value:%4d) %@  %@ %@",buttonIdentifier, buttonName, pressed, clickCountString];
-
-	// print out events
-	NSLog(@"%@", feedbackString);
-
-    if (pressedDown == NO) printf("\n");
-	// simulate slow processing of events
-	// [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.5]];
-#endif
-}
-
-- (void) dealloc {
-    [remoteControl autorelease];
-	[remoteControlBehavior autorelease];
-	[super dealloc];
-}
-
-// for bindings access
-- (RemoteControl*) remoteControl {
-	return remoteControl;
-}
-
-- (MultiClickRemoteBehavior*) remoteBehavior {
-	return remoteControlBehavior;
-}
-
-@end
-\ No newline at end of file
diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h
deleted file mode 100644
index 31128df..0000000
--- a/apple_remote/inc/AppleRemote.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * RemoteControlWrapper.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-#import "HIDRemoteControlDevice.h"
-
-/*	Interacts with the Apple Remote Control HID device
-    The class is not thread safe
-*/
-@interface AppleRemote : HIDRemoteControlDevice {		
-}
-
-@end
diff --git a/apple_remote/inc/GlobalKeyboardDevice.h b/apple_remote/inc/GlobalKeyboardDevice.h
deleted file mode 100644
index fca23a0..0000000
--- a/apple_remote/inc/GlobalKeyboardDevice.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * GlobalKeyboardDevice.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-#import <Carbon/Carbon.h>
-
-#import "RemoteControl.h"
-
-
-/*
- This class registers for a number of global keyboard shortcuts to simulate a remote control
- */
-
-@interface GlobalKeyboardDevice : RemoteControl {
-    
-    NSMutableDictionary* hotKeyRemoteEventMapping;
-    EventHandlerRef eventHandlerRef;
-        
-}
-
-- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers;
-
-- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier;
-
-
-
-@end
diff --git a/apple_remote/inc/HIDRemoteControlDevice.h b/apple_remote/inc/HIDRemoteControlDevice.h
deleted file mode 100644
index 06e6d6e..0000000
--- a/apple_remote/inc/HIDRemoteControlDevice.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * HIDRemoteControlDevice.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same license
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-#import <IOKit/hid/IOHIDLib.h>
-
-#import "RemoteControl.h"
-
-/*
-    Base class for HID based remote control devices
- */
-@interface HIDRemoteControlDevice : RemoteControl {
-    IOHIDDeviceInterface** hidDeviceInterface; // see IOKit/hid/IOHIDLib.h
-    IOHIDQueueInterface**  queue;  // IOKit/hid/IOHIDLib.h
-    NSMutableArray*		   allCookies;
-    NSMutableDictionary*   cookieToButtonMapping;
-    CFRunLoopSourceRef	   eventSource;
-    
-    BOOL fixSecureEventInputBug;
-    BOOL openInExclusiveMode;
-    BOOL processesBacklog;	
-    
-    int supportedButtonEvents;
-}
-
-// When your application needs to much time on the main thread when processing an event other events
-// may already be received which are put on a backlog. As soon as your main thread
-// has some spare time this backlog is processed and may flood your delegate with calls.
-// Backlog processing is turned off by default.
-- (BOOL) processesBacklog;
-- (void) setProcessesBacklog: (BOOL) value;
-
-// methods that should be overwritten by subclasses
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping;
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown;
-
-+ (BOOL) isRemoteAvailable;
-
-@end
diff --git a/apple_remote/inc/KeyspanFrontRowControl.h b/apple_remote/inc/KeyspanFrontRowControl.h
deleted file mode 100644
index be03c27..0000000
--- a/apple_remote/inc/KeyspanFrontRowControl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * KeyspanFrontRowControl.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-#import "HIDRemoteControlDevice.h"
-
-/*	Interacts with the Keyspan FrontRow Remote Control HID device
-    The class is not thread safe
-*/
-@interface KeyspanFrontRowControl : HIDRemoteControlDevice {
-
-}
-
-@end
diff --git a/apple_remote/inc/MultiClickRemoteBehavior.h b/apple_remote/inc/MultiClickRemoteBehavior.h
deleted file mode 100644
index f4179da..0000000
--- a/apple_remote/inc/MultiClickRemoteBehavior.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * MultiClickRemoteBehavior.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-#import "RemoteControl.h"
-
-/**
-    A behavior that adds multiclick and hold events on top of a device.
-    Events are generated and send to a delegate
- */
-@interface MultiClickRemoteBehavior : NSObject {
-    id delegate;
-    
-    // state for simulating plus/minus hold
-    BOOL simulateHoldEvents;	
-    BOOL lastEventSimulatedHold;
-    RemoteControlEventIdentifier lastHoldEvent;
-    NSTimeInterval lastHoldEventTime;	
-    
-    // state for multi click
-    unsigned int clickCountEnabledButtons;
-    NSTimeInterval maxClickTimeDifference;
-    NSTimeInterval lastClickCountEventTime;	
-    RemoteControlEventIdentifier lastClickCountEvent;
-    unsigned int eventClickCount;	
-}
-
-- (id) init;
-
-// Delegates are not retained
-- (void) setDelegate: (id) delegate;
-- (id) delegate;
-
-// Simulating hold events does deactivate sending of individual requests for pressed down/released.
-// Instead special hold events are being triggered when the user is pressing and holding a button for a small period.
-// Simulation is activated only for those buttons and remote control that do not have a seperate event already
-- (BOOL) simulateHoldEvent;
-- (void) setSimulateHoldEvent: (BOOL) value;
-
-// click counting makes it possible to recognize if the user has pressed a button repeatedly
-// click counting does delay each event as it has to wait if there is another event (second click)
-// therefore there is a slight time difference (maximumClickCountTimeDifference) between a single click
-// of the user and the call of your delegate method
-// click counting can be enabled individually for specific buttons. Use the property clickCountEnableButtons to
-// set the buttons for which click counting shall be enabled
-- (BOOL) clickCountingEnabled;
-- (void) setClickCountingEnabled: (BOOL) value;
-
-- (unsigned int) clickCountEnabledButtons;
-- (void) setClickCountEnabledButtons: (unsigned int)value;
-
-// the maximum time difference till which clicks are recognized as multi clicks
-- (NSTimeInterval) maximumClickCountTimeDifference;
-- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff;
-
-@end
-
-/* 
- * Method definitions for the delegate of the MultiClickRemoteBehavior class
- */
-@interface NSObject(MultiClickRemoteBehaviorDelegate)
-
-- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int) count;
-
-@end
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
deleted file mode 100644
index c736775..0000000
--- a/apple_remote/inc/RemoteControl.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************
- * RemoteControl.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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 
-// 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;
-extern NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION;
-
-// keys used in user objects for distributed notifications
-extern NSString* kRemoteControlDeviceName;
-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 
-
-@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,
-    
-    // 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,
-} RemoteControlEventIdentifier;
-
-@interface NSObject(RemoteControlDelegate)
-
-- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl;
-
-@end
-
-/*
-    Base Interface for Remote Control devices
-*/
-@interface RemoteControl : NSObject {
-    id delegate;
-}
-
-// returns nil if the remote control device is not available
-- (id) initWithDelegate: (id) remoteControlDelegate;
-
-- (void) setListeningToRemote: (BOOL) value;
-- (BOOL) isListeningToRemote;
-
-- (BOOL) isOpenInExclusiveMode;
-- (void) setOpenInExclusiveMode: (BOOL) value;
-
-- (void) startListening: (id) sender;
-- (void) stopListening: (id) sender;
-
-// is this remote control sending the given event?
-- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier;
-
-// sending of notifications between applications
-+ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier;
-+ (void) sendRequestForRemoteControlNotification;
-
-// name of the device
-+ (const char*) remoteControlDeviceName;
-
-@end
diff --git a/apple_remote/inc/RemoteControlContainer.h b/apple_remote/inc/RemoteControlContainer.h
deleted file mode 100644
index c66472e..0000000
--- a/apple_remote/inc/RemoteControlContainer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * RemoteControlContainer.h
- * RemoteControlWrapper
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-#import "RemoteControl.h"
-
-@interface RemoteControlContainer : RemoteControl {
-    NSMutableArray* remoteControls;
-}
-
-- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz;
-- (unsigned int) count;
-
-@end
diff --git a/apple_remote/inc/RemoteMainController.h b/apple_remote/inc/RemoteMainController.h
deleted file mode 100644
index 9db22d7..0000000
--- a/apple_remote/inc/RemoteMainController.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************
- * RemoteMainController.h
- *
- *
- * 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 
- * by Eric Bachard on 11.08.2008 under the same License
- *
- * 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,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 
- * 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>
-
-#define AppleRemoteControlEvent 15
-
-@class RemoteControl;
-@class MultiClickRemoteBehavior;
-
-//static void sendTheEvent( unichar, int );
-
-@interface MainController : NSObject {
-@public // else remoteControl is not reachable from GetSalData()->mpMainController
-    RemoteControl* remoteControl;
-@private
-    MultiClickRemoteBehavior* remoteControlBehavior;
-}
-- (RemoteControl*) remoteControl;
-- (MultiClickRemoteBehavior*) remoteBehavior;
-
-@end
diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk
deleted file mode 100644
index d261d51..0000000
--- a/apple_remote/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=external
-TARGET=AppleRemote
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="aqua"
-
-SHL1STDLIBS+= \
-    -framework Cocoa -framework Carbon -framework IOKit
-
-LIB1FILES+= \
-        $(SLB)$/AppleRemote.lib
-
-SLOFILES=	\
-        $(SLO)$/KeyspanFrontRowControl.obj 	\
-        $(SLO)$/AppleRemote.obj 		\
-        $(SLO)$/RemoteControl.obj		\
-        $(SLO)$/RemoteControlContainer.obj	\
-        $(SLO)$/GlobalKeyboardDevice.obj	\
-        $(SLO)$/HIDRemoteControlDevice.obj	\
-        $(SLO)$/MultiClickRemoteBehavior.obj	\
-        $(SLO)$/RemoteMainController.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1OBJS= $(SLOFILES)
-
-OUT2INC = \
-        $(BUILDDIR)$/KeyspaFrontRowControl.h	\
-        $(BUILDDIR)$/AppleRemote.h		\
-        $(BUILDDIR)$/RemoteControl.h		\
-        $(BUILDDIR)$/RemoteControlContainer.h	\
-        $(BUILDDIR)$/GlobalKeyboardDevice.h	\
-        $(BUILDDIR)$/HIDRemoteControlDevice.h	\
-        $(BUILDDIR)$/MultiClickRemoteBehavior.h	\
-        $(BUILDDIR)$/RemoteMainController.h
-
-
-.ENDIF		# "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst
deleted file mode 100644
index ff4ee57..0000000
--- a/apple_remote/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-apr	apple_remote :	solenv	soltools NULL
-apr	apple_remote	nmake	-	u	apr_aprem	NULL
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
deleted file mode 100644
index 8d05687..0000000
--- a/apple_remote/prj/d.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\apple_remote
-..\inc\*.h %_DEST%\inc\apple_remote\*
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
deleted file mode 100644
index 99e8b8b..0000000
--- a/beanshell/bsh-2.0b1-src.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- misc/BeanShell/build.xml	Fri Dec 19 17:14:27 2003
-+++ misc/build/BeanShell/build.xml	Fri Mar 28 15:55:04 2008
-@@ -17,7 +17,7 @@
- 		up the build dir!  It has to be done manually the first time (or put
- 		in the jar file). There must be a way to fix this...
- -->
--<project name="beanshell" default="compile" basedir=".">
-+<project name="beanshell" default="jarall" basedir=".">
- 
- <!-- Project Configuration -->
- 
-@@ -71,6 +71,9 @@
- 		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
- 	-->
- 
-+	<property name="exclude-bsf" 
-+		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
-+
- 	<!-- Uncomment to build without the ASM class generator code.
- 	<property name="exclude-classgen" 
- 		value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/>
-@@ -80,6 +83,9 @@
- 	<property name="exclude-servlet" 
- 		value="bsh/servlet/*"/>
- 	-->
-+
-+	<property name="exclude-servlet" 
-+		value="bsh/servlet/*"/>
- 
- 	<!-- Legacy excludes.  Comment this *out* to build these legacy items -->
- 	<property name="legacy-excludes" 
---- misc/BeanShell/makefile.mk	Fri Mar 28 15:56:40 2008
-+++ misc/build/BeanShell/makefile.mk	Fri Mar 28 15:56:06 2008
-@@ -1 +1,35 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+PRJNAME=ooo_beanshell
-+TARGET=jarall
-+
-+.INCLUDE : ant.mk
-+
-+ALLTAR : ANTBUILD
-+
---- misc/BeanShell/src/bsh/ClassGeneratorUtil.java	Fri Dec 19 17:14:28 2003
-+++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java	Fri Mar 28 15:55:05 2008
-@@ -34,7 +34,9 @@
- package bsh;
- 
- import bsh.org.objectweb.asm.*;
--import java.lang.reflect.*;
-+import java.lang.reflect.Constructor;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
- import java.util.ArrayList;
- import java.util.List;
- 
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
deleted file mode 100644
index 6e89a00..0000000
--- a/beanshell/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=ooo_beanshell
-TARGET=ooo_beanshell
-
-.IF "$(SOLAR_JAVA)"!=""
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=bsh-2.0b1-src
-TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d
-TARFILE_ROOTDIR=BeanShell
-PATCH_FILES=bsh-2.0b1-src.patch
-
-ADDITIONAL_FILES=makefile.mk
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ELSE
-all:
-        @echo java disabled
-.ENDIF
diff --git a/beanshell/prj/build.lst b/beanshell/prj/build.lst
deleted file mode 100644
index 2a1401b..0000000
--- a/beanshell/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-be	beanshell	:	solenv NULL
-be	beanshell							usr1		-	all	be_mkout				NULL
-be	beanshell							nmake		-	all	be_beanshell		NULL
diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst
deleted file mode 100644
index ea4006c..0000000
--- a/beanshell/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin\bsh.jar
diff --git a/cppunit/aix.patch b/cppunit/aix.patch
deleted file mode 100644
index 2bc78f3..0000000
--- a/cppunit/aix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- misc/cppunit-1.12.1.orig/config/config.guess	2010-09-15 10:25:54.000000000 -0500
-+++ misc/build/cppunit-1.12.1/config/config.guess	2010-09-15 10:26:50.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
diff --git a/cppunit/android.patch b/cppunit/android.patch
deleted file mode 100644
index 595f840..0000000
--- a/cppunit/android.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/cppunit-1.12.1/config/config.sub
-+++ misc/build/cppunit-1.12.1/config/config.sub
-@@ -1246,7 +1246,7 @@
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -udi* | -eabi* | -androideabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff --git a/cppunit/avoid-synthetised-destructor.patch b/cppunit/avoid-synthetised-destructor.patch
deleted file mode 100644
index 82b7929..0000000
--- a/cppunit/avoid-synthetised-destructor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-rhbz#641350 impl. destructor of CppUnit::Message causes segfault when test
-is built with debug. STL
-
-diff -up cppunit-1.12.1/include/cppunit/Message.h.dt cppunit-1.12.1/include/cppunit/Message.h
---- misc/build/cppunit-1.12.1/include/cppunit/Message.h.dt	2010-10-08 14:02:26.514477964 +0200
-+++ misc/build/cppunit-1.12.1/include/cppunit/Message.h	2010-10-08 14:02:15.411948098 +0200
-@@ -57,6 +57,8 @@ public:
-            const std::string &detail2,
-            const std::string &detail3 );
- 
-+  ~Message();
-+
-   Message &operator =( const Message &other );
- 
-   /*! \brief Returns the short description.
-diff -up cppunit-1.12.1/src/cppunit/Message.cpp.dt cppunit-1.12.1/src/cppunit/Message.cpp
---- misc/build/cppunit-1.12.1/src/cppunit/Message.cpp.dt	2010-10-08 14:02:39.421768852 +0200
-+++ misc/build/cppunit-1.12.1/src/cppunit/Message.cpp	2010-10-08 14:02:54.066829633 +0200
-@@ -47,6 +47,10 @@ Message::Message( const std::string &sho
-   addDetail( detail1, detail2, detail3 );
- }
- 
-+Message::~Message()
-+{
-+}
-+
- Message &
- Message::operator =( const Message &other )
- {
diff --git a/cppunit/ios.patch b/cppunit/ios.patch
deleted file mode 100644
index 8920461..0000000
--- a/cppunit/ios.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- misc/build/cppunit-1.12.1/configure
-+++ misc/build/cppunit-1.12.1/configure
-@@ -23273,7 +23273,7 @@
-   { echo "$as_me:$LINENO: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
- echo "${ECHO_T}creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; }
-   if test -f $ac_prefix_conf_INP ; then
--    $as_dirname -- /* automatically generated */ ||
-+    $as_dirname -- '/* automatically generated */' ||
- $as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X/* automatically generated */ : 'X\(//\)[^/]' \| \
- 	 X/* automatically generated */ : 'X\(//\)$' \| \
-@@ -23318,5 +23318,5 @@
- echo "$as_me: error: input file $ac_prefix_conf_IN does not exist,     skip generating $ac_prefix_conf_OUT" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
--  rm -f conftest.*
-+  rm -f -r conftest.*
- fi
---- misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h
-+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h
-@@ -106,7 +106,9 @@
-  * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
-  * \endcode
-  */
-+#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
- #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
-+#endif
- 
- /*! \brief Type of the function exported by a plug-in.
-  * \ingroup WritingTestPlugIn
-@@ -143,6 +143,12 @@
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-   typedef char __CppUnitPlugInImplementMainDummyTypeDef
- 
-+// Actually this is for iOS where we build the cppunit tests libraries
-+// as plain archives and just link them statically into test fixture programs,
-+// and don't want any stinking duplicate main(), but shouldn't hurt for MacOSX either.
-+#elif defined(__APPLE__)
-+#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
-+  typedef char __CppUnitPlugInImplementMainDummyTypeDef
- // Unix
- #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
deleted file mode 100644
index ee8d5ed..0000000
--- a/cppunit/ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/cppunit-1.12.1/src/cppunit/Makefile.in	2008-02-20 06:59:55.000000000 +0100
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in	2010-06-21 17:01:38.324370072 +0200
-@@ -300,7 +300,7 @@
- 
- libcppunit_la_LDFLAGS = \
-  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) $(LIBADD_DL)
- 
- all: all-am
- 
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
deleted file mode 100644
index 7fba665..0000000
--- a/cppunit/makefile.mk
+++ /dev/null
@@ -1,167 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = .
-PRJNAME = cppunit
-TARGET = cppunit
-
-.INCLUDE: settings.mk
-
-TARFILE_NAME = cppunit-1.12.1
-TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
-    # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
-    #  cppunit-1.12.1.tar.gz/download>
-
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch android.patch ios.patch
-    # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
-    #  aid=2912590&group_id=11795&atid=311795>
-    # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
-    #  aid=2912630&group_id=11795&atid=311795>
-
-.IF "$(OS)" == "WNT"
-.IF "$(COM)" == "MSC"
-
-# On Windows, CppUnit appears to support either the Unix-style configure/make
-# approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
-# by MSVC cl), or a Visual Studio project (CppUnitLibraries.dsw).  However, the
-# latter is too old to work with vcbuild from a wntmsci12 tool chain.  So, the
-# easiest way appears to inject hand-crafted dmake makefiles to build the
-# relevant parts.  (Another approach would be to manually use the Visual Studio
-# IDE to convert CppUnitLibraries.dsw to modern format, inject the resulting
-# cppunit_dll.vcproj and DllPlugInTester.vcproj and build those with vcbuild.)
-
-CONFIGURE_ACTION = $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \
-    < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-cppunit_dll.mk \
-    > src/cppunit/ooo-cppunit_dll.mk && \
-    $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \
-    < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-DllPlugInTester.mk \
-    > src/DllPlugInTester/ooo-DllPlugInTester.mk
-
-BUILD_ACTION = cd src/cppunit && dmake -f ooo-cppunit_dll.mk debug=$(debug) verbose=$(verbose) && \
-    cd ../DllPlugInTester && dmake -f ooo-DllPlugInTester.mk debug=$(debug) verbose=$(verbose)
-
-OUTDIR2INC = include/cppunit
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
-
-.ELSE
-.IF "$(COM)" == "GCC"
-EXTRA_CFLAGS += -mthreads
-LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-
-CONFIGURE_ACTION = ./configure
-CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
-    pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
-    --disable-dependency-tracking --disable-static --disable-doxygen \
-    --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
-    CXXFLAGS='$(EXTRA_CFLAGS)' \
-    LDFLAGS='$(LDFLAGS)' \
-    LIBS='$(MY_LIBS)'
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_FLAGS = install
-
-OUTDIR2INC = ooo-install/include/cppunit
-
-# WTF? A *Cygwin* DLL?
-#OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-#    ooo-install/bin/cygcppunit-1-12-1.dll
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-    ooo-install/bin/libcppunit-1-12-1.dll
-OUT2LIB = ooo-install/lib/libcppunit.dll.a
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-.ENDIF # "$(COM)" == "GCC"
-.ENDIF # "$(COM)" == "MSC"
-
-.ELSE
-
-# At least on Solaris with Sun CC, linking the cppunit dynamic library fails as
-# TestAssert.o uses fabs but -lm is missing from the command line (cppunit's
-# aclocal.m4 contains an unused AC_CHECK_LIBM, maybe using that would be a
-# better fix):
-.IF "$(OS)" == "SOLARIS" && "$(COM)" == "C52"
-MY_LIBS = -lm
-.END
-
-CONFIGURE_ACTION = ./configure
-
-.IF "$(debug)"!=""
-DEBUGFLAG=-g
-.ENDIF
-
-CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
-    pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
-    --disable-dependency-tracking --disable-static --disable-doxygen \
-    --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
-    CXXFLAGS='$(EXTRA_CFLAGS) $(DEBUGFLAG) $(EXTRA_CDEFS)' \
-    LDFLAGS='$(LDFLAGS)' \
-    LIBS='$(MY_LIBS)'
-
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+=--disable-shared
-.ELSE
-CONFIGURE_FLAGS+=--disable-static
-.ENDIF
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_FLAGS = install
-
-OUTDIR2INC = ooo-install/include/cppunit
-
-OUT2BIN = ooo-install/bin/DllPlugInTester
-.IF "$(OS)" == "MACOSX"
-OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
-EXTRPATH = NONE
-.ELIF "$(OS)" == "AIX"
-OUT2LIB = ooo-install/lib/libcppunit-1.12.a
-.ELIF "$(OS)" == "OPENBSD"
-OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0
-.ELIF "$(OS)" == "IOS" || "$(OS)" == "ANDROID"
-OUT2LIB = ooo-install/lib/libcppunit.a
-.ELSE
-OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
-.END
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-.END
diff --git a/cppunit/ooo-DllPlugInTester.mk b/cppunit/ooo-DllPlugInTester.mk
deleted file mode 100644
index 1c8c8a0..0000000
--- a/cppunit/ooo-DllPlugInTester.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = @BACKPATH@../..
-PRJNAME = cppunit
-TARGET = DllPlugInTester
-
-ENABLE_EXCEPTIONS = TRUE
-nodep = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DCPPUNIT_DLL
-CFLAGSCXX += -I../../include
-UWINAPILIB =
-
-OBJFILES = $(APP1OBJS)
-
-APP1OBJS = \
-   $(OBJ)/CommandLineParser.obj \
-   $(OBJ)/DllPlugInTester.obj
-APP1RPATH = NONE
-APP1STDLIBS = icppunit_dll.lib
-APP1TARGET = DllPlugInTester_dll
-
-.INCLUDE: target.mk
diff --git a/cppunit/ooo-cppunit_dll.mk b/cppunit/ooo-cppunit_dll.mk
deleted file mode 100644
index 048a51e..0000000
--- a/cppunit/ooo-cppunit_dll.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = @BACKPATH@../..
-PRJNAME = cppunit
-TARGET = cppunit_dll
-
-ENABLE_EXCEPTIONS = TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
-nodep = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DCPPUNIT_BUILD_DLL
-CFLAGSCXX += -I../../include
-UWINAPILIB =
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = \
-    $(SLO)/AdditionalMessage.obj \
-    $(SLO)/Asserter.obj \
-    $(SLO)/BeosDynamicLibraryManager.obj \
-    $(SLO)/BriefTestProgressListener.obj \
-    $(SLO)/CompilerOutputter.obj \
-    $(SLO)/DefaultProtector.obj \
-    $(SLO)/DllMain.obj \
-    $(SLO)/DynamicLibraryManager.obj \
-    $(SLO)/DynamicLibraryManagerException.obj \
-    $(SLO)/Exception.obj \
-    $(SLO)/Message.obj \
-    $(SLO)/PlugInManager.obj \
-    $(SLO)/PlugInParameters.obj \
-    $(SLO)/Protector.obj \
-    $(SLO)/ProtectorChain.obj \
-    $(SLO)/RepeatedTest.obj \
-    $(SLO)/SourceLine.obj \
-    $(SLO)/StringTools.obj \
-    $(SLO)/SynchronizedObject.obj \
-    $(SLO)/Test.obj \
-    $(SLO)/TestAssert.obj \
-    $(SLO)/TestCase.obj \
-    $(SLO)/TestCaseDecorator.obj \
-    $(SLO)/TestComposite.obj \
-    $(SLO)/TestDecorator.obj \
-    $(SLO)/TestFactoryRegistry.obj \
-    $(SLO)/TestFailure.obj \
-    $(SLO)/TestLeaf.obj \
-    $(SLO)/TestNamer.obj \
-    $(SLO)/TestPath.obj \
-    $(SLO)/TestPlugInDefaultImpl.obj \
-    $(SLO)/TestResult.obj \
-    $(SLO)/TestResultCollector.obj \
-    $(SLO)/TestRunner.obj \
-    $(SLO)/TestSetUp.obj \
-    $(SLO)/TestSuccessListener.obj \
-    $(SLO)/TestSuite.obj \
-    $(SLO)/TestSuiteBuilderContext.obj \
-    $(SLO)/TextOutputter.obj \
-    $(SLO)/TextTestProgressListener.obj \
-    $(SLO)/TextTestResult.obj \
-    $(SLO)/TextTestRunner.obj \
-    $(SLO)/TypeInfoHelper.obj \
-    $(SLO)/UnixDynamicLibraryManager.obj \
-    $(SLO)/Win32DynamicLibraryManager.obj \
-    $(SLO)/XmlDocument.obj \
-    $(SLO)/XmlElement.obj \
-    $(SLO)/XmlOutputter.obj \
-    $(SLO)/XmlOutputterHook.obj
-SHL1RPATH = NONE
-SHL1TARGET = cppunit_dll
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
deleted file mode 100644
index 2178f59..0000000
--- a/cppunit/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-c5t cppunit : soltools NULL
-c5t cppunit nmake - all cppunit NULL
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
deleted file mode 100644
index 1cfdb55..0000000
--- a/cppunit/prj/d.lst
+++ /dev/null
@@ -1,38 +0,0 @@
-mkdir: %_DEST%\inc\cppunit
-..\%__SRC%\inc\cppunit\*.h %_DEST%\inc\cppunit\*.h
-mkdir: %_DEST%\inc\cppunit\config
-..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc\cppunit\config\*.h
-mkdir: %_DEST%\inc\cppunit\extensions
-..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc\cppunit\extensions\*.h
-mkdir: %_DEST%\inc\cppunit\plugin
-..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc\cppunit\plugin\*.h
-mkdir: %_DEST%\inc\cppunit\portability
-..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc\cppunit\portability\*.h
-mkdir: %_DEST%\inc\cppunit\tools
-..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc\cppunit\tools\*.h
-mkdir: %_DEST%\inc\cppunit\ui\text
-..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc\cppunit\ui\text\*.h
-
-..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin\cppunit_dll.dll
-..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib\icppunit_dll.lib
-
-..\%__SRC%\bin\libcppunit-1-12-1.dll %_DEST%\bin\libcppunit-1-12-1.dll
-..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib\libcppunit.dll.a
-
-..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib
-symlink: %_DEST%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit.dylib
-
-..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit-1.12.so.1
-symlink: %_DEST%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit.so
-
-..\%__SRC%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit-1.12.so.1.0
-symlink: %_DEST%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit.so
-
-..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit-1.12.a
-symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a
-
-..\%__SRC%\lib\libcppunit.a %_DEST%\lib\libcppunit.a
-
-..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
-..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
-..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
diff --git a/cppunit/solarisfinite.patch b/cppunit/solarisfinite.patch
deleted file mode 100644
index 0c15cdc..0000000
--- a/cppunit/solarisfinite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h	Mon Mar  5 04:16:42 2007
-+++ misc/build/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h	Thu Dec  3 16:34:23 2009
-@@ -3,6 +3,11 @@
- 
- #include <cppunit/Portability.h>
- #include <math.h>
-+
-+#if defined(__sun) && !defined(CPPUNIT_HAVE_ISFINITE) && defined(CPPUNIT_HAVE_FINITE)
-+#include <ieeefp.h>
-+  // <math.h> is still needed for usage of fabs in TestAssert.cpp
-+#endif
- 
- CPPUNIT_NS_BEGIN
- 
diff --git a/cppunit/warnings.patch b/cppunit/warnings.patch
deleted file mode 100644
index 39e804a..0000000
--- a/cppunit/warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2007-01-12 05:54:34.000000000 +0100
-+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2009-12-02 15:33:29.639857272 +0100
-@@ -151,9 +151,7 @@
- #include <windows.h>
- #endif
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
--  BOOL APIENTRY DllMain( HANDLE hModule,              \
--                         DWORD  ul_reason_for_call,   \
--                         LPVOID lpReserved )          \
-+  BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \
-   {                                                   \
-       return TRUE;                                    \
-   }                                                   \
-@@ -162,7 +160,7 @@
- // Unix
- #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
--  int main( int argc, char *argv[] )                  \
-+  int main( int, char *[] )                           \
-   {                                                   \
-     return 0;                                         \
-   }                                                   \
diff --git a/cppunit/windows.patch b/cppunit/windows.patch
deleted file mode 100644
index 9c510bb..0000000
--- a/cppunit/windows.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:25.084658287 +0100
-+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h	2010-01-11 14:42:18.660706180 +0100
-@@ -133,9 +133,8 @@
- /*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
-  * \brief Implements the 'main' function for the plug-in.
-  *
-- * This macros implements the main() function for dynamic library.
-- * For example, WIN32 requires a DllMain function, while some Unix 
-- * requires a main() function. This macros takes care of the implementation.
-+ * This macro implements the main() function for dynamic library
-+ * on Unix for some weird reason.
-  */
- 
- // Win32
-@@ -149,21 +149,7 @@
- 
- // Win32
- #if defined(CPPUNIT_HAVE_WIN32_DLL_LOADER)
--#if !defined(APIENTRY)
--#define WIN32_LEAN_AND_MEAN 
--#define NOGDI
--#define NOUSER
--#define NOKERNEL
--#define NOSOUND
--#define NOMINMAX
--#define BLENDFUNCTION void    // for mingw & gcc
--#include <windows.h>
--#endif
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN()               \
--  BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID )      \
--  {                                                   \
--      return TRUE;                                    \
--  }                                                   \
-   typedef char __CppUnitPlugInImplementMainDummyTypeDef
- 
- // Unix
---- misc/cppunit-1.12.1/include/cppunit/TestAssert.h
-+++ misc/build/cppunit-1.12.1/include/cppunit/TestAssert.h
-@@ -76,7 +76,7 @@
-        const int precision = 15;
- #endif  // #ifdef DBL_DIG
-        char buffer[128];
--#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning.
-+#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
-        sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); 
- #else	
-        sprintf(buffer, "%.*g", precision, x); 
-
diff --git a/epm/epm-3.7.patch b/epm/epm-3.7.patch
deleted file mode 100644
index 02835bc..0000000
--- a/epm/epm-3.7.patch
+++ /dev/null
@@ -1,657 +0,0 @@
-diff -urN epm-3.7-old//bsd.c epm-3.7/bsd.c
---- misc/epm-3.7/bsd.c	2003-01-14 17:05:01.000000000 +0000
-+++ misc/build/epm-3.7/bsd.c	2010-04-19 22:52:32.000000000 +0000
-@@ -26,6 +26,13 @@
- 
- #include "epm.h"
- 
-+void cr2semicolon(char *command)
-+{
-+  int len, i;
-+  len=strlen(command);
-+  for (i=0;i<len;i++)
-+    if(*(command+i)=='\n') *(command+i)=';';
-+}
- 
- /*
-  * 'make_bsd()' - Make a FreeBSD software distribution package.
-@@ -149,8 +156,17 @@
- 
-   for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++)
-   {
-+#ifdef __FreeBSD__
-+    if (d->type == DEPEND_REQUIRES) {
-+      if (dist->relnumber)
-+	  fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname);
-+      else
-+	  fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname);
-+    }
-+#else
-     if (d->type == DEPEND_REQUIRES)
-       fprintf(fp, "@pkgdep %s", d->product);
-+#endif
-     else
- #ifdef __FreeBSD__
-      /*
-@@ -179,9 +195,11 @@
- 	        "         by the BSD packager.\n", stderr);
-           break;
-       case COMMAND_POST_INSTALL :
-+      cr2semicolon(c->command);
-           fprintf(fp, "@exec %s\n", c->command);
- 	  break;
-       case COMMAND_PRE_REMOVE :
-+      cr2semicolon(c->command);
-           fprintf(fp, "@unexec %s\n", c->command);
- 	  break;
-       case COMMAND_POST_REMOVE :
-@@ -199,7 +217,7 @@
-       */
- 
-       fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst);
--      fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group,
-+      fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group,
-               file->dst);
-       fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst);
-     }
-@@ -326,12 +344,13 @@
-   if (Verbosity)
-     puts("Building FreeBSD pkg binary distribution...");
- 
--  if (run_command(NULL, "pkg_create -p / -s %s -c %s -d %s -f %s %s",
-+  if (run_command(NULL, "/usr/sbin/pkg_create -p / -s %s -c %s -d %s -f %s %s",
-                   current, commentname, descrname, plistname, name))
-     return (1);
- 
--  if (run_command(NULL, "mv %s.tgz %s", name, directory))
--    return (1);
-+  if (run_command(NULL, "mv %s.tbz %s", name, directory))
-+    if (run_command(NULL, "mv %s.tgz %s", name, directory))
-+      return (1);
- 
-  /*
-   * Remove temporary files...
-diff -urN epm-3.7-old//configure epm-3.7/configure
---- misc/epm-3.7/configure	2003-07-24 01:20:54.000000000 +0000
-+++ misc/build/epm-3.7/configure	2010-04-19 22:52:32.000000000 +0000
-@@ -1238,6 +1238,11 @@
- fi
- fi;
- 
-+# Check whether --enable-fltk or --disable-fltk was given.
-+if test "${enable_fltk+set}" = set; then
-+  enableval="$enable_fltk"
-+fi;
-+
- 
- # Check whether --with-docdir or --without-docdir was given.
- if test "${with_docdir+set}" = set; then
-@@ -4904,36 +4909,38 @@
- fi
- 
- 
--# Extract the first word of "fltk-config", so it can be a program name with args.
--set dummy fltk-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_FLTKCONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $FLTKCONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_FLTKCONFIG="$FLTKCONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_FLTKCONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
-+if eval "test x$enable_fltk = xyes"; then
-+  # Extract the first word of "fltk-config", so it can be a program name with args.
-+  set dummy fltk-config; ac_word=$2
-+  echo "$as_me:$LINENO: checking for $ac_word" >&5
-+  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+  if test "${ac_cv_path_FLTKCONFIG+set}" = set; then
-+    echo $ECHO_N "(cached) $ECHO_C" >&6
-+  else
-+    case $FLTKCONFIG in
-+    [\\/]* | ?:[\\/]*)
-+    ac_cv_path_FLTKCONFIG="$FLTKCONFIG" # Let the user override the test with a path.
-+    ;;
-+    *)
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+  for as_dir in $PATH
-+  do
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+      ac_cv_path_FLTKCONFIG="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+    fi
-+  done
-+  done
-+  
-+    ;;
-+  esac
-   fi
--done
--done
--
--  ;;
--esac
-+  FLTKCONFIG=$ac_cv_path_FLTKCONFIG
- fi
--FLTKCONFIG=$ac_cv_path_FLTKCONFIG
- 
- if test -n "$FLTKCONFIG"; then
-   echo "$as_me:$LINENO: result: $FLTKCONFIG" >&5
-@@ -4950,8 +4957,10 @@
- 	INSTALL_GUIS=""
- 	INSTALL_OSX=""
- 
-+if eval "test x$enable_fltk = xyes"; then
- 	{ echo "$as_me:$LINENO: WARNING: Sorry, setup GUI requires FLTK 1.1.x." >&5
- echo "$as_me: WARNING: Sorry, setup GUI requires FLTK 1.1.x." >&2;}
-+fi
- else
- 	CXXFLAGS="`$FLTKCONFIG --cflags` ${CXXFLAGS}"
- 	GUIS="setup uninst"
-diff -urN epm-3.7-old//deb.c epm-3.7/deb.c
---- misc/epm-3.7/deb.c	2003-01-15 14:29:24.000000000 +0000
-+++ misc/build/epm-3.7/deb.c	2010-04-19 22:53:34.000000000 +0000
-@@ -26,6 +26,28 @@
- 
- #include "epm.h"
- 
-+/*
-+ * 'add_size()' - Append Installed-Size tag to DEBIAN/control file
-+ */
-+ 
-+int                             /* O - 0 = success, 1 = fail */
-+add_size(FILE       *fpControl, /* Control file stream */
-+         const char *directory) /* Directory containing all files to package */
-+{
-+    FILE *fp;
-+    char command[1024];
-+    
-+    snprintf(command, sizeof(command), "du -k -s %s", directory);
-+    fp = popen(command, "r");
-+    if( NULL != fp )
-+    {
-+        char size[1024];
-+        fscanf(fp, "%s .", size);
-+        fprintf(fpControl, "Installed-Size: %s\n", size);
-+        return pclose(fp);
-+    }
-+    return 1;
-+}
- 
- /*
-  * 'make_deb()' - Make a Debian software distribution package.
-@@ -61,18 +83,37 @@
-   if (Verbosity)
-     puts("Creating Debian distribution...");
- 
-+  /*
-+   * Use debian default naming scheme
-+   */
-+
-+  if (!strcmp(platform->machine, "intel"))
-+#ifdef __FreeBSD_kernel__
-+    platname = "kfreebsd-i386";
-+#else
-+    platname = "i386";
-+#endif
-+  else if (!strcmp(platform->machine, "x86_64"))
-+#ifdef __FreeBSD_kernel__
-+    platname = "kfreebsd-amd64";
-+#else
-+    platname = "amd64";
-+#endif
-+  else if (!strcmp(platform->machine, "ppc"))
-+    platname = "powerpc";
-+
-   if (dist->relnumber)
-   {
-     if (platname[0])
--      snprintf(name, sizeof(name), "%s-%s-%d-%s", prodname, dist->version, dist->relnumber,
-+      snprintf(name, sizeof(name), "%s_%s-%d_%s", prodname, dist->version, dist->relnumber,
-               platname);
-     else
--      snprintf(name, sizeof(name), "%s-%s-%d", prodname, dist->version, dist->relnumber);
-+      snprintf(name, sizeof(name), "%s_%s-%d", prodname, dist->version, dist->relnumber);
-   }
-   else if (platname[0])
--    snprintf(name, sizeof(name), "%s-%s-%s", prodname, dist->version, platname);
-+    snprintf(name, sizeof(name), "%s_%s_%s", prodname, dist->version, platname);
-   else
--    snprintf(name, sizeof(name), "%s-%s", prodname, dist->version);
-+    snprintf(name, sizeof(name), "%s_%s", prodname, dist->version);
- 
-  /*
-   * Write the control file for DPKG...
-@@ -108,8 +141,20 @@
-   * (which we change in get_platform to a common name)
-   */
- 
--  if (strcmp(platform->machine, "intel") == 0)
-+  if (!strcmp(platform->machine, "intel"))
-+#ifdef __FreeBSD_kernel__
-+    fputs("Architecture: kfreebsd-i386\n", fp);
-+#else
-     fputs("Architecture: i386\n", fp);
-+#endif
-+  else if (!strcmp(platform->machine, "x86_64"))
-+#ifdef __FreeBSD_kernel__
-+    fputs("Architecture: kfreebsd-amd64\n", fp);
-+#else
-+    fputs("Architecture: amd64\n", fp);
-+#endif
-+  else if (!strcmp(platform->machine, "ppc"))
-+    fputs("Architecture: powerpc\n", fp);
-   else
-     fprintf(fp, "Architecture: %s\n", platform->machine);
- 
-@@ -148,9 +193,9 @@
-       putc('\n', fp);
-     }
-   }
--
-+  
-   fclose(fp);
--
-+  
-  /*
-   * Write the preinst file for DPKG...
-   */
-@@ -417,6 +462,27 @@
-     }
-   }
- 
-+  
-+  /* 
-+   * Calculate and append Installed-Size to DEBIAN/control
-+   */
-+   
-+  if (Verbosity)
-+    puts("Calculating Installed-Size...");
-+  
-+  snprintf(filename, sizeof(filename), "%s/%s/DEBIAN/control", directory, name);
-+  if ((fp = fopen(filename, "a")) == NULL)
-+  {
-+    fprintf(stderr, "epm: Unable to Installed-Size to file \"%s\" - %s\n", filename,
-+            strerror(errno));
-+    return (1);
-+  }
-+
-+  snprintf(filename, sizeof(filename), "%s/%s", directory, name);  
-+  add_size(fp, filename);
-+  fclose(fp);
-+ 
-+
-  /*
-   * Build the distribution from the spec file...
-   */
-diff -urN epm-3.7-old//dist.c epm-3.7/dist.c
---- misc/epm-3.7/dist.c	2003-08-07 14:14:40.000000000 +0000
-+++ misc/build/epm-3.7/dist.c	2010-04-19 22:52:32.000000000 +0000
-@@ -394,8 +394,13 @@
-   strcpy(platform->machine, "mips");
- #elif defined(__hpux)
-   strcpy(platform->machine, "hppa");
--#elif defined(_AIX) || defined(__APPLE__)
-+#elif defined(_AIX)
-   strcpy(platform->machine, "powerpc");
-+#elif defined(__APPLE__)
-+  if (strstr(platform->machine, "86") != NULL)
-+    strcpy(platform->machine, "intel");
-+  else
-+    strcpy(platform->machine, "powerpc");  
- #else
-   for (temp = platform->machine; *temp != '\0'; temp ++)
-     if (*temp == '-' || *temp == '_')
-@@ -407,7 +412,12 @@
-       *temp = tolower(*temp);
- 
-   if (strstr(platform->machine, "86") != NULL)
--    strcpy(platform->machine, "intel");
-+  {
-+    if (strstr(platform->machine, "64") != NULL)
-+      strcpy(platform->machine, "x86_64");
-+    else
-+      strcpy(platform->machine, "intel");
-+  }
-   else if (strncmp(platform->machine, "sun", 3) == 0)
-     strcpy(platform->machine, "sparc");
- #endif /* __sgi */
-diff -urN epm-3.7-old//epm.c epm-3.7/epm.c
---- misc/epm-3.7/epm.c	2003-10-28 14:48:30.000000000 +0000
-+++ misc/build/epm-3.7/epm.c	2010-04-19 22:52:32.000000000 +0000
-@@ -547,6 +547,7 @@
- {
-   puts(EPM_VERSION);
-   puts("Copyright 1999-2003 by Easy Software Products.");
-+  puts("Patched for OpenOffice.org");
-   puts("");
-   puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
-   puts("see the GNU General Public License in the file COPYING or at");
-diff -urN epm-3.7-old//file.c epm-3.7/file.c
---- misc/epm-3.7/file.c	2003-07-23 21:41:08.000000000 +0000
-+++ misc/build/epm-3.7/file.c	2010-04-19 22:52:32.000000000 +0000
-@@ -108,7 +108,6 @@
-   fclose(dstfile);
- 
-   chmod(dst, mode);
--  chown(dst, owner, group);
- 
-   return (0);
- }
-@@ -138,7 +137,6 @@
-       {
- 	mkdir(buffer, 0777);
- 	chmod(buffer, mode | 0700);
--	chown(buffer, owner, group);
-       }
-     }
- 
-@@ -151,7 +149,6 @@
-   {
-     mkdir(buffer, 0777);
-     chmod(buffer, mode | 0700);
--    chown(buffer, owner, group);
-   }
- 
-   return (0);
-diff -urN epm-3.7-old//osx.c epm-3.7/osx.c
---- misc/epm-3.7/osx.c	2003-07-23 21:41:08.000000000 +0000
-+++ misc/build/epm-3.7/osx.c	2010-04-19 22:52:32.000000000 +0000
-@@ -373,7 +373,7 @@
-   else
-     snprintf(filename, sizeof(filename), "%s/%s", current, directory);
- 
--  run_command(NULL, "/Developer/Applications/PackageMaker.app/"
-+  run_command(NULL, "/Developer/Applications/Utilities/PackageMaker.app/"
-                     "Contents/MacOS/PackageMaker -build "
- 		    "-p %s/%s.pkg -f %s/Package -r %s/Resources -d %s/%s-desc.plist -i %s/%s-info.plist",
- 	      filename, prodname, filename, filename, filename, prodname, filename, prodname);
-diff -urN epm-3.7-old//pkg.c epm-3.7/pkg.c
---- misc/epm-3.7/pkg.c	2002-12-17 18:57:56.000000000 +0000
-+++ misc/build/epm-3.7/pkg.c	2010-04-19 22:52:32.000000000 +0000
-@@ -429,75 +429,6 @@
- 
-   fclose(fp);
- 
-- /*
--  * Build the distribution from the prototype file...
--  */
--
--  if (Verbosity)
--    puts("Building PKG binary distribution...");
--
--  if (run_command(NULL, "pkgmk -o -f %s/%s.prototype -d %s/%s",
--                  directory, prodname, current, directory))
--    return (1);
--
-- /*
--  * Tar and compress the distribution...
--  */
--
--  if (Verbosity)
--    puts("Creating tar.gz file for distribution...");
--
--  snprintf(filename, sizeof(filename), "%s/%s.tar.gz", directory, name);
--
--  if ((tarfile = tar_open(filename, 1)) == NULL)
--    return (1);
--
--  snprintf(filename, sizeof(filename), "%s/%s", directory, prodname);
--
--  if (tar_directory(tarfile, filename, prodname))
--  {
--    tar_close(tarfile);
--    return (1);
--  }
--
--  tar_close(tarfile);
--
-- /*
--  * Make a package stream file...
--  */
--
--  if (Verbosity)
--    puts("Copying into package stream file...");
--
--  if (run_command(directory, "pkgtrans -s %s/%s %s.pkg %s",
--                  current, directory, name, prodname))
--    return (1);
--
-- /*
--  * Remove temporary files...
--  */
--
--  if (!KeepFiles)
--  {
--    if (Verbosity)
--      puts("Removing temporary distribution files...");
--
--    snprintf(filename, sizeof(filename), "%s/%s.pkginfo", directory, prodname);
--    unlink(filename);
--    snprintf(filename, sizeof(filename), "%s/%s.depend", directory, prodname);
--    unlink(filename);
--    snprintf(filename, sizeof(filename), "%s/%s.prototype", directory, prodname);
--    unlink(filename);
--    if (preinstall[0])
--      unlink(preinstall);
--    if (postinstall[0])
--      unlink(postinstall);
--    if (preremove[0])
--      unlink(preremove);
--    if (postremove[0])
--      unlink(postremove);
--  }
--
-   return (0);
- }
- 
-diff -urN epm-3.7-old//qprintf.c epm-3.7/qprintf.c
---- misc/epm-3.7-old/qprintf.c	2003-01-27 21:48:03.000000000 +0000
-+++ misc/build/epm-3.7/qprintf.c	2010-04-19 22:52:32.000000000 +0000
-@@ -181,12 +181,19 @@
- 
-             for (i = slen; i > 0; i --, s ++, bytes ++)
- 	    {
-+#if defined(__FreeBSD__)
-+	      if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s))
-+	      {
-+	        putc('\\', fp);
-+		bytes ++;
-+	      }
-+#else
- 	      if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s))
- 	      {
- 	        putc('\\', fp);
- 		bytes ++;
- 	      }
--
-+#endif
- 	      putc(*s, fp);
- 	    }
- 
-diff -urN epm-3.7-old//rpm.c epm-3.7/rpm.c
---- misc/epm-3.7/rpm.c	2003-10-01 19:27:15.000000000 +0000
-+++ misc/build/epm-3.7/rpm.c	2010-04-19 22:52:32.000000000 +0000
-@@ -38,7 +38,7 @@
-          dist_t         *dist,		/* I - Distribution information */
- 	 struct utsname *platform)	/* I - Platform information */
- {
--  int		i;			/* Looping var */
-+  int		i,n;			/* Looping vars */
-   FILE		*fp;			/* Spec file */
-   char		name[1024];		/* Full product name */
-   char		specname[1024];		/* Spec filename */
-@@ -160,6 +160,8 @@
-       fprintf(fp, "Requires: %s", dname);
-     else if (d->type == DEPEND_PROVIDES)
-       fprintf(fp, "Provides: %s", dname);
-+    else if (d->type == DEPEND_REPLACES)
-+      fprintf(fp, "Obsoletes: %s", dname);
-     else
-       fprintf(fp, "Conflicts: %s", dname);
- 
-@@ -186,15 +188,33 @@
-   for (i = 0; i < dist->num_descriptions; i ++)
-     fprintf(fp, "%s\n", dist->descriptions[i]);
- 
--  fputs("%pre\n", fp);
-+  /*
-+   * %pre
-+   */
-+  n = 0;
-   for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++)
-+  {
-     if (c->type == COMMAND_PRE_INSTALL)
-+    {
-+      if (1 == ++n)  /* Only write %pre if there is at least one command */
-+        fputs("%pre\n", fp);
-       fprintf(fp, "%s\n", c->command);
-+    }
-+  }
- 
--  fputs("%post\n", fp);
-+  /*
-+   * %post
-+   */
-+  n = 0;
-   for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++)
-+  {
-     if (c->type == COMMAND_POST_INSTALL)
-+    {
-+      if (1 == ++n)  /* Only write %post if there is at least one command */
-+        fputs("%post\n", fp);
-       fprintf(fp, "%s\n", c->command);
-+    }
-+  }
- 
-   for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
-     if (tolower(file->type) == 'i')
-@@ -202,6 +222,8 @@
- 
-   if (i)
-   {
-+    if (1 == ++n)  /* If not previously done so, write %post here */
-+      fputs("%post\n", fp);
-     fputs("if test \"x$1\" = x1; then\n", fp);
-     fputs("	echo Setting up init scripts...\n", fp);
- 
-@@ -259,13 +281,17 @@
-     fputs("fi\n", fp);
-   }
- 
--  fputs("%preun\n", fp);
-+  /*
-+   * %preun
-+   */
-+  n = 0;
-   for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
-     if (tolower(file->type) == 'i')
-       break;
- 
-   if (i)
-   {
-+    fputs("%preun\n", fp); ++n; /* Need to write %preun here */
-     fputs("if test \"x$1\" = x0; then\n", fp);
-     fputs("	echo Cleaning up init scripts...\n", fp);
- 
-@@ -315,13 +341,29 @@
-   }
- 
-   for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++)
-+  {
-     if (c->type == COMMAND_PRE_REMOVE)
-+    {
-+      if (1 == ++n)  /* Only write %preun if not previously done so */
-+        fputs("%preun\n", fp);
-+	    
-       fprintf(fp, "%s\n", c->command);
-+    }
-+  }
- 
--  fputs("%postun\n", fp);
-+  /*
-+   * %post
-+   */
-+  n = 0;
-   for (i = dist->num_commands, c = dist->commands; i > 0; i --, c ++)
-+  {
-     if (c->type == COMMAND_POST_REMOVE)
-+    {
-+      if (1 == ++n)  /* Only write %post if there is at least one command */
-+        fputs("%postun\n", fp);
-       fprintf(fp, "%s\n", c->command);
-+    }
-+  }
- 
-   fputs("%files\n", fp);
-   for (i = dist->num_files, file = dist->files; i > 0; i --, file ++)
-@@ -415,53 +457,6 @@
-     }
-   }
- 
-- /*
--  * Build the distribution from the spec file...
--  */
--
--  if (Verbosity)
--    puts("Building RPM binary distribution...");
--
--  if (strcmp(platform->machine, "intel") == 0)
--  {
--    if (run_command(NULL, EPM_RPMBUILD " %s -bb " EPM_RPMARCH "i386 %s",
--                    Verbosity == 0 ? "--quiet" : "", specname))
--      return (1);
--  }
--  else if (run_command(NULL, EPM_RPMBUILD " %s -bb " EPM_RPMARCH "%s %s",
--                       Verbosity == 0 ? "--quiet" : "", platform->machine,
--		       specname))
--    return (1);
--
-- /*
--  * Move the RPM to the local directory and rename the RPM using the
--  * product name specified by the user...
--  */
--
--  if (strcmp(platform->machine, "intel") == 0)
--    run_command(NULL, "/bin/mv %s/RPMS/i386/%s-%s-%d.i386.rpm %s/%s.rpm",
--        	rpmdir, prodname, dist->version, dist->relnumber,
--		directory, name);
--  else
--    run_command(NULL, "/bin/mv %s/RPMS/%s/%s-%s-%d.%s.rpm %s/%s.rpm",
--        	rpmdir, platform->machine, prodname, dist->version,
--		dist->relnumber, platform->machine, directory, name);
--
-- /*
--  * Remove temporary files...
--  */
--
--  if (!KeepFiles)
--  {
--    if (Verbosity)
--      puts("Removing temporary distribution files...");
--
--    run_command(NULL, "/bin/rm -rf %s/RPMS", directory);
--    run_command(NULL, "/bin/rm -rf %s/buildroot", directory);
--
--    unlink(specname);
--  }
--
-   return (0);
- }
- 
diff --git a/epm/makefile.mk b/epm/makefile.mk
deleted file mode 100644
index a33f607..0000000
--- a/epm/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=epm
-TARGET=epm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=epm-3.7
-TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4
-PATCH_FILES=epm-3.7.patch
-
-.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO"
-
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--disable-fltk
-.IF "$(OS)"=="MACOSX"
-.IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LINKFLAGS)" CPP="gcc -E $(EXTRA_CFLAGS)"
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF
-BUILD_ACTION=make
-OUT2BIN=epm epminstall mkepmlist
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/epm/prj/build.lst b/epm/prj/build.lst
deleted file mode 100644
index 1086d14..0000000
--- a/epm/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-ep	epm	:	solenv NULL
-ep	epm				nmake	-	u		ep_mkout NULL
diff --git a/epm/prj/d.lst b/epm/prj/d.lst
deleted file mode 100644
index 315d3d1..0000000
--- a/epm/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-..\%__SRC%\bin\epm %_DEST%\bin\epm
-..\%__SRC%\bin\epminstall %_DEST%\bin\epminstall
-..\%__SRC%\bin\mkepmlist %_DEST%\bin\mkepmlist
diff --git a/external/dbghelp/README_dbghelp.dll b/external/dbghelp/README_dbghelp.dll
deleted file mode 100644
index 984cf0e..0000000
--- a/external/dbghelp/README_dbghelp.dll
+++ /dev/null
@@ -1 +0,0 @@
-Put the dbghelp.dll in this directory for Windows builds.
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
deleted file mode 100644
index d40468c..0000000
--- a/external/gcc3_specific/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-PRJ=..
-PRJNAME=external
-TARGET=gcc3_specific
-
-# ------------------------------------------------------------------
-.INCLUDE: settings.mk
-# ------------------------------------------------------------------
-
-
-.IF "$(BUILD_SPECIAL)"==""
-
-.IF "$(GUI)" == "WNT"
-
-.IF "$(CROSS_COMPILING)" != "YES"
-# Don't do any of this weird and presumably obsolete crack when
-# cross-compiling
-
-.IF "$(COM)" == "GCC"
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL)
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL)
-.ENDIF
-
-all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL)
-
-$(BIN)$/mingwm10.dll :
-    $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/
-
-.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
-$(MINGWGCCDLL) :
-    $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/
-.ENDIF
-
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
-$(MINGWGXXDLL) :
-    $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/
-.ENDIF
-
-.ENDIF
-
-.ENDIF
-
-.ELSE
-
-.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
-
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-
-.EXPORT : CC
-
-.IF "$(OS)"=="AIX"
-
-all .SEQUENTIAL : $(LB)$/libstdc++.a $(LB)$/libgcc_s.a
-
-$(LB)$/libstdc++.a :
-    $(GCCINSTLIB) libstdc++.a $(LB)
-
-$(LB)$/libgcc_s.a :
-    $(GCCINSTLIB) libgcc_s.a $(LB)
-
-.ELSE
-
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
-
-
-$(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
-    $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
-
-$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
-    $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
-
-.ENDIF
-
-.ENDIF 
-
-.ENDIF
-
-.ENDIF
-.ENDIF			# "$(BUILD_SPECIAL)"==""
-
-
-.INCLUDE: target.mk
-
diff --git a/external/gdiplus/README_gdiplus.dll b/external/gdiplus/README_gdiplus.dll
deleted file mode 100644
index 1384669..0000000
--- a/external/gdiplus/README_gdiplus.dll
+++ /dev/null
@@ -1 +0,0 @@
-Put the gdiplus.dll in this directory for Windows builds.
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
deleted file mode 100644
index 49f570d..0000000
--- a/external/glibc-2.1.3.patch
+++ /dev/null
@@ -1,209 +0,0 @@
---- misc/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:50 2008
-+++ misc/build/glibc-2.1.3/posix/config.h	Mon Mar 31 09:43:26 2008
-@@ -1 +1,42 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#ifdef WNT
-+#include <stdlib.h>
-+#define getenv getenv
-+#endif
-+
-+
-+#if defined(MACOSX)
-+//Workaround for MACOS
-+#define getopt my_neues_getopt
-+#define opterr my_neues_opterr
-+#define optind my_neues_optind
-+#define optopt my_neues_optopt
-+#endif
-+
-+
---- misc/glibc-2.1.3/posix/getopt.h	Sun Aug 27 16:11:33 2000
-+++ misc/build/glibc-2.1.3/posix/getopt.h	Mon Mar 31 09:42:01 2008
-@@ -131,7 +131,7 @@
- /* Many other libraries have conflicting prototypes for getopt, with
-    differences in the consts, in stdlib.h.  To avoid compilation
-    errors, only prototype getopt for the GNU C library.  */
--extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-+extern int getopt (int argc, char *const *argv, const char *shortopts);
- # else /* not __GNU_LIBRARY__ */
- extern int getopt ();
- # endif /* __GNU_LIBRARY__ */
-@@ -137,14 +137,14 @@
- # endif /* __GNU_LIBRARY__ */
- 
- # ifndef __need_getopt
--extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
-+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- 		        const struct option *__longopts, int *__longind);
--extern int getopt_long_only (int __argc, char *const *__argv,
-+extern int getopt_long_only (int argc, char *const *argv,
- 			     const char *__shortopts,
- 		             const struct option *__longopts, int *__longind);
- 
- /* Internal only.  Users should not call this directly.  */
--extern int _getopt_internal (int __argc, char *const *__argv,
-+extern int _getopt_internal (int argc, char *const *argv,
- 			     const char *__shortopts,
- 		             const struct option *__longopts, int *__longind,
- 			     int __long_only);
---- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
-+++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,70 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=external
-+TARGET=gnu_getopt
-+LIBTARGET=NO
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+SOLARINC+=-I.. 
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+CDEFS+=-DHAVE_STRING_H  -DHAVE_CONFIG_H
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(HAVE_GETOPT)" != "YES"
-+OBJFILES=	$(OBJ)$/getopt.obj		\
-+			$(OBJ)$/getopt1.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(OBJFILES)
-+.ENDIF
-+
-+.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
-+TARGET2=gnu_readdir_r
-+OBJFILES+= $(OBJ)$/readdir_r.obj
-+LIB2TARGET=$(SLB)$/$(TARGET2).lib
-+LIB2ARCHIV=$(LB)$/lib$(TARGET2).a
-+LIB2OBJFILES= $(OBJ)$/readdir_r.obj
-+.ENDIF
-+
-+.IF "$(HAVE_READDIR_R)" == "YES" && "$(HAVE_GETOPT)" == "YES"
-+@all:
-+	@echo "Nothing to do here.
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
---- misc/glibc-2.1.3/posix/readdir_r.c	Mon Mar 31 09:43:50 2008
-+++ misc/build/glibc-2.1.3/posix/readdir_r.c	Mon Mar 31 09:42:01 2008
-@@ -1 +1,56 @@
--dummy
-+/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+#include <errno.h>
-+#include <limits.h>
-+#include <stddef.h>
-+#include <string.h>
-+#include <dirent.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <assert.h>
-+
-+#ifndef __READDIR_R
-+# define __READDIR_R readdir_r
-+# define DIRENT_TYPE struct dirent
-+#endif
-+
-+/* Read a directory entry from DIRP.  */
-+int
-+__READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result)
-+{
-+  DIRENT_TYPE *dp;
-+  size_t reclen;
-+
-+  errno = 0; 
-+  /* call our non-reentrant counterpart to get the information */
-+  dp = readdir(dirp);
-+
-+  /* copy the result into entry */
-+  if (dp != NULL) {
-+    reclen = dp->d_reclen;           /* This might be NetBSD-specific 
-+				      * Add #ifdef's if anything else needed */
-+    *result = memcpy(entry, dp, reclen); 
-+  } else {
-+    *result = NULL;
-+  }
-+
-+  return dp != NULL ? 0 : errno ? errno : 0; 
-+}
-+
-+
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
deleted file mode 100644
index f7a3b1e..0000000
--- a/external/glibc/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=external
-TARGET=getopt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(HAVE_GETOPT)" != "YES" || "$(HAVE_READDIR_R)" != "YES"
-TARFILE_NAME=glibc-2.1.3-stub
-TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
-TARFILE_ROOTDIR=glibc-2.1.3
-ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
-.IF "$(HAVE_READDIR_R)" != "YES"
-ADDITIONAL_FILES += posix$/readdir_r.c
-.ENDIF
-
-PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
-
-CONFIGURE_ACTION=
-
-BUILD_DIR=posix
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-OUT2INC= \
-    posix/getopt.h \
-    posix/config.h
-
-.ELSE
-@all:
-    @echo "Nothing to do here."
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/external/jawt/makefile.mk b/external/jawt/makefile.mk
deleted file mode 100644
index 469621d..0000000
--- a/external/jawt/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PRJ=..
-PRJNAME=external
-TARGET=libjawt
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)$(COM)" != "WNTGCC" ||  "$(CROSS_COMPILING)" != "YES"
-
-ALL:
-    @echo Nothing needed for this configuration
-
-.ENDIF
-
-all: $(LB)/libjawt.dll.a
-
-$(LB)/libjawt.dll.a:
-    (echo EXPORTS; echo JAWT_GetAWT@8) >$(MISC)/jawt.def
-    $(DLLTOOL) --input-def=$(MISC)/jawt.def --output-lib=$@ --dllname=jawt.dll
-
-.INCLUDE :  target.mk
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
deleted file mode 100644
index 1928a2c..0000000
--- a/external/mingwheaders/makefile.mk
+++ /dev/null
@@ -1,216 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=external
-TARGET=mingwheaders
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-
-.IF "$(CROSS_COMPILING)" != "YES"
-# Don't do any of this weird and presumably obsolete crack when
-# cross-compiling
-
-# Cygwin and MinGW use different directories for the W32API headers
-.IF "$(USE_MINGW)" == "cygwin"
-MINGW_INCLUDE_DIR=$/usr$/include/mingw/
-MINGW_W32API_INCLUDE_DIR=$/usr$/include/w32api/
-MINGW_W32API_LIB_DIR=$/usr$/include/w32api/
-.ELSE
-MINGW_INCLUDE_DIR=$(COMPATH)$/include/
-MINGW_W32API_INCLUDE_DIR=$(COMPATH)$/include/
-MINGW_W32API_LIB_DIR=$(COMPATH)$/lib/
-.ENDIF
-
-SYS_INCLUDE_DIR=$(MINGW_INCLUDE_DIR)$/sys/
-
-PSDK_INCLUDE_DIR=$(PSDK_HOME)$/include$/
-
-ATL_INCLUDE_DIR=$(PSDK_HOME)$/include$/atl$/
-
-DIRECTXSDK_INCLUDE_DIR=$(DIRECTXSDK_HOME)$/include$/
-
-FILES_TO_COPY_FROM_MINGW= \
-    excpt.h \
-     tchar.h
-
-FILES_TO_COPY_FROM_W32API= \
-    amvideo.h \
-    basetyps.h \
-    objidl.h \
-    specstrings.h \
-    uxtheme.h \
-    winbase.h \
-    windef.h \
-    wininet.h \
-    winver.h \
-    wtypes.h
-
-FILES_TO_COPY_FROM_SYS= \
-    stat.h
-
-FILES_TO_COPY_FROM_PSDK= \
-    adoctint.h \
-    adodef.h \
-    adoguids.h \
-    adoint.h \
-    bcrypt.h \
-    commctrl.h \
-    control.h \
-    dispex.h \
-    filter.h \
-    gdiplusbitmap.h \
-    gdiplusbrush.h \
-    gdiplusenums.h \
-    gdiplusfont.h \
-    gdiplusheaders.h \
-    gdiplusimageattributes.h \
-    gdiplusimaging.h \
-    gdiplusmatrix.h \
-    gdipluspath.h \
-    gdipluspen.h \
-    gdiplusregion.h \
-    gdiplusstringformat.h \
-    imm.h \
-    imagehlp.h \
-    mapiwin.h \
-    msdasc.h \
-    msi.h \
-    msiquery.h \
-    multimon.h \
-    ntquery.h \
-    oaidl.h \
-    ocidl.h \
-    oleauto.h \
-    olectl.h \
-    oledb.h \
-    oleidl.h \
-    propidl.h \
-    propkeydef.h \
-    propsys.h \
-    propvarutil.h \
-    shlobj.h \
-    shobjidl.h \
-    shtypes.h \
-    sspi.h \
-    strmif.h \
-    strsafe.h \
-    structuredquery.h \
-    urlmon.h \
-    wincrypt.h \
-    winerror.h \
-    wingdi.h \
-    wintrust.h \
-    winuser.h \
-    wspiapi.h \
-    exdispid.h \
-    dshow.h \
-    gdiplus.h \
-    msxml.h \
-    ncrypt.h \
-    shlguid.h \
-    transact.h
-
-.IF "$(DISABLE_ATL)"==""
-MINGWHEADER_ATL_PATCH_TARGET=$(MISC)$/mingwheader_atl_patch
-MINGWHEADER_ATL_COPY_TARGET=$(MISC)$/mingwheader_atl_copy
-FILES_TO_COPY_FROM_ATL= \
-    atlbase.h \
-    atlcom.h \
-    atlconv.h \
-    atlctl.h \
-    atlwin.h \
-    statreg.h
-.ENDIF
-
-FILES_TO_COPY_FROM_DIRECTXSDK= \
-    d3dtypes.h \
-    d3dx9core.h \
-    d3dx9math.h \
-    d3dx9math.inl \
-    dxtrans.h \
-    d3dx9.h
-
-$(MISC)$/mingwheader_patch_all : $(MISC)$/mingwheader_patch $(MINGWHEADER_ATL_PATCH_TARGET) $(LB)$/libmsvcrt.a
-
-$(MISC)$/mingwheader_patch : $(MISC)$/mingwheader_copy
-    patch -bd $(MISC)$/mingw -p0 -N -f -Z <mingw_headers.patch
-    $(TOUCH) $(MISC)$/mingwheader_patch
-
-.IF "$(DISABLE_ATL)"==""
-$(MINGWHEADER_ATL_PATCH_TARGET) : $(MINGWHEADER_ATL_COPY_TARGET)
-    patch -bd $(MISC)$/mingw -p0 -N -f -Z <mingw_atl_headers.patch
-    $(TOUCH) $(MINGWHEADER_ATL_PATCH_TARGET)
-.ENDIF
-
-$(MISC)$/mingwheader_copy:
-    $(MKDIRHIER) $(MISC)$/mingw$/include
-    $(MKDIRHIER) $(MISC)$/mingw$/include/sys
-    $(COPY) $(FILES_TO_COPY_FROM_MINGW:^$(MINGW_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(COPY) $(FILES_TO_COPY_FROM_W32API:^$(MINGW_W32API_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(COPY) $(FILES_TO_COPY_FROM_SYS:^$(SYS_INCLUDE_DIR)) $(MISC)$/mingw$/include$/sys
-    $(COPY) $(FILES_TO_COPY_FROM_PSDK:^$(PSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(COPY) $(FILES_TO_COPY_FROM_DIRECTXSDK:^$(DIRECTXSDK_INCLUDE_DIR)) $(MISC)$/mingw$/include
-    $(TOUCH) $(MISC)$/mingwheader_copy
-
-.IF "$(DISABLE_ATL)"==""
-$(MINGWHEADER_ATL_COPY_TARGET):
-    $(MKDIRHIER) $(MISC)$/mingw$/include/atl
-    $(COPY) $(FILES_TO_COPY_FROM_ATL:^$(ATL_INCLUDE_DIR)) $(MISC)$/mingw$/include$/atl
-     $(TOUCH) $(MINGWHEADER_ATL_COPY_TARGET)
-.ENDIF
-
-$(LB)$/libmsvcrt.a:
-.IF "$(USE_MINGW)" == "cygwin"
-    $(COPY) $(COMPATH)$/lib/mingw/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
-.ELSE
-    $(COPY) $(COMPATH)$/lib/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
-.ENDIF
-    cd $(LB) && ar -x libmsvcrt_orig.a ofmt_stub.o
-    ar -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
-    nm -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
-    echo EXPORTS > $(MISC)$/msvcrt.def
-    sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def
-    -sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \
-        sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def
-    cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def
-    dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
-    cd $(LB) && ar -rs libmsvcrt.a ofmt_stub.o
-
-clean:
-    -$(RM) $(MISC)$/mingw$/include$/*.h
-    -$(RM) $(MISC)$/mingwheader_copy
-    -$(RM) $(MISC)$/mingwheader_patch
-
-.ENDIF
-
-.ENDIF
-
-.INCLUDE :  target.mk
-
diff --git a/external/mingwheaders/mingw_atl_headers.patch b/external/mingwheaders/mingw_atl_headers.patch
deleted file mode 100644
index bbcbb84..0000000
--- a/external/mingwheaders/mingw_atl_headers.patch
+++ /dev/null
@@ -1,1654 +0,0 @@
---- include/atl/atlbase.h.orig	2005-04-14 17:54:32.000000000 +0900
-+++ include/atl/atlbase.h	2007-12-23 14:38:02.467500000 +0900
-@@ -10,6 +10,9 @@
- 
- #ifndef __ATLBASE_H__
- #define __ATLBASE_H__
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef __cplusplus
-         #error ATL requires C++ compilation (use a .cpp suffix)
-@@ -73,19 +76,47 @@
- #define _ATL_TYPELIB_INDEX_LENGTH 10
- #define _ATL_QUOTES_SPACE 2
- 
--#pragma pack(push, _ATL_PACKING)
-+#pragma pack(push, 8)
- 
- #if defined(_ATL_DLL)
-         #pragma comment(lib, "atl.lib")
- #endif
- 
--extern "C" const __declspec(selectany) GUID LIBID_ATLLib = {0x44EC0535,0x400F,0x11D0,{0x9D,0xCD,0x00,0xA0,0xC9,0x03,0x91,0xD3}};
--extern "C" const __declspec(selectany) CLSID CLSID_Registrar = {0x44EC053A,0x400F,0x11D0,{0x9D,0xCD,0x00,0xA0,0xC9,0x03,0x91,0xD3}};
--extern "C" const __declspec(selectany) IID IID_IRegistrar = {0x44EC053B,0x400F,0x11D0,{0x9D,0xCD,0x00,0xA0,0xC9,0x03,0x91,0xD3}};
--extern "C" const __declspec(selectany) IID IID_IAxWinHostWindow = {0xb6ea2050,0x48a,0x11d1,{0x82,0xb9,0x0,0xc0,0x4f,0xb9,0x94,0x2e}};
--extern "C" const __declspec(selectany) IID IID_IAxWinAmbientDispatch = {0xb6ea2051,0x48a,0x11d1,{0x82,0xb9,0x0,0xc0,0x4f,0xb9,0x94,0x2e}};
--extern "C" const __declspec(selectany) IID IID_IInternalConnection = {0x72AD0770,0x6A9F,0x11d1,{0xBC,0xEC,0x00,0x60,0x08,0x8F,0x44,0x4E}};
--extern "C" const __declspec(selectany) IID IID_IDocHostUIHandlerDispatch = {0x425B5AF0,0x65F1,0x11d1,{0x96,0x11,0x00,0x00,0xF8,0x1E,0x0D,0x0D}};
-+#define __uuidof(I) IID_##I
-+
-+#include <excpt.h>
-+
-+namespace ATL
-+{
-+inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
-+{
-+   return (
-+      ((unsigned long *) &rguid1)[0] == ((unsigned long *) &rguid2)[0] &&
-+      ((unsigned long *) &rguid1)[1] == ((unsigned long *) &rguid2)[1] &&
-+      ((unsigned long *) &rguid1)[2] == ((unsigned long *) &rguid2)[2] &&
-+      ((unsigned long *) &rguid1)[3] == ((unsigned long *) &rguid2)[3]);
-+}
-+}
-+
-+#ifdef _INIT_ATL_COMMON_VARS
-+extern "C" const GUID LIBID_ATLLib = {0x44EC0535,0x400F,0x11D0,{0x9D,0xCD,0x00,0xA0,0xC9,0x03,0x91,0xD3}};
-+extern "C" const CLSID CLSID_Registrar = {0x44EC053A,0x400F,0x11D0,{0x9D,0xCD,0x00,0xA0,0xC9,0x03,0x91,0xD3}};
-+extern "C" const IID IID_IRegistrar = {0x44EC053B,0x400F,0x11D0,{0x9D,0xCD,0x00,0xA0,0xC9,0x03,0x91,0xD3}};
-+extern "C" const IID IID_IAxWinHostWindow = {0xb6ea2050,0x48a,0x11d1,{0x82,0xb9,0x0,0xc0,0x4f,0xb9,0x94,0x2e}};
-+extern "C" const IID IID_IAxWinAmbientDispatch = {0xb6ea2051,0x48a,0x11d1,{0x82,0xb9,0x0,0xc0,0x4f,0xb9,0x94,0x2e}};
-+extern "C" const IID IID_IInternalConnection = {0x72AD0770,0x6A9F,0x11d1,{0xBC,0xEC,0x00,0x60,0x08,0x8F,0x44,0x4E}};
-+extern "C" const IID IID_IDocHostUIHandlerDispatch = {0x425B5AF0,0x65F1,0x11d1,{0x96,0x11,0x00,0x00,0xF8,0x1E,0x0D,0x0D}};
-+#else
-+extern "C" {
-+extern const GUID LIBID_ATLLib;
-+extern const CLSID CLSID_Registrar;
-+extern const IID IID_IRegistrar;
-+extern const IID IID_IAxWinHostWindow;
-+extern const IID IID_IAxWinAmbientDispatch;
-+extern const IID IID_IInternalConnection;
-+extern const IID IID_IDocHostUIHandlerDispatch;
-+}
-+#endif
- 
- #ifndef _ATL_DLL_IMPL
- namespace ATL
-@@ -135,7 +166,7 @@
-                 IUnknown* p = NULL;
-                 if (pfnGetClassObject == NULL)
-                         return S_OK;
--                HRESULT hRes = pfnGetClassObject(pfnCreateInstance, IID_IUnknown, (LPVOID*) &p);
-+                HRESULT hRes = pfnGetClassObject((LPVOID)pfnCreateInstance, IID_IUnknown, (LPVOID*) &p);
-                 if (SUCCEEDED(hRes))
-                         hRes = CoRegisterClassObject(*pclsid, p, dwClsContext, dwFlags, &dwRegister);
-                 if (p != NULL)
-@@ -284,13 +315,15 @@
- };
- #pragma pack(pop)
- 
--PVOID __stdcall __AllocStdCallThunk(VOID);
--VOID  __stdcall __FreeStdCallThunk(PVOID);
-+//PVOID __stdcall __AllocStdCallThunk(VOID);
-+//VOID  __stdcall __FreeStdCallThunk(PVOID);
- 
--#define AllocStdCallThunk() __AllocStdCallThunk()
--#define FreeStdCallThunk(p) __FreeStdCallThunk(p)
-+//#define AllocStdCallThunk() __AllocStdCallThunk()
-+//#define FreeStdCallThunk(p) __FreeStdCallThunk(p)
- 
--#pragma comment(lib, "atlthunk.lib")
-+//#pragma comment(lib, "atlthunk.lib")
-+#define AllocStdCallThunk() HeapAlloc(GetProcessHeap(),0,sizeof(_stdcallthunk))
-+#define FreeStdCallThunk(p) HeapFree(GetProcessHeap(), 0, p)
- 
- #elif defined (_M_AMD64)
- #pragma pack(push,2)
-@@ -465,7 +498,7 @@
-         return( HRESULT_FROM_WIN32( nError ) );
- }
- 
--inline void __declspec(noreturn) _AtlRaiseException( DWORD dwExceptionCode, DWORD dwExceptionFlags = EXCEPTION_NONCONTINUABLE )
-+inline void _AtlRaiseException( DWORD dwExceptionCode, DWORD dwExceptionFlags = EXCEPTION_NONCONTINUABLE )
- {
-         RaiseException( dwExceptionCode, dwExceptionFlags, 0, NULL );
- }
-@@ -658,6 +691,7 @@
- class _NoAddRefReleaseOnCComPtr : public T
- {
-         private:
-+                _NoAddRefReleaseOnCComPtr();
-                 STDMETHOD_(ULONG, AddRef)()=0;
-                 STDMETHOD_(ULONG, Release)()=0;
- };
-@@ -781,6 +815,7 @@
-         {
-                 return AtlAdvise(p, pUnk, iid, pdw);
-         }
-+#if 0
-         HRESULT CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter = NULL, DWORD dwClsContext = CLSCTX_ALL)
-         {
-                 ATLASSERT(p == NULL);
-@@ -801,11 +836,12 @@
-                 ATLASSERT(pp != NULL && *pp == NULL);
-                 return p->QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
-         T* p;
- };
- 
- 
--template <class T, const IID* piid = &__uuidof(T)>
-+template <class T, const IID* piid>
- class CComQIPtr
- {
- public:
-@@ -933,6 +969,7 @@
-         {
-                 return AtlAdvise(p, pUnk, iid, pdw);
-         }
-+#if 0
-         HRESULT CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter = NULL, DWORD dwClsContext = CLSCTX_ALL)
-         {
-                 ATLASSERT(p == NULL);
-@@ -953,6 +990,7 @@
-                 ATLASSERT(pp != NULL && *pp == NULL);
-                 return p->QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
-         T* p;
- };
- 
-@@ -1087,12 +1125,14 @@
-                         hr = ::CoCreateInstance(clsid, pUnkOuter, dwClsContext, __uuidof(IUnknown), (void**)&p);
-                 return hr;
-         }
-+#if 0
-         template <class Q>
-         HRESULT QueryInterface(Q** pp)
-         {
-                 ATLASSERT(pp != NULL && *pp == NULL);
-                 return p->QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
-         IUnknown* p;
- };
- 
-@@ -1257,21 +1297,26 @@
- 		LeaveCriticalSection(&m_sec);
- 		return S_OK;
- 	}
-+	static void _InitHandler(void *pData, LPEXCEPTION_POINTERS ep)
-+	  {
-+	    HRESULT &hRes=*reinterpret_cast<HRESULT*>(pData);
-+			if (STATUS_NO_MEMORY == ep->ExceptionRecord->ExceptionCode)
-+				hRes = E_OUTOFMEMORY;
-+			else
-+				hRes = E_FAIL;
-+	  }
- 	HRESULT Init() throw()
- 	{
- 		HRESULT hRes = S_OK;
--		__try
--		{
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-+                {
-+                        _sehandler.Set(_sejmpbuf, &hRes, reinterpret_cast<__SEHandler::PF>(EXCEPTION_EXECUTE_HANDLER), _InitHandler);
- 			InitializeCriticalSection(&m_sec);
--		}
-+                }
- 		// structured exception may be raised in low memory situations
--		__except(EXCEPTION_EXECUTE_HANDLER)
--		{
--			if (STATUS_NO_MEMORY == GetExceptionCode())
--				hRes = E_OUTOFMEMORY;
--			else
--				hRes = E_FAIL;
--		}
-+                _sehandler.Reset();
- 		return hRes;
- 	}
- 
-@@ -2799,10 +2844,19 @@
- 
- 
- class CComModule;
--__declspec(selectany) CComModule* _pModule=NULL;
-+#ifdef _INIT_ATL_COMMON_VARS
-+CComModule* _pModule=NULL;
-+#else
-+extern CComModule* _pModule;
-+#endif
-+
- 
- // {B62F5910-6528-11d1-9611-0000F81E0D0D}
--_declspec(selectany) GUID GUID_ATLVer30 = { 0xb62f5910, 0x6528, 0x11d1, { 0x96, 0x11, 0x0, 0x0, 0xf8, 0x1e, 0xd, 0xd } };
-+#ifdef _INIT_ATL_COMMON_VARS
-+GUID GUID_ATLVer30 = { 0xb62f5910, 0x6528, 0x11d1, { 0x96, 0x11, 0x0, 0x0, 0xf8, 0x1e, 0xd, 0xd } };
-+#else
-+extern GUID GUID_ATLVer30;
-+#endif
- 
- class CComModule : public _ATL_MODULE
- {
-@@ -4286,7 +4340,9 @@
- 
- #endif
- 
--__declspec(selectany) GUID CComModule::m_libid = {0x0,0x0,0x0,{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}};
-+#ifdef _INIT_ATL_COMMON_VARS
-+GUID CComModule::m_libid = {0x0,0x0,0x0,{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}};
-+#endif
- 
- #ifdef _ATL_STATIC_REGISTRY
- #define UpdateRegistryFromResource UpdateRegistryFromResourceS
-@@ -4355,7 +4411,9 @@
-         LONG m_nLockCnt;
- };
- 
--__declspec(selectany) UINT CComApartment::ATL_CREATE_OBJECT = 0;
-+#ifdef _INIT_ATL_COMMON_VARS
-+UINT CComApartment::ATL_CREATE_OBJECT = 0;
-+#endif
- 
- class CComSimpleThreadAllocator
- {
-@@ -5855,6 +5913,10 @@
-                 }
- 
-         }
-+        static int _Except(void *pThis, LPEXCEPTION_POINTERS lpEP)
-+        {
-+	  return reinterpret_cast<CVirtualBuffer *>(pThis)->Except(lpEP);
-+	}
-         void Seek(int nElement)
-         {
-                 if(nElement < 0 || nElement >= m_nMaxElements)
-@@ -5866,41 +5928,53 @@
-         {
-                 if(nElement < 0 || nElement >= m_nMaxElements)
-                         _AtlRaiseException((DWORD)EXCEPTION_ARRAY_BOUNDS_EXCEEDED);                
--                __try
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-                 {
-+                        _sehandler.Set(_sejmpbuf, this, _Except);
-                         T* p = &m_pBase[nElement];
-                         *p = Element;
-                         m_pTop = p > m_pTop ? p : m_pTop;
-                 }
--                __except(Except(GetExceptionInformation()))
-+                else
-                 {
-                 }
-+                _sehandler.Reset();
- 
-         }
-         template <class Q>
-         void WriteBulk(Q& helper)
-         {
--                __try
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-                 {
-+                        _sehandler.Set(_sejmpbuf, this, _Except);
-                         m_pCurrent = helper(m_pBase);
-                         m_pTop = m_pCurrent > m_pTop ? m_pCurrent : m_pTop;
-                 }
--                __except(Except(GetExceptionInformation()))
-+                else
-                 {
-                 }
-+                _sehandler.Reset();
-         }
-         void Write(const T& Element)
-         {
-             if (m_pCurrent < &m_pBase[m_nMaxElements]) {
--                __try
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-                 {
-+                    _sehandler.Set(_sejmpbuf, this, _Except);
-                     *m_pCurrent = Element;
-                     m_pCurrent++;
-                     m_pTop = m_pCurrent > m_pTop ? m_pCurrent : m_pTop; 
-                 }
--                __except(Except(GetExceptionInformation()))
-+                else
-                 {
-                 }
-+                _sehandler.Reset();
-             }
-         }
-         T& Read()
-@@ -5910,14 +5984,18 @@
-         operator BSTR()
-         {
-                 BSTR bstrTemp = NULL ;
--                __try
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-                 {
-+                        _sehandler.Set(_sejmpbuf, this, _Except);
-                         bstrTemp = SysAllocStringByteLen((char*) m_pBase,
-                                 (UINT) ((BYTE*)m_pTop - (BYTE*)m_pBase));
-                 }
--                __except(Except(GetExceptionInformation()))
-+                else
-                 {
-                 }
-+                _sehandler.Reset();
-                 return bstrTemp;
-         }
-         const T& operator[](int nElement) const
-@@ -6336,6 +6414,11 @@
- //Although these functions are big, they are only used once in a module
- //so we should make them inline.
- 
-+ATLINLINE int atlmoduleinitfilter(void *, LPEXCEPTION_POINTERS ep)
-+{
-+  return ep->ExceptionRecord->ExceptionCode == STATUS_NO_MEMORY ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH;
-+}
-+
- ATLINLINE ATLAPI AtlModuleInit(_ATL_MODULE* pM, _ATL_OBJMAP_ENTRY* p, HINSTANCE h)
- {
-         ATLASSERT(pM != NULL);
-@@ -6352,32 +6435,43 @@
-         pM->m_hInst = pM->m_hInstTypeLib = pM->m_hInstResource = h;
-         pM->m_nLockCnt=0L;
-         pM->m_hHeap = NULL;
--        __try {
-+        jmp_buf _sejmpbuf;
-+        __SEHandler _sehandler;
-+        if (__builtin_setjmp(_sejmpbuf) == 0) {
-+            _sehandler.Set(_sejmpbuf, NULL, atlmoduleinitfilter);
-             InitializeCriticalSection(&pM->m_csTypeInfoHolder);
--        } __except (GetExceptionCode() == STATUS_NO_MEMORY ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
-+        } else {
-             ZeroMemory(&pM->m_csTypeInfoHolder, sizeof(pM->m_csTypeInfoHolder));
--            return STATUS_NO_MEMORY;
-+            _sehandler.Reset();
-+	    return STATUS_NO_MEMORY;
-         }
-+        _sehandler.Reset();
- 
--        __try {
-+        if (__builtin_setjmp(_sejmpbuf) == 0) {
-+            _sehandler.Set(_sejmpbuf, NULL, atlmoduleinitfilter);
-             InitializeCriticalSection(&pM->m_csWindowCreate);
--        } __except (GetExceptionCode() == STATUS_NO_MEMORY ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
-+        } else {
-             DeleteCriticalSection(&pM->m_csTypeInfoHolder);
-             ZeroMemory(&pM->m_csWindowCreate, sizeof(pM->m_csWindowCreate));
-             ZeroMemory(&pM->m_csTypeInfoHolder, sizeof(pM->m_csTypeInfoHolder));
-+            _sehandler.Reset();
-             return STATUS_NO_MEMORY;
-         }
-+        _sehandler.Reset();
- 
--        __try {
-+        if (__builtin_setjmp(_sejmpbuf) == 0) {
-+            _sehandler.Set(_sejmpbuf, NULL, atlmoduleinitfilter);
-             InitializeCriticalSection(&pM->m_csObjMap);
--        } __except (GetExceptionCode() == STATUS_NO_MEMORY ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
-+        } else {
-             DeleteCriticalSection(&pM->m_csWindowCreate);
-             DeleteCriticalSection(&pM->m_csTypeInfoHolder);
-             ZeroMemory(&pM->m_csObjMap, sizeof(pM->m_csObjMap));
-             ZeroMemory(&pM->m_csWindowCreate, sizeof(pM->m_csWindowCreate));
-             ZeroMemory(&pM->m_csTypeInfoHolder, sizeof(pM->m_csTypeInfoHolder));
-+            _sehandler.Reset();
-             return STATUS_NO_MEMORY;
-         }
-+        _sehandler.Reset();
- #ifdef _ATL_DLL_IMPL
-         if (pM->cbSize > _nAtlModuleVer21Size)
- #endif
-@@ -6450,6 +6544,11 @@
-         return hRes;
- }
- 
-+ATLINLINE void atlfinalleavecriticalsection(void *pData)
-+{
-+  LeaveCriticalSection(reinterpret_cast<LPCRITICAL_SECTION>(pData));
-+}
-+
- ATLINLINE ATLAPI AtlModuleGetClassObject(_ATL_MODULE* pM, REFCLSID rclsid, REFIID riid, LPVOID* ppv)
- {
-         ATLASSERT(pM != NULL);
-@@ -6473,15 +6572,15 @@
-                         if (pEntry->pCF == NULL)
-                         {
-                                 EnterCriticalSection(&pM->m_csObjMap);
--                                __try
-+                                jmp_buf _sejmpbuf;
-+                                __SEHandler _sehandler;
-+                                if (__builtin_setjmp(_sejmpbuf) == 0)
-                                 {
-+                                        _sehandler.Set(_sejmpbuf, &pM->m_csObjMap, EXCEPTION_CONTINUE_SEARCH, NULL, atlfinalleavecriticalsection);
-                                         if (pEntry->pCF == NULL)
--                                                hRes = pEntry->pfnGetClassObject(pEntry->pfnCreateInstance, IID_IUnknown, (LPVOID*)&pEntry->pCF);
--                                }
--                                __finally
--                                {
--                                        LeaveCriticalSection(&pM->m_csObjMap);
-+						hRes = pEntry->pfnGetClassObject((void *)(pEntry->pfnCreateInstance), IID_IUnknown, (LPVOID*)&pEntry->pCF);
-                                 }
-+                                _sehandler.Reset();
-                         }
-                         if (pEntry->pCF != NULL)
-                                 hRes = pEntry->pCF->QueryInterface(riid, ppv);
---- include/atl/atlcom.h.orig	2005-04-14 17:54:32.000000000 +0900
-+++ include/atl/atlcom.h	2007-12-03 22:43:54.833375000 +0900
-@@ -10,6 +10,9 @@
- 
- #ifndef __ATLCOM_H__
- #define __ATLCOM_H__
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef __cplusplus
-         #error ATL requires C++ compilation (use a .cpp suffix)
-@@ -19,7 +22,10 @@
-         #error atlcom.h requires atlbase.h to be included first
- #endif
- 
--#pragma pack(push, _ATL_PACKING)
-+#include <algorithm>
-+using ::std::min;
-+
-+#pragma pack(push, 8)
- 
- EXTERN_C const IID IID_ITargetFrame;
- 
-@@ -2191,19 +2197,23 @@
- // override it in your class and call each base class' version of this
- #define BEGIN_COM_MAP(x) public: \
-         typedef x _ComMapClass; \
-+        static void _CacheFinal(void *pData)\
-+        {\
-+                reinterpret_cast<_ComMapClass*>(pData)->Unlock();\
-+        }\
-         static HRESULT WINAPI _Cache(void* pv, REFIID iid, void** ppvObject, DWORD_PTR dw)\
-         {\
-                 _ComMapClass* p = (_ComMapClass*)pv;\
-                 p->Lock();\
-                 HRESULT hRes = E_FAIL; \
--                __try \
-+                jmp_buf _sejmpbuf; \
-+                __SEHandler _sehandler; \
-+                if (__builtin_setjmp(_sejmpbuf) == 0) \
-                 { \
-+                        _sehandler.Set(_sejmpbuf, p, EXCEPTION_CONTINUE_SEARCH, NULL, _CacheFinal);\
-                         hRes = CComObjectRootBase::_Cache(pv, iid, ppvObject, dw);\
-                 } \
--                __finally \
--                { \
--                        p->Unlock();\
--                } \
-+                _sehandler.Reset();\
-                 return hRes;\
-         }\
-         IUnknown* _GetRawUnknown() \
-@@ -2339,7 +2349,7 @@
-    return( pMap ); }
- 
- #define BEGIN_OBJECT_MAP(x) static _ATL_OBJMAP_ENTRY x[] = {
--#define END_OBJECT_MAP()   {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}};
-+#define END_OBJECT_MAP()   {NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL}};
- #define OBJECT_ENTRY(clsid, class) {&clsid, class::UpdateRegistry, class::_ClassFactoryCreatorClass::CreateInstance, class::_CreatorClass::CreateInstance, NULL, 0, class::GetObjectDescription, class::GetCategoryMap, class::ObjectMain },
- #define OBJECT_ENTRY_NON_CREATEABLE(class) {&CLSID_NULL, class::UpdateRegistry, NULL, NULL, NULL, 0, NULL, class::GetCategoryMap, class::ObjectMain },
- 
-@@ -2492,9 +2502,9 @@
- public:
-         typedef ThreadModel _ThreadModel;
- #ifdef OLD_ATL_CRITSEC_CODE
--        typename typedef _ThreadModel::AutoCriticalSection _CritSec;
-+        typedef typename _ThreadModel::AutoCriticalSection _CritSec;
- #else
--    	typename typedef _ThreadModel::AutoDeleteCriticalSection _AutoDelCritSec;
-+    	typedef typename _ThreadModel::AutoDeleteCriticalSection _AutoDelCritSec;
- #endif  /* OLD_ATL_CRITSEC_CODE */
-         typedef CComObjectLockT<_ThreadModel> ObjectLock;
- 
-@@ -2638,8 +2648,8 @@
-         // Set refcount to 1 to protect destruction
-         ~CComObject()
-         {
--                m_dwRef = 1L;
--                FinalRelease();
-+                this->m_dwRef = 1L;
-+                this->FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(_GetRawUnknown());
- #endif
-@@ -2647,22 +2657,24 @@
-         }
-         //If InternalAddRef or InternalRelease is undefined then your class
-         //doesn't derive from CComObjectRoot
--        STDMETHOD_(ULONG, AddRef)() {return InternalAddRef();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->InternalAddRef();}
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 return l;
-         }
-         //if _InternalQueryInterface is undefined then you forgot BEGIN_COM_MAP
-         STDMETHOD(QueryInterface)(REFIID iid, void ** ppvObject)
--        {return _InternalQueryInterface(iid, ppvObject);}
-+        {return this->_InternalQueryInterface(iid, ppvObject);}
-+#if 0
-         template <class Q>
-         HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
-         {
-                 return QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
- 
-         static HRESULT WINAPI CreateInstance(CComObject<Base>** pp);
- };
-@@ -2719,8 +2731,8 @@
- #endif  /* OLD_ATL_CRITSEC_CODE */
-         ~CComObjectCached()
-         {
--                m_dwRef = 1L;
--                FinalRelease();
-+                this->m_dwRef = 1L;
-+                this->FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(_GetRawUnknown());
- #endif
-@@ -2729,14 +2741,14 @@
-         //doesn't derive from CComObjectRoot
-         STDMETHOD_(ULONG, AddRef)()
-         {
--                ULONG l = InternalAddRef();
-+                ULONG l = this->InternalAddRef();
-                 if (l == 2)
-                         _Module.Lock();
-                 return l;
-         }
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 else if (l == 1)
-@@ -2745,7 +2757,7 @@
-         }
-         //if _InternalQueryInterface is undefined then you forgot BEGIN_COM_MAP
-         STDMETHOD(QueryInterface)(REFIID iid, void ** ppvObject)
--        {return _InternalQueryInterface(iid, ppvObject);}
-+        {return this->_InternalQueryInterface(iid, ppvObject);}
- #ifndef OLD_ATL_CRITSEC_CODE
-     	CComGlobalsThreadModel::AutoDeleteCriticalSection m_csCached;
- #endif  /* OLD_ATL_CRITSEC_CODE */
-@@ -2762,8 +2774,8 @@
-         // Set refcount to 1 to protect destruction
-         ~CComObjectNoLock()
-         {
--                m_dwRef = 1L;
--                FinalRelease();
-+                this->m_dwRef = 1L;
-+                this->FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(_GetRawUnknown());
- #endif
-@@ -2771,17 +2783,17 @@
- 
-         //If InternalAddRef or InternalRelease is undefined then your class
-         //doesn't derive from CComObjectRoot
--        STDMETHOD_(ULONG, AddRef)() {return InternalAddRef();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->InternalAddRef();}
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 return l;
-         }
-         //if _InternalQueryInterface is undefined then you forgot BEGIN_COM_MAP
-         STDMETHOD(QueryInterface)(REFIID iid, void ** ppvObject)
--        {return _InternalQueryInterface(iid, ppvObject);}
-+        {return this->_InternalQueryInterface(iid, ppvObject);}
- };
- 
- // It is possible for Base not to derive from CComObjectRoot
-@@ -2794,14 +2806,14 @@
-         CComObjectGlobal(void* = NULL)
-         {
- #ifndef OLD_ATL_CRITSEC_CODE
--			m_hResFinalConstruct = _AtlInitialConstruct();
-+			m_hResFinalConstruct = this->_AtlInitialConstruct();
- 			if (SUCCEEDED(m_hResFinalConstruct))
- #endif  /* OLD_ATL_CRITSEC_CODE */
--                m_hResFinalConstruct = FinalConstruct();
-+                m_hResFinalConstruct = this->FinalConstruct();
-         }
-         ~CComObjectGlobal()
-         {
--                FinalRelease();
-+                this->FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(_GetRawUnknown());
- #endif
-@@ -2810,7 +2822,7 @@
-         STDMETHOD_(ULONG, AddRef)() {return _Module.Lock();}
-         STDMETHOD_(ULONG, Release)(){return _Module.Unlock();}
-         STDMETHOD(QueryInterface)(REFIID iid, void ** ppvObject)
--        {return _InternalQueryInterface(iid, ppvObject);}
-+        {return this->_InternalQueryInterface(iid, ppvObject);}
-         HRESULT m_hResFinalConstruct;
- };
- 
-@@ -2824,14 +2836,14 @@
-         CComObjectStack(void* = NULL)
-         {
- #ifndef OLD_ATL_CRITSEC_CODE
--			m_hResFinalConstruct = _AtlInitialConstruct();
-+			m_hResFinalConstruct = this->_AtlInitialConstruct();
- 			if (SUCCEEDED(m_hResFinalConstruct))
- #endif  /* OLD_ATL_CRITSEC_CODE */
--                m_hResFinalConstruct = FinalConstruct();
-+                m_hResFinalConstruct = this->FinalConstruct();
-         }
-         ~CComObjectStack()
-         {
--                FinalRelease();
-+                this->FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(_GetRawUnknown());
- #endif
-@@ -2850,6 +2862,8 @@
- {
- public:
-         typedef Base _BaseClass;
-+        using Base::_GetRawUnknown;
-+        using Base::m_pOuterUnknown;
-         CComContainedObject(void* pv) {m_pOuterUnknown = (IUnknown*)pv;}
- #ifdef _ATL_DEBUG_INTERFACES
-         ~CComContainedObject()
-@@ -2859,20 +2873,22 @@
-         }
- #endif
- 
--        STDMETHOD_(ULONG, AddRef)() {return OuterAddRef();}
--        STDMETHOD_(ULONG, Release)() {return OuterRelease();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->OuterAddRef();}
-+        STDMETHOD_(ULONG, Release)() {return this->OuterRelease();}
-         STDMETHOD(QueryInterface)(REFIID iid, void ** ppvObject)
-         {
--                HRESULT hr = OuterQueryInterface(iid, ppvObject);
-+                HRESULT hr = this->OuterQueryInterface(iid, ppvObject);
-                 if (FAILED(hr) && _GetRawUnknown() != m_pOuterUnknown)
--                        hr = _InternalQueryInterface(iid, ppvObject);
-+                        hr = this->_InternalQueryInterface(iid, ppvObject);
-                 return hr;
-         }
-+#if 0
-         template <class Q>
-         HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
-         {
-                 return QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
-         //GetControllingUnknown may be virtual if the Base class has declared
-         //DECLARE_GET_CONTROLLING_UNKNOWN()
-         IUnknown* GetControllingUnknown()
-@@ -2915,18 +2931,18 @@
-         // override it in your class and call each base class' version of this
-         HRESULT FinalConstruct()
-         {
--                CComObjectRootEx<contained::_ThreadModel::ThreadModelNoCS>::FinalConstruct();
-+                CComObjectRootEx<typename contained::_ThreadModel::ThreadModelNoCS>::FinalConstruct();
-                 return m_contained.FinalConstruct();
-         }
-         void FinalRelease()
-         {
--                CComObjectRootEx<contained::_ThreadModel::ThreadModelNoCS>::FinalRelease();
-+                CComObjectRootEx<typename contained::_ThreadModel::ThreadModelNoCS>::FinalRelease();
-                 m_contained.FinalRelease();
-         }
-         // Set refcount to 1 to protect destruction
-         ~CComAggObject()
-         {
--                m_dwRef = 1L;
-+                this->m_dwRef = 1L;
-                 FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(this);
-@@ -2934,10 +2950,10 @@
-                 _Module.Unlock();
-         }
- 
--        STDMETHOD_(ULONG, AddRef)() {return InternalAddRef();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->InternalAddRef();}
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 return l;
-@@ -2959,11 +2975,13 @@
-                         hRes = m_contained._InternalQueryInterface(iid, ppvObject);
-                 return hRes;
-         }
-+#if 0
-         template <class Q>
-         HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
-         {
-                 return QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
-         static HRESULT WINAPI CreateInstance(LPUNKNOWN pUnkOuter, CComAggObject<contained>** pp)
-         {
-                 _ATL_VALIDATE_OUT_POINTER(pp);
-@@ -3023,21 +3041,21 @@
-         // override it in your class and call each base class' version of this
-         HRESULT FinalConstruct()
-         {
--                InternalAddRef();
--                CComObjectRootEx<contained::_ThreadModel::ThreadModelNoCS>::FinalConstruct();
-+                this->InternalAddRef();
-+                CComObjectRootEx<typename contained::_ThreadModel::ThreadModelNoCS>::FinalConstruct();
-                 HRESULT hr = m_contained.FinalConstruct();
--                InternalRelease();
-+                this->InternalRelease();
-                 return hr;
-         }
-         void FinalRelease()
-         {
--                CComObjectRootEx<contained::_ThreadModel::ThreadModelNoCS>::FinalRelease();
-+                CComObjectRootEx<typename contained::_ThreadModel::ThreadModelNoCS>::FinalRelease();
-                 m_contained.FinalRelease();
-         }
-         // Set refcount to 1 to protect destruction
-         ~CComPolyObject()
-         {
--                m_dwRef = 1L;
-+                this->m_dwRef = 1L;
-                 FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(this);
-@@ -3045,10 +3063,10 @@
-                 _Module.Unlock();
-         }
- 
--        STDMETHOD_(ULONG, AddRef)() {return InternalAddRef();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->InternalAddRef();}
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 return l;
-@@ -3072,11 +3090,13 @@
-                         hRes = m_contained._InternalQueryInterface(iid, ppvObject);
-                 return hRes;
-         }
-+#if 0
-         template <class Q>
-         HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)
-         {
-                 return QueryInterface(__uuidof(Q), (void**)pp);
-         }
-+#endif
-         static HRESULT WINAPI CreateInstance(LPUNKNOWN pUnkOuter, CComPolyObject<contained>** pp)
-         {
-                 _ATL_VALIDATE_OUT_POINTER(pp);
-@@ -3111,27 +3131,28 @@
- class CComTearOffObject : public Base
- {
- public:
-+        using Base::m_pOwner;
-         CComTearOffObject(void* pv)
-         {
-                 ATLASSERT(m_pOwner == NULL);
--                m_pOwner = reinterpret_cast<CComObject<Base::_OwnerClass>*>(pv);
-+                m_pOwner = reinterpret_cast<CComObject<typename Base::_OwnerClass>*>(pv);
-                 m_pOwner->AddRef();
-         }
-         // Set refcount to 1 to protect destruction
-         ~CComTearOffObject()
-         {
--                m_dwRef = 1L;
--                FinalRelease();
-+                this->m_dwRef = 1L;
-+                this->FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(_GetRawUnknown());
- #endif
-                 m_pOwner->Release();
-         }
- 
--        STDMETHOD_(ULONG, AddRef)() {return InternalAddRef();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->InternalAddRef();}
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 return l;
-@@ -3150,27 +3171,27 @@
- public:
-         typedef contained _BaseClass;
-         CComCachedTearOffObject(void* pv) :
--                m_contained(((contained::_OwnerClass*)pv)->GetControllingUnknown())
-+                m_contained(((typename contained::_OwnerClass*)pv)->GetControllingUnknown())
-         {
-                 ATLASSERT(m_contained.m_pOwner == NULL);
--                m_contained.m_pOwner = reinterpret_cast<CComObject<contained::_OwnerClass>*>(pv);
-+                m_contained.m_pOwner = reinterpret_cast<CComObject<typename contained::_OwnerClass>*>(pv);
-         }
-         //If you get a message that this call is ambiguous then you need to
-         // override it in your class and call each base class' version of this
-         HRESULT FinalConstruct()
-         {
--                CComObjectRootEx<contained::_ThreadModel::ThreadModelNoCS>::FinalConstruct();
-+                CComObjectRootEx<typename contained::_ThreadModel::ThreadModelNoCS>::FinalConstruct();
-                 return m_contained.FinalConstruct();
-         }
-         void FinalRelease()
-         {
--                CComObjectRootEx<contained::_ThreadModel::ThreadModelNoCS>::FinalRelease();
-+                CComObjectRootEx<typename contained::_ThreadModel::ThreadModelNoCS>::FinalRelease();
-                 m_contained.FinalRelease();
-         }
-         // Set refcount to 1 to protect destruction
-         ~CComCachedTearOffObject()
-         {
--                m_dwRef = 1L;
-+                this->m_dwRef = 1L;
-                 FinalRelease();
- #ifdef _ATL_DEBUG_INTERFACES
-                 _Module.DeleteNonAddRefThunk(this);
-@@ -3178,10 +3199,10 @@
-         }
- 
- 
--        STDMETHOD_(ULONG, AddRef)() {return InternalAddRef();}
-+        STDMETHOD_(ULONG, AddRef)() {return this->InternalAddRef();}
-         STDMETHOD_(ULONG, Release)()
-         {
--                ULONG l = InternalRelease();
-+                ULONG l = this->InternalRelease();
-                 if (l == 0)
-                         delete this;
-                 return l;
-@@ -3260,7 +3281,9 @@
- {
- public:
-         typedef license _LicenseClass;
--        typedef CComClassFactory2<license> _ComMapClass;
-+        using license::IsLicenseValid;
-+        using license::GetLicenseKey;
-+//        typedef CComClassFactory2<license> _ComMapClass;
- BEGIN_COM_MAP(CComClassFactory2<license>)
-         COM_INTERFACE_ENTRY(IClassFactory)
-         COM_INTERFACE_ENTRY(IClassFactory2)
-@@ -3297,7 +3320,7 @@
-                 if (ppvObject == NULL)
-                         return E_POINTER;
-                 *ppvObject = NULL;
--                if ( ((bstrKey != NULL) && !VerifyLicenseKey(bstrKey)) ||
-+                if ( ((bstrKey != NULL) && !this->VerifyLicenseKey(bstrKey)) ||
-                          ((bstrKey == NULL) && !IsLicenseValid()) )
-                         return CLASS_E_NOTLICENSED;
-                 if ((pUnkOuter != NULL) && !InlineIsEqualUnknown(riid))
-@@ -3363,7 +3386,7 @@
-                         if (pUnkOuter != NULL)
-                                 hRes = CLASS_E_NOAGGREGATION;
-                         else
--                                hRes = _Module.CreateInstance(m_pfnCreateInstance, riid, ppvObj);
-+                                hRes = _Module.CreateInstance((LPVOID)m_pfnCreateInstance, riid, ppvObj);
-                 }
-                 return hRes;
-         }
-@@ -3454,6 +3477,7 @@
-                         lpszHelpFile, iid, hRes);
-         }
- #endif
-+#if 0
-         template <class Q>
-         static HRESULT CreateInstance(IUnknown* punkOuter, Q** pp)
-         {
-@@ -3464,6 +3488,7 @@
-         {
-                 return T::_CreatorClass::CreateInstance(NULL, __uuidof(Q), (void**) pp);
-         }
-+#endif
- };
- 
- // ATL doesn't support multiple LCID's at the same time
-@@ -3651,7 +3676,7 @@
-                         {
-                                 CComPtr<ITypeInfo> spInfo(spTypeInfo);
-                                 CComPtr<ITypeInfo2> spTypeInfo2;
--                                if (SUCCEEDED(spTypeInfo->QueryInterface(&spTypeInfo2)))
-+                                if (SUCCEEDED(spTypeInfo->QueryInterface(IID_ITypeInfo2, (void**)&spTypeInfo2)))
-                                         spInfo = spTypeInfo2;
- 
-                                 m_pInfo = spInfo.Detach();
-@@ -3760,6 +3785,9 @@
- /////////////////////////////////////////////////////////////////////////////
- // IDispEventImpl
- 
-+template <class T>
-+struct _ATL_EVENT_ENTRY;
-+
- #ifdef _ATL_DLL
- ATLAPI AtlGetObjectSourceInterface(IUnknown* punkObj, GUID* plibid, IID* piid, unsigned short* pdwMajor, unsigned short* pdwMinor);
- #else
-@@ -3909,16 +3937,17 @@
- #else
- 
- #pragma warning(disable:4740)       // flow in/out of inline disables global opts
--inline void __declspec(naked) __stdcall CComStdCallThunkHelper()
-+inline void __stdcall CComStdCallThunkHelper()
- {
--        __asm
--        {
--                mov eax, [esp+4];       // get pThunk
--                mov edx, [eax+4];       // get the pThunk->pThis
--                mov [esp+4], edx;       // replace pThunk with pThis
--                mov eax, [eax+8];       // get pThunk->pfn
--                jmp eax;                // jump pfn
--        };
-+  asm(
-+      " movl $8(%ebp), %eax\n"       // get pThunk
-+      " movl $4(%eax), edx\n"       // get the pThunk->pThis
-+      " movl %edx, $8(%ebp)\n"       // replace pThunk with pThis
-+      " movl $8(%eax), %eax\n"       // get pThunk->pfn
-+      "	movl %ebp, %esp\n"
-+      "	popl %ebp\n"
-+      "	jmp %eax"                // jump pfn
-+      );
- }
- #pragma warning(default:4740)
- #endif
-@@ -3985,6 +4014,7 @@
- class ATL_NO_VTABLE IDispEventSimpleImpl : public _IDispEventLocator<nID, pdiid>
- {
- public:
-+        using _IDispEventLocator<nID, pdiid>::m_dwEventCookie;
-         STDMETHOD(_LocDEQueryInterface)(REFIID riid, void ** ppvObject)
-         {
-                 _ATL_VALIDATE_OUT_POINTER(ppvObject);
-@@ -3992,7 +4022,7 @@
-                 if (InlineIsEqualGUID(riid, *pdiid) || 
-                         InlineIsEqualUnknown(riid) ||
-                         InlineIsEqualGUID(riid, IID_IDispatch) ||
--                        InlineIsEqualGUID(riid, m_iid))
-+                        InlineIsEqualGUID(riid, this->m_iid))
-                 {
-                         *ppvObject = this;
-                         AddRef();
-@@ -4186,6 +4216,10 @@
- {
- public:
-         typedef tihclass _tihclass;
-+        using IDispEventSimpleImpl<nID, T, pdiid>::m_libid;
-+        using IDispEventSimpleImpl<nID, T, pdiid>::m_iid;
-+        using IDispEventSimpleImpl<nID, T, pdiid>::m_wMajorVerNum;
-+        using IDispEventSimpleImpl<nID, T, pdiid>::m_wMinorVerNum;
- 
-         IDispEventImpl()
-         {
-@@ -4475,6 +4509,11 @@
-         }
- };
- 
-+template <class Base, const IID* piid, class T, class Copy, class ThreadModel = CComObjectThreadModel>
-+class ATL_NO_VTABLE CComEnum;
-+template <class Base, const IID* piid, class T, class Copy, class CollType, class ThreadModel = CComObjectThreadModel>
-+class ATL_NO_VTABLE CComEnumOnSTL;
-+
- 
- /////////////////////////////////////////////////////////////////////////////
- // CComEnumImpl
-@@ -4746,7 +4785,7 @@
-         return S_OK;
- }
- 
--template <class Base, const IID* piid, class T, class Copy, class ThreadModel = CComObjectThreadModel>
-+template <class Base, const IID* piid, class T, class Copy, class ThreadModel>
- class ATL_NO_VTABLE CComEnum :
-         public CComEnumImpl<Base, piid, T, Copy>,
-         public CComObjectRootEx< ThreadModel >
-@@ -4868,7 +4907,7 @@
-         return hRes;
- }
- 
--template <class Base, const IID* piid, class T, class Copy, class CollType, class ThreadModel = CComObjectThreadModel>
-+template <class Base, const IID* piid, class T, class Copy, class CollType, class ThreadModel>
- class ATL_NO_VTABLE CComEnumOnSTL :
-         public IEnumOnSTLImpl<Base, piid, T, Copy, CollType>,
-         public CComObjectRootEx< ThreadModel >
-@@ -4901,7 +4940,7 @@
-                         return E_INVALIDARG;                        
-                 HRESULT hr = E_FAIL;
-                 Index--;
--                CollType::iterator iter = m_coll.begin();
-+                typename CollType::iterator iter = m_coll.begin();
-                 while (iter != m_coll.end() && Index > 0)
-                 {
-                         iter++;
-@@ -5314,7 +5353,7 @@
-                 if (InlineIsEqualGUID(riid, IID_IConnectionPoint) || InlineIsEqualUnknown(riid))
-                 {
-                         *ppvObject = this;
--                        AddRef();
-+                        this->AddRef();
- #ifdef _ATL_DEBUG_INTERFACES
-                         _Module.AddThunk((IUnknown**)ppvObject, _T("IConnectionPointImpl"), riid);
- #endif // _ATL_DEBUG_INTERFACES
---- include/atl/atlconv.h.orig	2005-04-14 17:54:32.000000000 +0900
-+++ include/atl/atlconv.h	2007-12-31 07:29:34.759750000 +0900
-@@ -10,6 +10,9 @@
- 
- #ifndef __ATLCONV_H__
- #define __ATLCONV_H__
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef __cplusplus
-         #error ATL requires C++ compilation (use a .cpp suffix)
-@@ -30,7 +33,11 @@
- // Following code is to avoid alloca causing a stack overflow.
- // It is intended for use from the _ATL_SAFE_ALLOCA macros 
- // or Conversion macros.
--__declspec(selectany) DWORD _Atlosplatform = 0;
-+#ifdef _INIT_ATL_COMMON_VARS
-+DWORD _Atlosplatform = 0;
-+#else
-+extern DWORD _Atlosplatform;
-+#endif
- inline BOOL _AtlGetVersionEx()
- {
-         OSVERSIONINFO osi;
-@@ -156,8 +163,11 @@
- #pragma prefast(suppress:515, "Atlresetstkoflw is the same as resetstkoflw")
- 
- // Verifies if sufficient space is available on the stack.
--inline bool _AtlVerifyStackAvailable(SIZE_T Size)
-+inline bool _AtlVerifyStackAvailable(SIZE_T /*Size*/)
- {
-+#if 1
-+    return false;
-+#else
-     bool bStackAvailable = true;
- 
-     __try
-@@ -173,6 +183,7 @@
-         _Atlresetstkoflw();
-     }
-     return bStackAvailable;
-+#endif
- }
- 
- #pragma prefast(pop)
-@@ -281,15 +292,15 @@
- 
- #ifdef _CONVERSION_USES_THREAD_LOCALE
-         #ifndef _DEBUG
--                #define USES_CONVERSION int _convert; _convert; UINT _acp = GetACP(); _acp; LPCWSTR _lpw; _lpw; LPCSTR _lpa; _lpa
-+                #define USES_CONVERSION int _convert; (void)_convert; UINT _acp = GetACP(); (void)_acp; LPCWSTR _lpw; (void)_lpw; LPCSTR _lpa; (void)_lpa
-         #else
--                #define USES_CONVERSION int _convert = 0; _convert; UINT _acp = GetACP(); _acp; LPCWSTR _lpw = NULL; _lpw; LPCSTR _lpa = NULL; _lpa
-+                #define USES_CONVERSION int _convert = 0; (void)_convert; UINT _acp = GetACP(); (void)_acp; LPCWSTR _lpw = NULL; (void)_lpw; LPCSTR _lpa = NULL; (void)_lpa
-         #endif
- #else
-         #ifndef _DEBUG
--                #define USES_CONVERSION int _convert; _convert; UINT _acp = CP_ACP; _acp; LPCWSTR _lpw; _lpw; LPCSTR _lpa; _lpa
-+                #define USES_CONVERSION int _convert; (void)_convert; UINT _acp = CP_ACP; (void)_acp; LPCWSTR _lpw; (void)_lpw; LPCSTR _lpa; (void)_lpa
-         #else
--                #define USES_CONVERSION int _convert = 0; _convert; UINT _acp = CP_ACP; _acp; LPCWSTR _lpw = NULL; _lpw; LPCSTR _lpa = NULL; _lpa
-+                #define USES_CONVERSION int _convert = 0; (void)_convert; UINT _acp = CP_ACP; (void)_acp; LPCWSTR _lpw = NULL; (void)_lpw; LPCSTR _lpa = NULL; (void)_lpa
-         #endif
- #endif
- 
---- include/atl/atlctl.h.orig	2005-04-14 17:54:32.000000000 +0900
-+++ include/atl/atlctl.h	2009-04-19 13:31:15.146000000 +0900
-@@ -10,6 +10,9 @@
- 
- #ifndef __ATLCTL_H__
- #define __ATLCTL_H__
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef __cplusplus
-         #error ATL requires C++ compilation (use a .cpp suffix)
-@@ -57,7 +60,7 @@
- namespace ATL
- {
- 
--#pragma pack(push, _ATL_PACKING)
-+#pragma pack(push, 8)
- 
- // Forward declarations
- //
-@@ -142,7 +145,9 @@
-         CComControlBase(HWND& h) : m_hWndCD(h)
-         {
-                 memset(this, 0, sizeof(CComControlBase));
--                m_phWndCD = &h;
-+		// previous element of m_hWndCD in this class is m_rcPos
-+		*reinterpret_cast<HWND **>(reinterpret_cast<DWORD>(reinterpret_cast<char *>(&m_rcPos)+sizeof(m_rcPos)+(__alignof__(m_hWndCD)-1))&(-(__alignof__(m_hWndCD))))=&h;
-+//                m_phWndCD = &h;
-                 m_sizeExtent.cx = 2*2540;
-                 m_sizeExtent.cy = 2*2540;
-                 m_sizeNatural = m_sizeExtent;
-@@ -530,13 +535,13 @@
-         SIZE m_sizeNatural; //unscaled size in himetric
-         SIZE m_sizeExtent;  //current extents in himetric
-         RECT m_rcPos; // position in pixels
--#pragma warning(disable: 4510 4610) // unnamed union
--        union
--        {
-+//#pragma warning(disable: 4510 4610) // unnamed union
-+//        union
-+//        {
-                 HWND& m_hWndCD;
--                HWND* m_phWndCD;
--        };
--#pragma warning(default: 4510 4610)
-+//                HWND* m_phWndCD;
-+//        };
-+//#pragma warning(default: 4510 4610)
-         union
-         {
-                 // m_nFreezeEvents is the only one actually used
-@@ -1362,7 +1367,7 @@
- class ATL_NO_VTABLE CComControl :  public CComControlBase, public WinBase
- {
- public:
--        CComControl() : CComControlBase(m_hWnd) {}
-+        CComControl() : CComControlBase(this->m_hWnd) {}
-         HRESULT FireOnRequestEdit(DISPID dispID)
-         {
-                 T* pT = static_cast<T*>(this);
-@@ -1401,6 +1406,8 @@
- class CComCompositeControl : public CComControl< T, CAxDialogImpl< T > >
- {
- public:
-+        using CComControl< T, CAxDialogImpl< T > >::m_hWnd;
-+        using CComControl< T, CAxDialogImpl< T > >::GetNextDlgTabItem;
-         CComCompositeControl()
-         {
-                 m_hbrBackground = NULL;
-@@ -1429,7 +1436,7 @@
-                         m_hbrBackground = NULL;
-                 }
-                 OLE_COLOR clr;
--                HRESULT hr = GetAmbientBackColor(clr);
-+                HRESULT hr = this->GetAmbientBackColor(clr);
-                 if (SUCCEEDED(hr))
-                 {
-                         COLORREF rgb;
-@@ -1443,7 +1450,7 @@
-         {
-                 CAxWindow wnd(hwnd);
-                 CComPtr<IAxWinAmbientDispatch> spDispatch;
--                wnd.QueryHost(&spDispatch);
-+                wnd.QueryHost(IID_IAxWinAmbientDispatch, (void**)&spDispatch);
-                 if (spDispatch != NULL)
-                         spDispatch->put_BackColor((OLE_COLOR)l);
-                 return TRUE;
-@@ -1458,10 +1465,10 @@
-         }
-         HWND Create(HWND hWndParent, RECT& /*rcPos*/, LPARAM dwInitParam = NULL)
-         {
--                CComControl< T, CAxDialogImpl< T > >::Create(hWndParent, dwInitParam);
-+                this->Create(hWndParent, dwInitParam);
-                 SetBackgroundColorFromAmbient();
-                 if (m_hWnd != NULL)
--                        ShowWindow(SW_SHOWNOACTIVATE);
-+                        this->ShowWindow(SW_SHOWNOACTIVATE);
-                 return m_hWnd;
-         }
-         BOOL CalcExtent(SIZE& size)
-@@ -1488,7 +1495,7 @@
-                         return FALSE;
-                 // find a direct child of the dialog from the window that has focus
-                 HWND hWndCtl = ::GetFocus();
--                if (IsChild(hWndCtl) && ::GetParent(hWndCtl) != m_hWnd)
-+                if (this->IsChild(hWndCtl) && ::GetParent(hWndCtl) != m_hWnd)
-                 {
-                         do
-                         {
-@@ -1546,7 +1553,7 @@
-                         break;
-                 }
- 
--                return IsDialogMessage(pMsg);
-+                return this->IsDialogMessage(pMsg);
-         }
-         HRESULT IOleInPlaceObject_InPlaceDeactivate(void)
-         {
-@@ -1563,7 +1570,7 @@
-         }
-         virtual HRESULT OnDraw(ATL_DRAWINFO& di)
-         {
--                if(!m_bInPlaceActive)
-+                if(!this->m_bInPlaceActive)
-                 {
-                         HPEN hPen = (HPEN)::GetStockObject(BLACK_PEN);
-                         HBRUSH hBrush = (HBRUSH)::GetStockObject(GRAY_BRUSH);
-@@ -1626,7 +1633,7 @@
-         }
-         STDMETHOD(OnAmbientPropertyChange)(DISPID dispid)
-         {
--                dispid;
-+                (void)dispid;
-                 ATLTRACE2(atlTraceControls,2,_T("IOleControlImpl::OnAmbientPropertyChange\n"));
-                 ATLTRACE2(atlTraceControls,2,_T(" -- DISPID = %d (%d)\n"), dispid);
-                 return S_OK;
-@@ -2905,7 +2912,7 @@
-                 ATLTRACE2(atlTraceControls,2,_T("~CBindStatusCallback\n"));
-         }
- 
--        STDMETHOD(OnStartBinding)(DWORD dwReserved, IBinding *pBinding)
-+        STDMETHOD(OnStartBinding)(DWORD /*dwReserved*/, IBinding *pBinding)
-         {
-                 ATLTRACE2(atlTraceControls,2,_T("CBindStatusCallback::OnStartBinding\n"));
-                 m_spBinding = pBinding;
-@@ -2923,19 +2930,19 @@
-                 return S_OK;
-         }
- 
--        STDMETHOD(OnLowResource)(DWORD reserved)
-+        STDMETHOD(OnLowResource)(DWORD /*reserved*/)
-         {
-                 ATLTRACE2(atlTraceControls,2,_T("CBindStatusCallback::OnLowResource"));
-                 return S_OK;
-         }
- 
--        STDMETHOD(OnProgress)(ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
-+        STDMETHOD(OnProgress)(ULONG /*ulProgress*/, ULONG /*ulProgressMax*/, ULONG /*ulStatusCode*/, LPCWSTR /*szStatusText*/)
-         {
-                 ATLTRACE2(atlTraceControls,2,_T("CBindStatusCallback::OnProgress"));
-                 return S_OK;
-         }
- 
--        STDMETHOD(OnStopBinding)(HRESULT hresult, LPCWSTR szError)
-+        STDMETHOD(OnStopBinding)(HRESULT /*hresult*/, LPCWSTR /*szError*/)
-         {
-                 ATLTRACE2(atlTraceControls,2,_T("CBindStatusCallback::OnStopBinding\n"));
-                 (m_pT->*m_pFunc)(this, NULL, 0);
-@@ -2962,7 +2969,7 @@
-                 return S_OK;
-         }
- 
--        STDMETHOD(OnDataAvailable)(DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed)
-+        STDMETHOD(OnDataAvailable)(DWORD grfBSCF, DWORD dwSize, FORMATETC */*pformatetc*/, STGMEDIUM *pstgmed)
-         {
-                 ATLTRACE2(atlTraceControls,2,_T("CBindStatusCallback::OnDataAvailable\n"));
-                 HRESULT hr = S_OK;
-@@ -3005,7 +3012,7 @@
-                 return hr;
-         }
- 
--        STDMETHOD(OnObjectAvailable)(REFIID riid, IUnknown *punk)
-+        STDMETHOD(OnObjectAvailable)(REFIID /*riid*/, IUnknown */*punk*/)
-         {
-                 ATLTRACE2(atlTraceControls,2,_T("CBindStatusCallback::OnObjectAvailable"));
-                 return S_OK;
---- include/atl/atlwin.h.orig	2005-04-14 17:54:32.000000000 +0900
-+++ include/atl/atlwin.h	2007-12-31 07:29:28.525375000 +0900
-@@ -10,6 +10,9 @@
- 
- #ifndef __ATLWIN_H__
- #define __ATLWIN_H__
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef __cplusplus
-         #error ATL requires C++ compilation (use a .cpp suffix)
-@@ -99,6 +102,8 @@
- #else
- #define CWndClassInfo CWndClassInfoA
- #endif
-+template <DWORD t_dwStyle = 0, DWORD t_dwExStyle = 0> class CWinTraits;
-+typedef CWinTraits<WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>                                        CControlWinTraits;
- template <class T, class TBase = CWindow, class TWinTraits = CControlWinTraits> class CWindowImpl;
- template <class T, class TBase = CWindow> class CDialogImpl;
- #ifndef _ATL_NO_HOSTING
-@@ -658,6 +663,13 @@
-                 ATLASSERT(::IsWindow(m_hWnd));
-                 return ::GetDlgItemText(m_hWnd, nID, lpStr, nMaxCount);
-         }
-+
-+        HWND GetDlgItem(int nID) const
-+        {
-+                ATLASSERT(::IsWindow(m_hWnd));
-+                return ::GetDlgItem(m_hWnd, nID);
-+        }
-+
-         BOOL GetDlgItemText(int nID, BSTR& bstrText) const
-         {
-                 ATLASSERT(::IsWindow(m_hWnd));
-@@ -847,12 +859,6 @@
-                 return (int)::SetWindowLong(m_hWnd, GWL_ID, nID);
-         }
- 
--        HWND GetDlgItem(int nID) const
--        {
--                ATLASSERT(::IsWindow(m_hWnd));
--                return ::GetDlgItem(m_hWnd, nID);
--        }
--
- // Alert Functions
- 
-         BOOL FlashWindow(BOOL bInvert)
-@@ -1319,7 +1325,9 @@
-         }
- };
- 
--_declspec(selectany) RECT CWindow::rcDefault = { CW_USEDEFAULT, CW_USEDEFAULT, 0, 0 };
-+#ifdef _INIT_ATL_COMMON_VARS
-+RECT CWindow::rcDefault = { CW_USEDEFAULT, CW_USEDEFAULT, 0, 0 };
-+#endif
- 
- /////////////////////////////////////////////////////////////////////////////
- // CAxWindow - client side for an ActiveX host window
-@@ -1330,6 +1338,7 @@
- class CAxWindowT : public TBase
- {
- public:
-+        using TBase::m_hWnd;
- // Constructors
-         CAxWindowT(HWND hWnd = NULL) : TBase(hWnd)
-         { }
-@@ -1439,11 +1448,13 @@
-                         hr = spUnk->QueryInterface(iid, ppUnk);
-                 return hr;
-         }
-+#if 0
-         template <class Q>
-         HRESULT QueryHost(Q** ppUnk)
-         {
-                 return QueryHost(__uuidof(Q), (void**)ppUnk);
-         }
-+#endif
-         HRESULT QueryControl(REFIID iid, void** ppUnk)
-         {
-                 ATLASSERT(ppUnk != NULL);
-@@ -1459,11 +1470,13 @@
-                         hr = spUnk->QueryInterface(iid, ppUnk);
-                 return hr;
-         }
-+#if 0
-         template <class Q>
-         HRESULT QueryControl(Q** ppUnk)
-         {
-                 return QueryControl(__uuidof(Q), (void**)ppUnk);
-         }
-+#endif
-         HRESULT SetExternalDispatch(IDispatch* pDisp)
-         {
-                 HRESULT hr;
-@@ -1521,12 +1534,12 @@
-         BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& lResult, DWORD dwMsgMapID = 0) \
-         { \
-                 BOOL bHandled = TRUE; \
--                hWnd; \
--                uMsg; \
--                wParam; \
--                lParam; \
--                lResult; \
--                bHandled; \
-+                (void)hWnd; \
-+                (void)uMsg; \
-+                (void)wParam; \
-+                (void)lParam; \
-+                (void)lResult; \
-+                (void)bHandled; \
-                 switch(dwMsgMapID) \
-                 { \
-                 case 0:
-@@ -1750,7 +1763,7 @@
- 
-         // search for an empty one
- 
--                for(i = 0; i < m_aChainEntry.GetSize(); i++)
-+                for(int i = 0; i < m_aChainEntry.GetSize(); i++)
-                 {
-                         if(m_aChainEntry[i] == NULL)
-                         {
-@@ -1841,7 +1854,7 @@
- /////////////////////////////////////////////////////////////////////////////
- // CWinTraits - Defines various default values for a window
- 
--template <DWORD t_dwStyle = 0, DWORD t_dwExStyle = 0>
-+template <DWORD t_dwStyle, DWORD t_dwExStyle>
- class CWinTraits
- {
- public:
-@@ -1855,7 +1868,7 @@
-         }
- };
- 
--typedef CWinTraits<WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>                                        CControlWinTraits;
-+//typedef CWinTraits<WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>                                        CControlWinTraits;
- typedef CWinTraits<WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE>                CFrameWinTraits;
- typedef CWinTraits<WS_OVERLAPPEDWINDOW | WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_EX_MDICHILD>        CMDIChildWinTraits;
- 
-@@ -1882,6 +1895,7 @@
- class ATL_NO_VTABLE CWindowImplRoot : public TBase, public CMessageMap
- {
- public:
-+        using TBase::GetDlgItem;
-         CWndProcThunk m_thunk;
-         const MSG* m_pCurrentMsg;
- 
-@@ -1892,7 +1906,7 @@
-         ~CWindowImplRoot()
-         {
- #ifdef _DEBUG
--                if(m_hWnd != NULL)        // should be cleared in WindowProc
-+                if(this->m_hWnd != NULL)        // should be cleared in WindowProc
-                 {
-                         ATLTRACE2(atlTraceWindowing, 0, _T("ERROR - Object deleted before window was destroyed\n"));
-                         ATLASSERT(FALSE);
-@@ -2017,6 +2031,8 @@
- class ATL_NO_VTABLE CWindowImplBaseT : public CWindowImplRoot< TBase >
- {
- public:
-+        using CWindowImplRoot< TBase >::m_hWnd;
-+        using CWindowImplRoot< TBase >::m_thunk;
-         WNDPROC m_pfnSuperWindowProc;
- 
-         CWindowImplBaseT() : m_pfnSuperWindowProc(::DefWindowProc)
-@@ -2049,7 +2065,7 @@
- 
-         LRESULT DefWindowProc()
-         {
--                const MSG* pMsg = m_pCurrentMsg;
-+                const MSG* pMsg = this->m_pCurrentMsg;
-                 LRESULT lRes = 0;
-                 if (pMsg != NULL)
-                         lRes = DefWindowProc(pMsg->message, pMsg->wParam, pMsg->lParam);
-@@ -2091,7 +2107,7 @@
-         if(pOldProc != StartWindowProc)
-                 ATLTRACE2(atlTraceWindowing, 0, _T("Subclassing through a hook discarded.\n"));
- #else
--        pOldProc;        // avoid unused warning
-+        (void)pOldProc;        // avoid unused warning
- #endif
-         return pProc(hWnd, uMsg, wParam, lParam);
- }
-@@ -2219,6 +2235,7 @@
- class ATL_NO_VTABLE CWindowImpl : public CWindowImplBaseT< TBase, TWinTraits >
- {
- public:
-+        using CWindowImplBaseT< TBase, TWinTraits >::StartWindowProc;
-         DECLARE_WND_CLASS(NULL)
- 
-         HWND Create(HWND hWndParent, RECT& rcPos, LPCTSTR szWindowName = NULL,
-@@ -2226,8 +2243,8 @@
-                         UINT nID = 0, LPVOID lpCreateParam = NULL)
-         {
-                 if (T::GetWndClassInfo().m_lpszOrigName == NULL)
--                        T::GetWndClassInfo().m_lpszOrigName = GetWndClassName();
--                ATOM atom = T::GetWndClassInfo().Register(&m_pfnSuperWindowProc);
-+                        T::GetWndClassInfo().m_lpszOrigName = this->GetWndClassName();
-+                ATOM atom = T::GetWndClassInfo().Register(&(this->m_pfnSuperWindowProc));
- 
-                 dwStyle = T::GetWndStyle(dwStyle);
-                 dwExStyle = T::GetWndExStyle(dwExStyle);
-@@ -2244,6 +2261,7 @@
- class ATL_NO_VTABLE CDialogImplBaseT : public CWindowImplRoot< TBase >
- {
- public:
-+        using CWindowImplRoot< TBase >::m_hWnd;
- 	virtual DLGPROC GetDialogProc()
- 	{
- 		return DialogProc;
-@@ -2344,6 +2362,9 @@
- class ATL_NO_VTABLE CDialogImpl : public CDialogImplBaseT< TBase >
- {
- public:
-+        using CDialogImplBaseT< TBase >::m_hWnd;
-+        using CDialogImplBaseT< TBase >::m_thunk;
-+        typedef CDialogImplBaseT< TBase > CDialogImplBase_Class;
- #ifdef _DEBUG
-         bool m_bModal;
-         CDialogImpl() : m_bModal(false) { }
-@@ -2422,6 +2443,8 @@
- class ATL_NO_VTABLE CAxDialogImpl : public CDialogImplBaseT< TBase >
- {
- public:
-+        using CDialogImplBaseT< TBase >::m_hWnd;
-+        using CDialogImplBaseT< TBase >::m_thunk;
- #ifdef _DEBUG
-         bool m_bModal;
-         CAxDialogImpl() : m_bModal(false) { }
-@@ -2515,6 +2538,8 @@
- class CContainedWindowT : public TBase
- {
- public:
-+        using TBase::m_hWnd;
-+        using TBase::GetWndClassName;
-         CWndProcThunk m_thunk;
-         LPCTSTR m_lpszClassName;
-         WNDPROC m_pfnSuperWindowProc;
-@@ -2536,7 +2561,7 @@
-         { }
- 
-         CContainedWindowT(CMessageMap* pObject, DWORD dwMsgMapID = 0)
--                : m_lpszClassName(TBase::GetWndClassName()),
-+                : m_lpszClassName(GetWndClassName()),
-                 m_pfnSuperWindowProc(::DefWindowProc),
-                 m_pObject(pObject), m_dwMsgMapID(dwMsgMapID),
-                 m_pCurrentMsg(NULL)
-@@ -2666,7 +2691,7 @@
-                 LPCTSTR szWindowName = NULL, DWORD dwStyle = 0, DWORD dwExStyle = 0,
-                 UINT nID = 0, LPVOID lpCreateParam = NULL)
-         {
--                m_lpszClassName = TBase::GetWndClassName();
-+                m_lpszClassName = GetWndClassName();
-                 m_pfnSuperWindowProc = ::DefWindowProc;
-                 m_pObject = pObject;
-                 m_dwMsgMapID = dwMsgMapID;
-@@ -2959,8 +2984,11 @@
-         {
- 
-                 ::EnterCriticalSection(&pM->m_csWindowCreate);
--                __try 
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-                 {
-+                        _sehandler.Set(_sejmpbuf, &pM->m_csWindowCreate, EXCEPTION_CONTINUE_SEARCH, NULL, atlfinalleavecriticalsection);
-                         if(p->m_atom == 0)
-                         {
-                                 HINSTANCE hInst = pM->m_hInst;
-@@ -2979,7 +3007,7 @@
-                                                 if(!::GetClassInfoExA(_Module.GetModuleInstance(), p->m_lpszOrigName, &wc))
-                                                 {
-                                                         fFail = TRUE;
--                                                        __leave;
-+                                                        __builtin_longjmp(_sejmpbuf, 1);
-                                                 }
-                                         }
-                                         memcpy(&p->m_wc, &wc, sizeof(WNDCLASSEX));
-@@ -3011,10 +3039,7 @@
-                                         p->m_atom = ::RegisterClassExA(&p->m_wc);
-                         }
-                 }
--                __finally 
--                {
--                        ::LeaveCriticalSection(&pM->m_csWindowCreate);
--                }
-+                _sehandler.Reset();
-         }
- 
-         if (fFail)
-@@ -3038,8 +3063,11 @@
-         if (p->m_atom == 0)
-         {
-                 ::EnterCriticalSection(&pM->m_csWindowCreate);        
--                __try
-+                jmp_buf _sejmpbuf;
-+                __SEHandler _sehandler;
-+                if (__builtin_setjmp(_sejmpbuf) == 0)
-                 {
-+                        _sehandler.Set(_sejmpbuf, &pM->m_csWindowCreate, EXCEPTION_CONTINUE_SEARCH, NULL, atlfinalleavecriticalsection);
-                         if(p->m_atom == 0)
-                         {
-                                 HINSTANCE hInst = pM->m_hInst;
-@@ -3058,7 +3086,7 @@
-                                                 if(!::GetClassInfoExW(_Module.GetModuleInstance(), p->m_lpszOrigName, &wc))
-                                                 {
-                                                         fFail = TRUE;
--                                                        __leave;
-+                                                        __builtin_longjmp(_sejmpbuf, -1);
-                                                 }
-                                         }
-                                         memcpy(&p->m_wc, &wc, sizeof(WNDCLASSEX));
-@@ -3090,10 +3118,7 @@
-                                         p->m_atom = ::RegisterClassExW(&p->m_wc);
-                         }
-                 }
--                __finally
--                {
--                        ::LeaveCriticalSection(&pM->m_csWindowCreate);
--                }
-+                _sehandler.Reset();
-         }
- 
-         if (fFail)
---- include/atl/statreg.h.orig	2005-04-14 17:54:34.000000000 +0900
-+++ include/atl/statreg.h	2006-09-18 20:05:01.468750000 +0900
-@@ -573,15 +573,16 @@
-         return hRes;
- }
- 
--__declspec(selectany) LPCTSTR CRegParser::rgszNeverDelete[] = //Component Catagories
-+#ifdef _INIT_ATL_COMMON_VARS
-+LPCTSTR CRegParser::rgszNeverDelete[] = //Component Catagories
- {
-         _T("CLSID"), _T("TYPELIB")
- };
- 
--__declspec(selectany) const int CRegParser::cbNeverDelete = sizeof(rgszNeverDelete) / sizeof(LPCTSTR*);
--__declspec(selectany) const int CRegParser::MAX_VALUE=4096;
--__declspec(selectany) const int CRegParser::MAX_TYPE=MAX_VALUE;
--
-+const int CRegParser::cbNeverDelete = sizeof(rgszNeverDelete) / sizeof(LPCTSTR*);
-+const int CRegParser::MAX_VALUE=4096;
-+const int CRegParser::MAX_TYPE=MAX_VALUE;
-+#endif
- 
- inline BOOL CRegParser::VTFromRegType(LPCTSTR szValueType, VARTYPE& vt)
- {
diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch
deleted file mode 100644
index 22995bf..0000000
--- a/external/mingwheaders/mingw_headers.patch
+++ /dev/null
@@ -1,2130 +0,0 @@
---- include/crtdbg.h.orig	2006-09-18 01:21:38.968750000 +0900
-+++ include/crtdbg.h	2006-09-02 23:12:50.109375000 +0900
-@@ -0,0 +1,11 @@
-+#ifndef _CRTDBG_H
-+#define _CRTDBG_H
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
-+
-+#ifndef _ASSERTE
-+#define _ASSERTE(expr) ((void)0)
-+#endif
-+
-+#endif
---- include/excpt.h.orig	2009-01-11 04:32:43.000000000 +0900
-+++ include/excpt.h	2009-08-21 09:21:56.000000000 +0900
-@@ -16,8 +16,11 @@
- 
- /* All the headers include this file. */
- #include <_mingw.h>
-+#include <setjmp.h>
-+#include <stdarg.h>
- 
- #include <windef.h>
-+#include <winbase.h>
- 
- /*
-  * NOTE: The constants structs and typedefs below should be defined in the
-@@ -52,7 +55,7 @@
-  * The type of function that is expected as an exception handler to be
-  * installed with __try1.
-  */
--typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
-+typedef EXCEPTION_DISPOSITION (* PEXCEPTION_HANDLER)
- 		(struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
- 
- /*
-@@ -93,8 +96,122 @@
- 	__asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \
- 	 : : : "%eax");
- 
-+WINBASEAPI
-+VOID
-+WINAPI
-+RtlUnwind (
-+    IN PVOID TargetFrame OPTIONAL,
-+    IN PVOID TargetIp OPTIONAL,
-+    IN PEXCEPTION_RECORD ExceptionRecord OPTIONAL,
-+    IN PVOID ReturnValue
-+    );
- #ifdef	__cplusplus
- }
-+
-+class __SEHandler
-+{
-+ public:
-+  __SEHandler() {}
-+  ~__SEHandler() {}
-+  typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
-+  typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
-+  typedef void (*PN)(void *);
-+  void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
-+    {
-+      __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
-+      m_pData=pdata;
-+      switch (reinterpret_cast<int>(pfilter))
-+	{
-+	default:
-+	  m_filter=pfilter;
-+	  break;
-+	case EXCEPTION_CONTINUE_EXECUTION:
-+	  m_filter=DefaultFilterContinueExecution;
-+	  break;
-+	case EXCEPTION_EXECUTE_HANDLER:
-+	  m_filter=DefaultFilterExecuteHandler;
-+	  break;
-+	case EXCEPTION_CONTINUE_SEARCH:
-+	  m_filter=DefaultFilterContinueSearch;
-+	  break;
-+	}
-+      if (phandlerbody)
-+	m_handlerbody=phandlerbody;
-+      else
-+	m_handlerbody=DefaultHandler;
-+      if (pfinal)
-+	m_final=pfinal;
-+      else
-+	m_final=DefaultFinal;
-+      m_ER.pHandlerClass = this;
-+      m_ER.hp = handler;
-+      asm("movl %%fs:0, %%eax\n\t"
-+	  "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
-+      asm("movl %0, %%eax\n\t"
-+	  "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
-+    }
-+  void Reset()
-+    {
-+      m_final(m_pData);
-+      asm("movl %0, %%eax \n\t"
-+	  "movl %%eax, %%fs:0"
-+	  : : "m" (m_ER.prev): "%eax");
-+    }
-+ private:
-+  __SEHandler(const __SEHandler&);
-+  __SEHandler& operator=(const __SEHandler&);
-+  struct _ER {
-+    _ER* prev;
-+    PEXCEPTION_HANDLER hp;
-+    __SEHandler *pHandlerClass;
-+  };
-+  static EXCEPTION_DISPOSITION handler(
-+		     struct _EXCEPTION_RECORD *pExceptionRecord,
-+		     void * EstablisherFrame,
-+		     struct _CONTEXT *ContextRecord,
-+		     void * /*DispatcherContext*/)
-+    {
-+      __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
-+      if ( pExceptionRecord->ExceptionFlags & EH_UNWINDING )
-+	{
-+	  pThis->m_final(pThis->m_pData);
-+	  return ExceptionContinueSearch;
-+	}
-+      EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
-+      switch ( pThis->m_filter(pThis->m_pData, &ep) )
-+	{
-+	case EXCEPTION_EXECUTE_HANDLER:
-+	  RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
-+__set_label:
-+	  pThis->m_handlerbody(pThis->m_pData, &ep);
-+	  ContextRecord->Ebp = pThis->m_jmpbuf[0];
-+	  ContextRecord->Eip = pThis->m_jmpbuf[1];
-+	  ContextRecord->Esp = pThis->m_jmpbuf[2];
-+	  return ExceptionContinueExecution;
-+	case EXCEPTION_CONTINUE_SEARCH:
-+	  return ExceptionContinueSearch;
-+	case EXCEPTION_CONTINUE_EXECUTION:
-+	  return ExceptionContinueExecution;
-+	}
-+	  return ExceptionContinueExecution;
-+    }
-+  static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
-+  static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
-+  static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
-+  static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
-+  static void DefaultFinal(void *) {}
-+  typedef int (*handler_p)(
-+			   struct _EXCEPTION_RECORD *ExceptionRecord,
-+			   void * EstablisherFrame,
-+			   struct _CONTEXT *ContextRecord,
-+			   void * DispatcherContext);
-+  _ER m_ER;
-+  void *m_pData;
-+  PN m_final;
-+  PH m_handlerbody;
-+  PF m_filter;
-+  jmp_buf m_jmpbuf;
-+};
- #endif
- 
- #endif	/* Not RC_INVOKED */
---- include/tchar.h.orig	2009-01-11 04:32:46.000000000 +0900
-+++ include/tchar.h	2009-08-21 09:21:56.000000000 +0900
-@@ -223,6 +223,9 @@
- #define _ttelldir	_wtelldir
- #define _tseekdir	_wseekdir
- 
-+#define _ttempnam	_wtempnam
-+
-+
- #else	/* Not _UNICODE */
- 
- /*
-@@ -407,6 +410,8 @@
- #define _ttelldir	telldir
- #define _tseekdir	seekdir
- 
-+#define _ttempnam	_tempnam
-+
- #endif	/* Not _UNICODE */
- 
- /*
---- include/amvideo.h.orig	2008-12-06 11:31:53.000000000 +0900
-+++ include/amvideo.h	2009-08-21 09:21:56.000000000 +0900
-@@ -52,10 +52,10 @@
- 	BITMAPINFOHEADER bmiHeader;
- } VIDEOINFOHEADER;
- typedef struct tagVIDEOINFO {
--	RECT rcSource,
--	RECT rcTarget,
--	DWORD dwBitRate,
--	DWORD dwBitErrorRate,
-+	RECT rcSource;
-+	RECT rcTarget;
-+	DWORD dwBitRate;
-+	DWORD dwBitErrorRate;
- 	REFERENCE_TIME AvgTimePerFrame;
- 	BITMAPINFOHEADER bmiHeader;
- 	union {
---- include/basetyps.h.orig	2008-12-06 11:31:53.000000000 +0900
-+++ include/basetyps.h	2009-08-21 09:21:56.000000000 +0900
-@@ -80,6 +80,8 @@
-    CONST_VTABLE struct i##Vtbl
- #  define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
- # endif
-+# define DECLARE_INTERFACE_IID(i,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE(i)
-+# define DECLARE_INTERFACE_IID_(i,b,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE_(i,b)
- # define BEGIN_INTERFACE
- # define END_INTERFACE
- 
---- include/objidl.h.orig	2008-12-06 11:32:04.000000000 +0900
-+++ include/objidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#include <windows.h>
-+#include <ole2.h>
-+
- #ifndef _OBJIDL_H
- #define _OBJIDL_H
- #if __GNUC__ >= 3
-@@ -880,8 +883,8 @@
- 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- 	STDMETHOD_(ULONG,Release)(THIS) PURE;
--	STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE;
--	STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
-+	STDMETHOD_(DWORD,AddConnection)(THIS_ DWORD,DWORD) PURE;
-+	STDMETHOD_(DWORD,ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
- };
- #undef INTERFACE
- 
---- include/specstrings.h.orig	2008-12-06 11:32:09.000000000 +0900
-+++ include/specstrings.h	2009-08-21 09:21:56.000000000 +0900
-@@ -11,8 +11,31 @@
- /* __in and __out currently conflict with libstdc++, use with caution */
- 
- 
-+#define __RPC__deref_inout_opt
-+#define __RPC__deref_opt_inout_ecount_full_opt(size)
-+#define __RPC__deref_opt_inout_opt
-+#define __RPC__deref_out
-+#define __RPC__deref_out_ecount_full_opt(size)
-+#define __RPC__deref_out_opt
-+#define __RPC__deref_out_opt_string
-+#define __RPC__in
-+#define __RPC__in_ecount_full(size)
-+#define __RPC__in_ecount_full_opt(size)
-+#define __RPC__in_opt
-+#define __RPC__inout
-+#define __RPC__inout_ecount_full(size)
-+#define __RPC__inout_ecount_full_opt(size)
-+#define __RPC__inout_opt
-+#define __RPC__out
-+#define __RPC__out_ecount_full(size)
-+#define __RPC__out_ecount_full_string(size)
-+#define __RPC__out_ecount_part(size,init)
-+#define __RPC_unique_pointer
- #define __bcount(size)
- #define __bcount_opt(size)
-+#define __callback
-+#define __checkReturn
-+#define __deref
- #define __deref_bcount(size)
- #define __deref_bcount_opt(size)
- #define __deref_ecount(size)
-@@ -36,6 +59,7 @@
- #define __deref_inout_ecount_opt(size)
- #define __deref_inout_ecount_part(size,length)
- #define __deref_inout_ecount_part_opt(size,length)
-+#define __deref_inout_ecount_z(size)
- #define __deref_inout_opt
- #define __deref_opt_bcount(size)
- #define __deref_opt_bcount_opt(size)
-@@ -89,14 +113,23 @@
- #define __deref_out_ecount_part(size,length)
- #define __deref_out_ecount_part_opt(size,length)
- #define __deref_out_opt
-+#define __deref_out_z
-+#define __deref_out_z_opt
- #define __ecount(size)
- #define __ecount_opt(size)
-+#define __field_bcount(size)
-+#define __field_ecount(size)
-+#define __field_ecount_opt(size)
-+#define __format_string
-+#define __gdi_entry
- #define __in
- #define __in_bcount(size)
- #define __in_bcount_opt(size)
- #define __in_ecount(size)
- #define __in_ecount_opt(size)
- #define __in_opt
-+#define __in_xcount(size)
-+#define __in_z_opt
- #define __inout
- #define __inout_bcount(size)
- #define __inout_bcount_full(size)
-@@ -111,7 +144,12 @@
- #define __inout_ecount_part(size,length)
- #define __inout_ecount_part_opt(size,length)
- #define __inout_opt
-+#define __inout_xcount(size)
-+#define __notnull
-+#define __nullnullterminated
-+#define __nullterminated
- #define __out
-+#define __out_awcount(expr,size)
- #define __out_bcount(size)
- #define __out_bcount_full(size)
- #define __out_bcount_full_opt(size)
-@@ -119,12 +157,20 @@
- #define __out_bcount_part(size,length)
- #define __out_bcount_part_opt(size,length)
- #define __out_ecount(size)
-+#define __out_ecount(size)
- #define __out_ecount_full(size)
- #define __out_ecount_full_opt(size)
- #define __out_ecount_opt(size)
- #define __out_ecount_part(size,length)
- #define __out_ecount_part_opt(size,length)
- #define __out_opt 
-+#define __out_xcount(size)
-+#define __out_xcount_opt(size)
-+#define __reserved
-+#define __struct_bcount(size)
-+#define __success(expr)
-+#define __typefix(ctype)
-+#define __unaligned
- 
- 
- #endif /*_SPECSTRINGS_H */
---- include/uxtheme.h.orig	2008-12-06 11:32:11.000000000 +0900
-+++ include/uxtheme.h	2010-01-22 14:50:56.327000000 +0900
-@@ -10,7 +10,7 @@
- extern "C" {
- #endif
- 
--#if (_WIN32_WINNT >= 0x0501)
-+#if (_WIN32_WINNT >= 0x0500)
- #define DTBG_CLIPRECT 0x00000001
- #define DTBG_DRAWSOLID 0x00000002
- #define DTBG_OMITBORDER 0x00000004
-@@ -35,6 +35,7 @@
- #define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)
- #define HTTB_SIZINGTEMPLATE 0x0100
- #define HTTB_SYSTEMSIZINGMARGINS 0x0200
-+#if 0
- #define TMT_DISPLAYNAME 0x0259
- #define TMT_TOOLTIP 0x025A
- #define TMT_COMPANY 0x025B
-@@ -186,6 +187,7 @@
- #define BT_IMAGEFILE  0x0000
- #define BT_BORDERFILL 0x0001
- #define BT_NONE       0x0002
-+#endif
- 
- typedef enum PROPERTYORIGIN {
- 	PO_STATE = 0,
---- include/winbase.h.orig	2008-12-06 11:32:11.000000000 +0900
-+++ include/winbase.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1354,8 +1354,8 @@
- WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
- WINBASEAPI BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
- #if (_WIN32_WINNT >= 0x0500)
--WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD);
--WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD);
-+WINBASEAPI HANDLE WINAPI FindFirstVolumeA(LPSTR,DWORD);
-+WINBASEAPI HANDLE WINAPI FindFirstVolumeW(LPWSTR,DWORD);
- WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
- WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
- #endif
-@@ -1363,7 +1363,7 @@
- WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
- WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
- #if (_WIN32_WINNT >= 0x0500)
--WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD);
-+WINBASEAPI BOOL WINAPI FindNextVolumeA(HANDLE,LPSTR,DWORD);
- WINBASEAPI BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
- WINBASEAPI BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
- WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD);
-@@ -1475,10 +1475,10 @@
- WINBASEAPI DWORD WINAPI GetLogicalDrives(void);
- WINBASEAPI DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR);
- WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR);
--#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-+//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
- WINBASEAPI DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
- WINBASEAPI DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
--#endif
-+//#endif
- WINBASEAPI BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD);
- WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
- WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD);
-@@ -1519,9 +1519,9 @@
- #endif
- WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID);
- WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE);
--#if (_WIN32_WINNT >= 0x0501)
-+//#if (_WIN32_WINNT >= 0x0501)
- WINBASEAPI DWORD WINAPI GetProcessId(HANDLE);
--#endif
-+//#endif
- #if (_WIN32_WINNT >= 0x0500)
- WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS);
- #endif
-@@ -1802,9 +1802,9 @@
- WINBASEAPI BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE);
- WINBASEAPI HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
- WINBASEAPI HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
--#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
-+//#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
- WINBASEAPI HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD);
--#endif
-+//#endif
- WINBASEAPI BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
- WINBASEAPI HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR);
- WINBASEAPI HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR);
-@@ -2029,6 +2029,7 @@
- WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL);
- WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD);
- WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD);
-+WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT);
- WINBASEAPI BOOL WINAPI WinLoadTrustProvider(GUID*);
- WINBASEAPI BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED);
- WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
-@@ -2151,9 +2152,9 @@
- #define GetFileAttributesEx GetFileAttributesExW
- #define GetFullPathName GetFullPathNameW
- #define GetLogicalDriveStrings GetLogicalDriveStringsW
--#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-+//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
- #define GetLongPathName GetLongPathNameW
--#endif
-+//#endif
- #define GetModuleFileName GetModuleFileNameW
- #define GetModuleHandle GetModuleHandleW
- #if (_WIN32_WINNT >= 0x0500)
-@@ -2346,9 +2347,9 @@
- #define GetFileAttributesEx GetFileAttributesExA
- #define GetFullPathName GetFullPathNameA
- #define GetLogicalDriveStrings GetLogicalDriveStringsA
--#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-+//#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
- #define GetLongPathName GetLongPathNameA
--#endif
-+//#endif
- #define GetNamedPipeHandleState GetNamedPipeHandleStateA
- #define GetModuleHandle GetModuleHandleA
- #if (_WIN32_WINNT >= 0x0500)
---- include/windef.h.orig	2008-12-06 11:32:12.000000000 +0900
-+++ include/windef.h	2009-08-21 09:21:56.000000000 +0900
-@@ -251,6 +251,7 @@
- typedef unsigned int UINT,*PUINT,*LPUINT;
- 
- #include <winnt.h>
-+#include <specstrings.h>
- 
- typedef UINT_PTR WPARAM;
- typedef LONG_PTR LPARAM;
---- include/wininet.h.orig	2008-12-06 11:32:13.000000000 +0900
-+++ include/wininet.h	2009-08-21 09:21:56.000000000 +0900
-@@ -868,6 +868,7 @@
- BOOL WINAPI InternetAutodial(DWORD,DWORD);
- BOOL WINAPI InternetAutodialHangup(DWORD);
- BOOL WINAPI InternetGetConnectedState(LPDWORD,DWORD);
-+BOOL WINAPI InternetGetConnectedStateEx(LPDWORD,LPTSTR,DWORD,DWORD);
- BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD);
- BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR);
- BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
---- include/winver.h.orig	2008-12-06 11:32:14.000000000 +0900
-+++ include/winver.h	2009-08-21 09:21:56.000000000 +0900
-@@ -101,10 +101,10 @@
- DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT);
- DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT);
- DWORD WINAPI VerInstallFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT);
--DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,PDWORD);
--DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,PDWORD);
--BOOL WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,PVOID);
--BOOL WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,PVOID);
-+DWORD WINAPI GetFileVersionInfoSizeA(LPSTR,PDWORD);
-+DWORD WINAPI GetFileVersionInfoSizeW(LPWSTR,PDWORD);
-+BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID);
-+BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID);
- DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
- DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
- BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT);
---- include/wtypes.h.orig	2008-12-06 11:32:14.000000000 +0900
-+++ include/wtypes.h	2009-08-21 09:21:56.000000000 +0900
-@@ -66,6 +66,19 @@
- 	unsigned short asData[1];
- }FLAGGED_WORD_BLOB;
- 
-+typedef struct _COAUTHIDENTITY
-+    {
-+    /* [size_is] */ USHORT *User;
-+    /* [range] */ ULONG UserLength;
-+    /* [size_is] */ USHORT *Domain;
-+    /* [range] */ ULONG DomainLength;
-+    /* [size_is] */ USHORT *Password;
-+    /* [range] */ ULONG PasswordLength;
-+    ULONG Flags;
-+    } 	COAUTHIDENTITY;
-+
-+typedef WORD CLIPFORMAT,*LPCLIPFORMAT;
-+
- #ifndef OLE2ANSI
- typedef WCHAR OLECHAR;
- typedef LPWSTR LPOLESTR;
-@@ -94,6 +107,7 @@
- 	}_STRUCT_NAME(s);
- 	LONGLONG int64;
- } CY;
-+typedef union tagCY *LPCY;
- typedef double DATE;
- typedef struct  tagBSTRBLOB {
- 	ULONG cbSize;
-@@ -165,6 +179,52 @@
- #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
- #endif
- typedef void *HMETAFILEPICT;
-+
-+typedef enum tagTYSPEC {
-+    TYSPEC_CLSID, 
-+    TYSPEC_FILEEXT,
-+    TYSPEC_MIMETYPE,
-+    TYSPEC_FILENAME,
-+    TYSPEC_PROGID,
-+    TYSPEC_PACKAGENAME,
-+    TYSPEC_OBJECTID
-+} TYSPEC;
-+
-+typedef union {
-+        CLSID clsid;
-+        LPOLESTR pFileExt;
-+        LPOLESTR pMimeType;
-+        LPOLESTR pProgId;
-+        LPOLESTR pFileName;
-+        struct {
-+        LPOLESTR pPackageName;
-+        GUID PolicyId;
-+        } ByName;
-+        struct {
-+        GUID ObjectId;
-+        GUID PolicyId;
-+        } ByObjectId;
-+} uCLSSPEC;
-+
-+typedef struct tagCSPLATFORM {
-+   DWORD dwContext;
-+   DWORD dwVersionHi;
-+   DWORD dwVersionLo;
-+   DWORD dwProcessorArch;
-+} CSPLATFORM;
-+
-+typedef struct tagQUERYCONTEXT {
-+  DWORD dwContext;
-+  CSPLATFORM Platform;
-+  LCID Locale;
-+  DWORD dwVersionHi;
-+  DWORD dwVersionLo;
-+} QUERYCONTEXT;
-+typedef struct
-+{
-+	GUID fmtid;
-+	DWORD pid;
-+} PROPERTYKEY;
- #ifdef __cplusplus
- }
- #endif
---- include/adoctint.h.orig	2008-01-18 22:17:10.000000000 +0900
-+++ include/adoctint.h	2009-08-21 09:21:56.000000000 +0900
-@@ -11,6 +11,9 @@
- //--------------------------------------------------------------------
- #ifndef _ADOCTINT_H_
- #define _ADOCTINT_H_
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef _INC_TCHAR
- #include <tchar.h>
-@@ -2489,11 +2492,11 @@
- #endif 	/* __Procedure_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Catalog;
- #ifdef __cplusplus
--Catalog;
-+//Catalog;
- #endif
- EXTERN_C const CLSID CLSID_Table;
- #ifdef __cplusplus
--Table;
-+//Table;
- #endif
- #ifndef __Property_INTERFACE_DEFINED__
- #define __Property_INTERFACE_DEFINED__
-@@ -2635,23 +2638,23 @@
- #endif 	/* __Property_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Group;
- #ifdef __cplusplus
--Group;
-+//Group;
- #endif
- EXTERN_C const CLSID CLSID_User;
- #ifdef __cplusplus
--User;
-+//User;
- #endif
- EXTERN_C const CLSID CLSID_Column;
- #ifdef __cplusplus
--Column;
-+//Column;
- #endif
- EXTERN_C const CLSID CLSID_Index;
- #ifdef __cplusplus
--Index;
-+//Index;
- #endif
- EXTERN_C const CLSID CLSID_Key;
- #ifdef __cplusplus
--Key;
-+//Key;
- #endif
- #ifndef __Tables_INTERFACE_DEFINED__
- #define __Tables_INTERFACE_DEFINED__
-@@ -3332,8 +3335,8 @@
-             /* [in] */ VARIANT Item,
-             /* [defaultvalue][in] */ KeyTypeEnum Type,
-             /* [optional][in] */ VARIANT Column,
--            /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = L"",
--            /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = L"") = 0;
-+            /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOTable = const_cast<BSTR>(L""),
-+            /* [defaultvalue][in] */ __RPC__in BSTR RelatedADOColumn = const_cast<BSTR>(L"")) = 0;
-         
-         virtual /* [helpcontext] */ HRESULT STDMETHODCALLTYPE Delete( 
-             /* [in] */ VARIANT Item) = 0;
---- include/adodef.h.orig	2008-01-18 22:17:10.000000000 +0900
-+++ include/adodef.h	2009-08-21 09:21:56.000000000 +0900
-@@ -12,6 +12,9 @@
- 
- #ifndef _ADODEF_H_
- #define _ADODEF_H_
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- // TYPELIB MAJOR VERSIONS
- #define ADO_MAJOR			6
---- include/adoguids.h.orig	2008-01-18 22:17:10.000000000 +0900
-+++ include/adoguids.h	2009-08-21 09:21:56.000000000 +0900
-@@ -11,6 +11,10 @@
- //-----------------------------------------------------------------------------
- 
- 
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
-+
- #define STRING_GUID(l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8
- 
- #if defined(__midl) || defined(GEN_MIDL)
---- include/adoint.h.orig	2008-01-18 22:17:10.000000000 +0900
-+++ include/adoint.h	2009-08-21 09:21:56.000000000 +0900
-@@ -11,6 +11,9 @@
- //--------------------------------------------------------------------
- #ifndef _ADOINT_H_
- #define _ADOINT_H_
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #ifndef _INC_TCHAR
- #include <tchar.h>
-@@ -3494,7 +3497,7 @@
- #endif 	/* __ADOConnectionConstruction_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Connection;
- #ifdef __cplusplus
--Connection;
-+//Connection;
- #endif
- #ifndef ___Record_INTERFACE_DEFINED__
- #define ___Record_INTERFACE_DEFINED__
-@@ -3793,7 +3796,7 @@
- #endif 	/* ___Record_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Record;
- #ifdef __cplusplus
--Record;
-+//Record;
- #endif
- #ifndef ___Stream_INTERFACE_DEFINED__
- #define ___Stream_INTERFACE_DEFINED__
-@@ -4123,7 +4126,7 @@
- #endif 	/* ___Stream_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Stream;
- #ifdef __cplusplus
--Stream;
-+//Stream;
- #endif
- #ifndef __ADORecordConstruction_INTERFACE_DEFINED__
- #define __ADORecordConstruction_INTERFACE_DEFINED__
-@@ -4405,11 +4408,11 @@
- #endif 	/* __ADOCommandConstruction_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Command;
- #ifdef __cplusplus
--Command;
-+//Command;
- #endif
- EXTERN_C const CLSID CLSID_Recordset;
- #ifdef __cplusplus
--Recordset;
-+//Recordset;
- #endif
- #ifndef __Recordset15_INTERFACE_DEFINED__
- #define __Recordset15_INTERFACE_DEFINED__
-@@ -8305,7 +8308,7 @@
- #endif 	/* ___Parameter_INTERFACE_DEFINED__ */
- EXTERN_C const CLSID CLSID_Parameter;
- #ifdef __cplusplus
--Parameter;
-+//Parameter;
- #endif
- #ifndef __Parameters_INTERFACE_DEFINED__
- #define __Parameters_INTERFACE_DEFINED__
---- include/bcrypt.h.orig	2008-01-18 22:17:12.000000000 +0900
-+++ include/bcrypt.h	2008-04-10 22:57:54.410750000 +0900
-@@ -40,12 +40,6 @@
- #define OPTIONAL
- #endif
- 
--#if !defined(__midl)
--#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT))
--#else
--#define BCRYPT_STRUCT_ALIGNMENT
--#endif /*!defined(__midl)*/
--
- //
- //  Alignment macros
- //
-@@ -57,11 +51,7 @@
-  #define BCRYPT_OBJECT_ALIGNMENT    4
- #endif
- 
--#if !defined(__midl)
--#define BCRYPT_STRUCT_ALIGNMENT __declspec(align(BCRYPT_OBJECT_ALIGNMENT))
--#else
- #define BCRYPT_STRUCT_ALIGNMENT
--#endif /*!defined(__midl)*/
- 
- //
- // DeriveKey KDF Types
-@@ -108,7 +98,11 @@
- 
- typedef BCRYPT_KEY_LENGTHS_STRUCT BCRYPT_AUTH_TAG_LENGTHS_STRUCT;
- 
--#pragma pack(push, BCRYPT_OBJECT_ALIGNMENT)
-+#if defined(_IA64_) || defined(_AMD64_)
-+#pragma pack(push, 8)
-+#else
-+#pragma pack(push, 4)
-+#endif
- typedef BCRYPT_STRUCT_ALIGNMENT struct _BCRYPT_OID
- {
-     ULONG   cbOID;
---- include/commctrl.h.orig	2008-01-18 22:17:14.000000000 +0900
-+++ include/commctrl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -14,6 +14,14 @@
- #ifndef _INC_COMMCTRL
- #define _INC_COMMCTRL
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #if defined(_MSC_VER) && (_MSC_VER >= 1200)
- #pragma warning(push)
- #pragma warning(disable:4001) /* nonstandard extension : single line comment */
-@@ -369,8 +377,10 @@
- 
- // Shell reserved               (0U-580U) -  (0U-589U)
- 
-+#ifndef CDN_FIRST
- #define CDN_FIRST               (0U-601U)       // common dialog (new)
- #define CDN_LAST                (0U-699U)
-+#endif
- 
- #define TBN_FIRST               (0U-700U)       // toolbar
- #define TBN_LAST                (0U-720U)
-@@ -683,7 +693,7 @@
- #define ILP_DOWNLEVEL       1           // Write or reads the stream using downlevel sematics.
- 
- 
--WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv);
-+//WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(DWORD dwFlags, LPSTREAM pstm, REFIID riid, PVOID* ppv);
- WINCOMMCTRLAPI HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD dwFlags, LPSTREAM pstm);
- #endif
- 
-@@ -713,7 +723,7 @@
- #endif
- 
- #if (_WIN32_WINNT >= 0x0501)
--WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv);
-+//WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void** ppv);
- 
- #ifdef __cplusplus
- FORCEINLINE HIMAGELIST IImageListToHIMAGELIST(struct IImageList *himl)
-@@ -8056,8 +8066,10 @@
- #if (_WIN32_WINNT >= 0x0501)
- 
- // custom combobox control messages
-+#ifndef CB_SETMINVISIBLE
- #define CB_SETMINVISIBLE        (CBM_FIRST + 1)
- #define CB_GETMINVISIBLE        (CBM_FIRST + 2)
-+#endif
- #define CB_SETCUEBANNER         (CBM_FIRST + 3)
- #define CB_GETCUEBANNER         (CBM_FIRST + 4)
- 
-@@ -8651,7 +8663,7 @@
- 
- #if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
- #if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
--#include "commctrl.inl"
-+//#include "commctrl.inl"
- #endif /* ISOLATION_AWARE_ENABLED */
- #endif /* RC */
- 
-@@ -8666,6 +8678,10 @@
- #pragma warning(pop)
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif  /* _INC_COMMCTRL */
- 
- 
---- include/control.h.orig	2008-01-18 22:17:14.000000000 +0900
-+++ include/control.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/dispex.h.orig	2008-01-18 22:17:16.000000000 +0900
-+++ include/dispex.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/filter.h.orig	2008-01-18 22:17:18.000000000 +0900
-+++ include/filter.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/gdiplusbitmap.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusbitmap.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- *
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusbrush.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusbrush.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- * 
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusenums.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusenums.h	2009-08-21 09:21:56.000000000 +0900
-@@ -542,7 +542,7 @@
- 
- #define GDIP_EMFPLUS_RECORD_BASE        0x00004000
- #define GDIP_WMF_RECORD_BASE            0x00010000
--#define GDIP_WMF_RECORD_TO_EMFPLUS(n)   ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE))
-+#define GDIP_WMF_RECORD_TO_EMFPLUS(n)   ((n) | GDIP_WMF_RECORD_BASE)
- #define GDIP_EMFPLUS_RECORD_TO_WMF(n)   ((n) & (~GDIP_WMF_RECORD_BASE))
- #define GDIP_IS_WMF_RECORDTYPE(n)       (((n) & GDIP_WMF_RECORD_BASE) != 0)
- 
---- include/gdiplusfont.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusfont.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- *
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusheaders.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusheaders.h	2008-03-28 21:44:34.907750000 +0900
-@@ -704,7 +704,7 @@
- 
- class CachedBitmap : public GdiplusBase
- {
--    friend Graphics;
-+    friend class Graphics;
- 
- public:
-     CachedBitmap(IN Bitmap *bitmap,
-@@ -888,7 +888,7 @@
- 
-     UINT GetDownLevelRasterizationLimit() const;
- 
--    static UINT Metafile::EmfToWmfBits(
-+    static UINT EmfToWmfBits(
-         IN HENHMETAFILE       hemf,
-         IN UINT               cbData16,     
-         OUT LPBYTE            pData16,
---- include/gdiplusimageattributes.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusimageattributes.h	2009-08-21 09:21:56.000000000 +0900
-@@ -32,6 +32,9 @@
- 
- #ifndef _GDIPLUSIMAGEATTRIBUTES_H
- #define _GDIPLUSIMAGEATTRIBUTES_H
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- class GpImageAttributes;
- 
---- include/gdiplusimaging.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusimaging.h	2009-08-21 09:21:56.000000000 +0900
-@@ -160,7 +160,7 @@
-     UINT Width;
-     UINT Height;
-     INT Stride;
--    PixelFormat PixelFormat;
-+    ::Gdiplus::PixelFormat PixelFormat;
-     VOID* Scan0;
-     UINT_PTR Reserved;
- };
---- include/gdiplusmatrix.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusmatrix.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- * 
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdipluspath.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdipluspath.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- *
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdipluspen.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdipluspen.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- * 
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusregion.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusregion.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /**************************************************************************\
- *
- * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusstringformat.h.orig	2008-01-18 22:17:46.000000000 +0900
-+++ include/gdiplusstringformat.h	2009-08-21 09:21:56.000000000 +0900
-@@ -217,7 +217,7 @@
-         ));
-     }
- 
--    StringTrimming StringFormat::GetTrimming() const
-+    StringTrimming GetTrimming() const
-     {
-         StringTrimming trimming;
-         SetStatus(DllExports::GdipGetStringFormatTrimming(
---- include/imm.h.orig	2008-01-18 22:17:20.000000000 +0900
-+++ include/imm.h	2009-08-21 09:21:56.000000000 +0900
-@@ -7,6 +7,13 @@
- #ifndef _IMM_
- #define _IMM_
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -715,5 +722,9 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif  // _IMM_
- 
---- include/imagehlp.h.orig	2008-01-18 22:17:20.000000000 +0900
-+++ include/imagehlp.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /*++ BUILD Version: 0000     Increment this if a change has global effects
- 
- Copyright (c) Microsoft Corporation. All rights reserved.
-@@ -59,6 +62,13 @@
- #include <wintrust.h>
- #endif
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -407,7 +417,7 @@
- IMAGEAPI
- TouchFileTimes (
-     __in HANDLE FileHandle,
--    __in_opt PSYSTEMTIME pSystemTime
-+    __in_opt LPSYSTEMTIME pSystemTime
-     );
- 
- BOOL
-@@ -3950,7 +3960,7 @@
- // ThreadId must be 4 bytes on all architectures.
- //
- 
--C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4);
-+//C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4);
- 
- typedef struct _MINIDUMP_THREAD {
-     ULONG32 ThreadId;
-@@ -4684,5 +4694,9 @@
- #endif
- 
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // _IMAGEHLP_
- 
---- include/mapiwin.h.orig	2008-01-18 22:17:22.000000000 +0900
-+++ include/mapiwin.h	2009-08-21 09:21:56.000000000 +0900
-@@ -428,5 +428,5 @@
- #endif
- 
- #endif /* __MAPIWIN_H__ */
--
-+
- 
---- include/msdasc.h.orig	2008-01-18 22:17:26.000000000 +0900
-+++ include/msdasc.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/msi.h.orig	2008-01-18 22:17:28.000000000 +0900
-+++ include/msi.h	2009-08-21 09:21:56.000000000 +0900
-@@ -59,6 +59,14 @@
- #endif // _MSI_NO_CRYPTO
- #endif //(_WIN32_MSI >= 150)
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- // --------------------------------------------------------------------------
- // Installer generic handle definitions
- // --------------------------------------------------------------------------
-@@ -2248,5 +2256,9 @@
- // LOCALIZE END
- 
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // _MSI_H_
- 
---- include/msiquery.h.orig	2008-01-18 22:17:28.000000000 +0900
-+++ include/msiquery.h	2009-08-21 09:21:56.000000000 +0900
-@@ -21,6 +21,14 @@
- #define _MSIQUERY_H_
- #include "msi.h"  // INSTALLSTATE
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #define MSI_NULL_INTEGER 0x80000000  // integer value reserved for null
- 
- // MsiOpenDatabase persist predefine values, otherwise output database path is used
-@@ -1026,5 +1034,9 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // _MSIQUERY_H_
- 
---- include/multimon.h.orig	2008-01-18 22:17:30.000000000 +0900
-+++ include/multimon.h	2009-08-21 09:21:56.000000000 +0900
-@@ -175,7 +175,7 @@
- 
- BOOL IsPlatformNT()
- { 
--    OSVERSIONINFOA osvi = {0};
-+    OSVERSIONINFOA osvi;
-     osvi.dwOSVersionInfoSize = sizeof(osvi);
-     GetVersionExA((OSVERSIONINFOA*)&osvi);
-     return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId);    
---- include/ntquery.h.orig	2008-01-18 22:17:30.000000000 +0900
-+++ include/ntquery.h	2009-02-16 21:34:39.065125000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- //+---------------------------------------------------------------------------
- //
- //  Microsoft Windows
-@@ -18,6 +21,14 @@
- 
- #include "stgprop.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #if defined(__cplusplus)
- extern "C"
- {
-@@ -404,6 +415,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // __NTQUERY_H__
- 
- 
---- include/oaidl.h.orig	2008-12-06 11:32:03.000000000 +0900
-+++ include/oaidl.h	2010-02-27 13:28:29.448250000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -442,7 +445,7 @@
-                 FLOAT fltVal;
-                 DOUBLE dblVal;
-                 VARIANT_BOOL boolVal;
--                _VARIANT_BOOL bool;
-+//                _VARIANT_BOOL bool;
-                 SCODE scode;
-                 CY cyVal;
-                 DATE date;
---- include/ocidl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/ocidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -294,6 +297,14 @@
- #include "servprov.h"
- #include "urlmon.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -4595,11 +4606,13 @@
- 	HITRESULT_HIT	= 3
-     } 	HITRESULT;
- 
-+#if 0
- typedef /* [v1_enum] */ 
- enum tagDVASPECT2
-     {	DVASPECT_OPAQUE	= 16,
- 	DVASPECT_TRANSPARENT	= 32
-     } 	DVASPECT2;
-+#endif
- 
- typedef struct tagExtentInfo
-     {
-@@ -6554,6 +6567,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/oleauto.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/oleauto.h	2009-08-21 09:21:56.000000000 +0900
-@@ -56,6 +56,14 @@
- /* pull in the MIDL generated header */
- #include <oaidl.h>
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- 
- /*---------------------------------------------------------------------*/
- /*                            BSTR API                                 */
-@@ -1160,7 +1168,7 @@
- 
- // Declare variant access functions.
- 
--#if __STDC__ || defined(NONAMELESSUNION)
-+#ifdef NONAMELESSUNION
- #define V_UNION(X, Y)   ((X)->n1.n2.n3.Y)
- #define V_VT(X)         ((X)->n1.n2.vt)
- #define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo)
-@@ -1242,5 +1250,9 @@
- #include <poppack.h>
- #endif // RC_INVOKED
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif     // __OLEAUTO_H__
- 
---- include/olectl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/olectl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -28,6 +28,14 @@
- #include <ocidl.h>
- #endif // _MAC
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef _OLEAUT32_
- #define WINOLECTLAPI        STDAPI
- #define WINOLECTLAPI_(type) STDAPI_(type)
-@@ -616,5 +624,9 @@
- 
- #endif // defined(__MKTYPLIB__) || defined(__midl)
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // _OLECTL_H_
- 
---- include/oledb.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/oledb.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -797,7 +800,7 @@
- 
- //@@@+ V2.0
- #if( OLEDBVER >= 0x0200 )
--#if !defined(_WINBASE_) && !defined(_FILETIME_)
-+#if !defined(_WINBASE_H) && !defined(_FILETIME_)
- #define _FILETIME_
- typedef struct _FILETIME {
- 		DWORD dwLowDateTime;
---- include/oleidl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/oleidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -189,6 +192,14 @@
- /* header files for imported files */
- #include "objidl.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -3868,6 +3879,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/propidl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/propidl.h	2010-02-27 14:11:52.213875000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -76,6 +79,14 @@
- #include "objidl.h"
- #include "oaidl.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -143,6 +154,7 @@
-     CHAR *pElems;
-     } 	CAC;
- 
-+#if 0
- typedef struct tagCAUB
-     {
-     ULONG cElems;
-@@ -268,7 +280,9 @@
-     ULONG cElems;
-     CLSID *pElems;
-     } 	CACLSID;
-+#endif
- 
-+#if 0
- #ifdef MIDL_PASS
- // This is the PROPVARIANT padding layout for marshaling.
- typedef BYTE PROPVAR_PAD1;
-@@ -385,6 +399,7 @@
- #endif
- 
- #endif /* _MSC_EXTENSIONS */
-+#endif
- 
- #ifdef MIDL_PASS
- // This is the LPPROPVARIANT definition for marshaling.
-@@ -509,6 +524,7 @@
- 
- #define	PRSPEC_PROPID	( 1 )
- 
-+#if 0
- typedef struct tagPROPSPEC
-     {
-     ULONG ulKind;
-@@ -526,12 +542,14 @@
-     PROPID propid;
-     VARTYPE vt;
-     } 	STATPROPSTG;
-+#endif
- 
- // Macros for parsing the OS Version of the Property Set Header
- #define PROPSETHDR_OSVER_KIND(dwOSVer)      HIWORD( (dwOSVer) )
- #define PROPSETHDR_OSVER_MAJOR(dwOSVer)     LOBYTE(LOWORD( (dwOSVer) ))
- #define PROPSETHDR_OSVER_MINOR(dwOSVer)     HIBYTE(LOWORD( (dwOSVer) ))
- #define PROPSETHDR_OSVERSION_UNKNOWN        0xFFFFFFFF
-+#if 0
- typedef struct tagSTATPROPSETSTG
-     {
-     FMTID fmtid;
-@@ -542,12 +560,14 @@
-     FILETIME atime;
-     DWORD dwOSVersion;
-     } 	STATPROPSETSTG;
-+#endif
- 
- 
- 
- extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_c_ifspec;
- extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_s_ifspec;
- 
-+#if 0
- #ifndef __IPropertyStorage_INTERFACE_DEFINED__
- #define __IPropertyStorage_INTERFACE_DEFINED__
- 
-@@ -1119,7 +1139,6 @@
- #endif 	/* C style interface */
- 
- 
--
- /* [call_as] */ HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_RemoteNext_Proxy( 
-     IEnumSTATPROPSETSTG * This,
-     /* [in] */ ULONG celt,
-@@ -1136,6 +1155,7 @@
- 
- 
- #endif 	/* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */
-+#endif
- 
- 
- /* interface __MIDL_itf_propidl_0000_0004 */
-@@ -1268,6 +1287,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/propkeydef.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/propkeydef.h	2009-08-21 09:21:56.000000000 +0900
-@@ -2,6 +2,10 @@
- #define PID_FIRST_USABLE 2
- #endif
- 
-+#ifndef __MIDL_CONST
-+#define __MIDL_CONST const
-+#endif
-+
- #ifndef REFPROPERTYKEY
- #ifdef __cplusplus
- #define REFPROPERTYKEY const PROPERTYKEY &
---- include/propsys.h.orig	2008-01-18 22:17:34.000000000 +0900
-+++ include/propsys.h	2009-08-21 09:21:56.000000000 +0900
-@@ -228,6 +228,14 @@
- #endif // 0
- #include <propkeydef.h>
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- 
- extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_c_ifspec;
- extern RPC_IF_HANDLE __MIDL_itf_propsys_0000_0000_v0_0_s_ifspec;
-@@ -3600,6 +3608,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/propvarutil.h.orig	2008-01-18 22:17:34.000000000 +0900
-+++ include/propvarutil.h	2010-02-26 19:34:40.863625000 +0900
-@@ -14,6 +14,14 @@
- #include <shtypes.h>
- #include <shlwapi.h>
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifndef PSSTDAPI
- #if defined(_PROPSYS_)
- #define PSSTDAPI          STDAPI
---- include/shlobj.h.orig	2008-01-18 22:17:36.000000000 +0900
-+++ include/shlobj.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /*===========================================================================
- 
- Copyright (c) Microsoft Corporation. All rights reserved.
-@@ -103,6 +106,14 @@
- #include <shtypes.h>
- #include <shobjidl.h>
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #if defined(_MSC_VER) && (_MSC_VER >= 1200)
- #pragma once
- #endif
-@@ -3117,7 +3128,7 @@
- SHSTDAPI_(BOOL)                 ILIsEqual(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2);
- SHSTDAPI_(BOOL)                 ILIsParent(__in PCIDLIST_ABSOLUTE pidl1, __in PCIDLIST_ABSOLUTE pidl2, BOOL fImmediate);
- SHSTDAPI                        ILSaveToStream(__in IStream *pstm, __in PCUIDLIST_RELATIVE pidl);
--DECLSPEC_DEPRECATED SHSTDAPI    ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl);
-+SHSTDAPI    ILLoadFromStream(__in IStream *pstm, __inout PIDLIST_RELATIVE *pidl);
- SHSTDAPI                        ILLoadFromStreamEx(__in IStream *pstm, __deref_out PIDLIST_RELATIVE *pidl);
- 
- #if (_WIN32_IE >= 0x0400)
-@@ -4578,5 +4589,9 @@
- #endif
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif /* _SHLOBJ_H_ */
- 
---- include/shobjidl.h.orig	2008-01-18 22:17:36.000000000 +0900
-+++ include/shobjidl.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -1667,6 +1670,14 @@
- #include "prsht.h"
- #include "propsys.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -6384,7 +6395,6 @@
- 
- typedef ICommDlgBrowser2 *LPCOMMDLGBROWSER2;
- 
--#endif  // NTDDI_WIN2K
- #if (_WIN32_IE >= _WIN32_IE_IE70)
- 
- 
-@@ -6727,6 +6737,7 @@
- /* [local] */ 
- 
- #endif  // (_WIN32_IE >= _WIN32_IE_IE70)
-+#endif  // NTDDI_WIN2K
- 
- 
- extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0026_v0_0_c_ifspec;
-@@ -7331,6 +7342,13 @@
- typedef LPTBBUTTON LPTBBUTTONSB;
- #endif //_NEVER_
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
- 
- extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_c_ifspec;
- extern RPC_IF_HANDLE __MIDL_itf_shobjidl_0000_0032_v0_0_s_ifspec;
-@@ -29000,6 +29018,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/shtypes.h.orig	2008-01-18 22:17:36.000000000 +0900
-+++ include/shtypes.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -137,7 +140,7 @@
- 
- #endif // defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)
- #include <poppack.h>
--typedef /* [unique] */  __RPC_unique_pointer BYTE_BLOB *wirePIDL;
-+//typedef /* [unique] */  __RPC_unique_pointer BYTE_BLOB *wirePIDL;
- 
- typedef /* [wire_marshal] */ ITEMIDLIST __unaligned *LPITEMIDLIST;
- 
---- include/sspi.h.orig	2008-01-18 22:17:38.000000000 +0900
-+++ include/sspi.h	2009-08-21 09:21:56.000000000 +0900
-@@ -20,6 +20,14 @@
- #define __SSPI_H__
- // end_ntifs
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #if _MSC_VER > 1000
- #pragma once
- #endif
-@@ -2154,8 +2162,7 @@
- 
- // begin_ntifs
- 
--#ifndef _AUTH_IDENTITY_DEFINED
--#define _AUTH_IDENTITY_DEFINED
-+#ifndef SEC_WINNT_AUTH_IDENTITY_ANSI
- 
- //
- // This was not defined in NTIFS.h for windows 2000 however
-@@ -2326,6 +2333,10 @@
- }  // extern "C"
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- // begin_ntifs
- #endif // __SSPI_H__
- // end_ntifs
---- include/strmif.h.orig	2008-01-18 22:17:38.000000000 +0900
-+++ include/strmif.h	2009-02-16 21:34:39.065125000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -888,6 +891,14 @@
- #include "oaidl.h"
- #include "ocidl.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -16250,7 +16261,7 @@
- #define _IAMFilterGraphCallback_
- // Note: Because this interface was not defined as a proper interface it is
- //       supported under C++ only. Methods aren't stdcall.
--EXTERN_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70);
-+DEFINE_GUID(IID_IAMFilterGraphCallback,0x56a868fd,0x0ad4,0x11ce,0xb0,0xa3,0x0,0x20,0xaf,0x0b,0xa7,0x70);
- interface IAMFilterGraphCallback : public IUnknown
- {
-     // S_OK means rendering complete, S_FALSE means retry now.
-@@ -21934,7 +21945,7 @@
- typedef struct tagVMRGUID
-     {
-     GUID *pGUID;
--    GUID GUID;
-+    GUID aGUID;
-     } 	VMRGUID;
- 
- typedef struct tagVMRMONITORINFO
-@@ -23341,6 +23352,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/strsafe.h.orig	2008-01-18 22:17:38.000000000 +0900
-+++ include/strsafe.h	2009-02-16 21:34:39.065125000 +0900
-@@ -13,12 +13,23 @@
- #if (_MSC_VER > 1000)
- #pragma once
- #endif
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #include <stdio.h>          // for _vsnprintf, _vsnwprintf, getc, getwc
- #include <string.h>         // for memset
- #include <stdarg.h>         // for va_start, etc.
- #include <specstrings.h>    // for __in, etc.
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #if !defined(_W64)
- #if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && (_MSC_VER >= 1300)
- #define _W64 __w64
-@@ -9254,7 +9265,7 @@
-             wchar_t ch = getwc(stdin);
-             // ASSERT(sizeof(wchar_t) == sizeof(wint_t));
-             
--            if (ch == WEOF)
-+            if (ch == 0xffff)
-             {
-                 if (cchNewDestLength == 0)
-                 {
-@@ -9763,5 +9774,9 @@
- 
- #pragma warning(pop)
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif  // _STRSAFE_H_INCLUDED_
- 
---- include/structuredquery.h.orig	2008-01-18 22:17:38.000000000 +0900
-+++ include/structuredquery.h	2009-08-21 09:21:56.000000000 +0900
-@@ -233,6 +233,14 @@
- #include "ocidl.h"
- #include "propidl.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -2472,6 +2480,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/urlmon.h.orig	2008-01-18 22:17:40.000000000 +0900
-+++ include/urlmon.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -330,6 +333,14 @@
- #include "servprov.h"
- #include "msxml.h"
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"{
- #endif 
-@@ -8880,6 +8891,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif
- 
- 
---- include/wincrypt.h.orig	2008-01-18 22:17:42.000000000 +0900
-+++ include/wincrypt.h	2009-02-16 21:34:39.065125000 +0900
-@@ -14,6 +14,14 @@
- 
- #include <specstrings.h>        /* for SAL annotations */
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- #if defined (_MSC_VER)
- 
- #if ( _MSC_VER >= 800 )
-@@ -1927,6 +1935,14 @@
- #include <bcrypt.h>
- #include <ncrypt.h>
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+
- // This type is used when the API can take either the CAPI1 HCRYPTPROV or
- // the CNG NCRYPT_KEY_HANDLE. Where appropriate, the HCRYPTPROV will be
- // converted to a NCRYPT_KEY_HANDLE via the CNG NCryptTranslateHandle().
-@@ -17113,8 +17129,8 @@
-     __in      DWORD                       dwFlags,
-     __in_opt  PCRYPT_KEY_PROV_INFO        pKeyProvInfo,
-     __in_opt  PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm,
--    __in_opt  PSYSTEMTIME                 pStartTime,
--    __in_opt  PSYSTEMTIME                 pEndTime,
-+    __in_opt  LPSYSTEMTIME                 pStartTime,
-+    __in_opt  LPSYSTEMTIME                 pEndTime,
-     __in_opt  PCERT_EXTENSIONS            pExtensions
-     );
- 
-@@ -19174,6 +19190,10 @@
- #endif
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // __WINCRYPT_H__
- 
- 
---- include/winerror.h.orig	2008-01-18 22:17:42.000000000 +0900
-+++ include/winerror.h	2009-08-21 09:21:56.000000000 +0900
-@@ -23,6 +23,11 @@
- 
- #include <specstrings.h>
- 
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
- //
- //  Values are 32 bit values laid out as follows:
- //
---- include/wingdi.h.orig	2008-01-18 22:17:42.000000000 +0900
-+++ include/wingdi.h	2009-08-21 09:21:56.000000000 +0900
-@@ -9,6 +9,13 @@
- #ifndef _WINGDI_
- #define _WINGDI_
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
- 
- #pragma once
- 
-@@ -1901,7 +1908,7 @@
- /* size of a form name string */
- #define CCHFORMNAME 32
- 
--#if (_WIN32_WINNT >= ((OSVER(NTDDI_WINXPSP2)) >> 16))
-+#if (_WIN32_WINNT >= ((NTDDI_WINXPSP2 & 0xFFFF0000) >> 16))
- typedef struct _devicemodeA {
-     BYTE   dmDeviceName[CCHDEVICENAME];
-     WORD dmSpecVersion;
-@@ -5424,6 +5431,10 @@
- }
- #endif
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif /* _WINGDI_ */
- 
- 
---- include/wintrust.h.orig	2008-01-18 22:17:42.000000000 +0900
-+++ include/wintrust.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1252,6 +1252,7 @@
- //
- #ifdef WT_DEFINE_ALL_APIS
- 
-+#if 0
- typedef struct _WIN_CERTIFICATE
- {
-     DWORD       dwLength;
-@@ -1260,6 +1261,7 @@
-     BYTE        bCertificate[ANYSIZE_ARRAY];
- 
- } WIN_CERTIFICATE, *LPWIN_CERTIFICATE;
-+#endif
- 
- #define WIN_CERT_REVISION_1_0               (0x0100)
- #define WIN_CERT_REVISION_2_0               (0x0200)
---- include/winuser.h.orig	2008-01-18 22:17:44.000000000 +0900
-+++ include/winuser.h	2009-08-21 09:21:56.000000000 +0900
-@@ -11,6 +11,15 @@
- #ifndef _WINUSER_
- #define _WINUSER_
- 
-+#define __in
-+#define __out
-+#ifdef __cplusplus
-+#define __inline inline
-+#else
-+#define __inline static __inline__
-+#endif
-+DECLARE_HANDLE(HHOOK);
-+typedef CONST GUID *LPCGUID;
- 
- 
- #pragma once
-@@ -39,7 +48,7 @@
- #define WINVER  0x0500      /* version 5.0 */
- #endif /* !WINVER */
- 
--#include <stdarg.h>
-+#include <../include/stdarg.h>
- 
- #ifndef NOUSER
- 
-@@ -10717,7 +10726,7 @@
- #define CDS_RESET                    0x40000000
- #define CDS_NORESET                  0x10000000
- 
--#include <tvout.h>
-+//#include <tvout.h>
- 
- /* Return values for ChangeDisplaySettings */
- #define DISP_CHANGE_SUCCESSFUL       0
-@@ -12571,16 +12580,20 @@
- 
- 
- 
--#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
--#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
--#include "winuser.inl"
--#endif /* ISOLATION_AWARE_ENABLED */
--#endif /* RC */
-+//#if !defined(RC_INVOKED) /* RC complains about long symbols in #ifs */
-+//#if defined(ISOLATION_AWARE_ENABLED) && (ISOLATION_AWARE_ENABLED != 0)
-+//#include "winuser.inl"
-+//#endif /* ISOLATION_AWARE_ENABLED */
-+//#endif /* RC */
- 
- #ifdef __cplusplus
- }
- #endif  /* __cplusplus */
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif /* !_WINUSER_ */
- 
- 
---- include/wspiapi.h.orig	2008-01-18 22:17:44.000000000 +0900
-+++ include/wspiapi.h	2009-08-21 09:21:56.000000000 +0900
-@@ -15,6 +15,9 @@
- 
- #ifndef _WSPIAPI_H_
- #define _WSPIAPI_H_
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #pragma once
- 
-@@ -85,6 +88,11 @@
- 
- #ifdef __cplusplus
- extern "C" {
-+#define _inline inline
-+#define __inline inline
-+#else
-+#define _inline static __inline__
-+#define __inline static __inline__
- #endif
-     
- ////////////////////////////////////////////////////////////
-@@ -1052,6 +1060,8 @@
-     (*pfFreeAddrInfo)(ai);
- }
- 
-+#undef _inline
-+#undef __inline
- #ifdef  __cplusplus
- }
- #endif
---- include/d3dtypes.h.orig	2004-09-27 12:34:16.000000000 +0900
-+++ include/d3dtypes.h	2007-11-30 21:42:09.558750000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- /*==========================================================================;
-  *
-  *  Copyright (C) Microsoft Corporation.  All Rights Reserved.
---- include/d3dx9core.h.orig	2006-03-31 12:16:02.000000000 +0900
-+++ include/d3dx9core.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- ///////////////////////////////////////////////////////////////////////////
- //
- //  Copyright (C) Microsoft Corporation.  All Rights Reserved.
---- include/d3dx9math.h.orig	2005-07-22 17:00:18.000000000 +0900
-+++ include/d3dx9math.h	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- //////////////////////////////////////////////////////////////////////////////
- //
- //  Copyright (C) Microsoft Corporation.  All Rights Reserved.
---- include/d3dx9math.inl.orig	2005-03-18 17:26:56.000000000 +0900
-+++ include/d3dx9math.inl	2009-08-21 09:21:56.000000000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- //////////////////////////////////////////////////////////////////////////////
- //
- //  Copyright (C) Microsoft Corporation.  All Rights Reserved.
---- include/dxtrans.h.orig	2004-09-28 00:18:32.000000000 +0900
-+++ include/dxtrans.h	2007-01-02 22:08:41.640625000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- #pragma warning( disable: 4049 )  /* more than 64k source lines */
- 
diff --git a/external/mingwm10/README_mingwm10.dll b/external/mingwm10/README_mingwm10.dll
deleted file mode 100644
index 992e9b6..0000000
--- a/external/mingwm10/README_mingwm10.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-Put the mingwm10.dll in this directory for Windows builds using
-a MinGW compiler. The dlls are part of the MinGW installation and can be found
-in the directory where the compiler binary is installed.
diff --git a/external/msm90/README_msm90.txt b/external/msm90/README_msm90.txt
deleted file mode 100644
index b943eea..0000000
--- a/external/msm90/README_msm90.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Put
-Microsoft_VC90_CRT_x86.msm
-and
-policy_9_0_Microsoft_VC90_CRT_x86.msm
-into this directory for Windows builds using a VS 2008 / VC 9.0 compiler.
-For builds with --enable-dbgutil also put
-Microsoft_VC90_DebugCRT_x86.msm
-and
-policy_9_0_Microsoft_VC90_DebugCRT_x86.msm
-here.
diff --git a/external/msvcp100/README_msvcX100.dll b/external/msvcp100/README_msvcX100.dll
deleted file mode 100644
index a1b0e73..0000000
--- a/external/msvcp100/README_msvcX100.dll
+++ /dev/null
@@ -1,2 +0,0 @@
-Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a
-VS 2010 / VC 10.0 compiler.
diff --git a/external/msvcp80/README_msvcX80.dll b/external/msvcp80/README_msvcX80.dll
deleted file mode 100644
index fa89ab9..0000000
--- a/external/msvcp80/README_msvcX80.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-Put the msvcp80.dll, msvcr80.dll and Microsoft.VC80.CRT.manifest in this
-directory for Windows builds using VS 2005, or using prebuilt Mozilla DLLs
-that were built using VS 2005.
diff --git a/external/msvcp90/README_msvcX90.dll b/external/msvcp90/README_msvcX90.dll
deleted file mode 100644
index b49cedb..0000000
--- a/external/msvcp90/README_msvcX90.dll
+++ /dev/null
@@ -1,2 +0,0 @@
-Put msvcm90.dll, msvcp90.dll, msvcr90.dll and Microsoft.VC90.CRT.manifest
-in this directory for Windows builds using a VS 2008 / VC 9.0 compiler.
diff --git a/external/prj/build.lst b/external/prj/build.lst
deleted file mode 100644
index 7847f24..0000000
--- a/external/prj/build.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-el      external :       soltools NULL
-el	external					usr1 - all el_mkout NULL
-el	external\glibc		nmake	-	all	el_glibc NULL
-el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL
-el	external\mingwheaders		nmake	-	w	el_mingwheaders NULL
-el	external\jawt		nmake	-	w	el_jawt NULL
-el	external\wine		nmake	-	w	el_wine NULL
diff --git a/external/prj/d.lst b/external/prj/d.lst
deleted file mode 100644
index 3891210..0000000
--- a/external/prj/d.lst
+++ /dev/null
@@ -1,66 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\glibc
-mkdir: %_DEST%\inc\external\mingw
-mkdir: %_DEST%\inc\external\mingw\include
-mkdir: %_DEST%\inc\external\mingw\include\atl
-mkdir: %_DEST%\inc\external\mingw\include\sys
-mkdir: %_DEST%\inc\external\wine
-
-..\glibc\rtufiles\config.h %_DEST%\inc\external\glibc\config.h
-..\glibc\rtufiles\getopt.h %_DEST%\inc\external\glibc\getopt.h
-
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib\libgnu_getopt.a
-..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib\libgnu_getopt_static.a
-
-..\%__SRC%\inc\*.h %_DEST%\inc\external\glibc\*.h
-
-..\%__SRC%\inc\wine\*.h %_DEST%\inc\external\wine\*.h
-
-..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc\external\mingw\include\*
-..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc\external\mingw\include\atl\*
-..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc\external\mingw\include\sys\*
-
-..\%__SRC%\lib\libautorec*.* %_DEST%\lib\lib*.*
-
-..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib\libgcc_s.so.*
-..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib\libstdc++.so.*
-
-..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll
-
-..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll
-
-..\msvcp80\msvcm80*.dll %_DEST%\bin
-..\msvcp80\msvcp80*.dll %_DEST%\bin
-..\msvcp80\msvcr80*.dll %_DEST%\bin
-..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin\Microsoft.VC80.DebugCRT.manifest
-
-..\msvcp90\msvcm90*.dll %_DEST%\bin
-..\msvcp90\msvcp90*.dll %_DEST%\bin
-..\msvcp90\msvcr90*.dll %_DEST%\bin
-..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest
-..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest
-..\msm90\*.msm %_DEST%\bin
-
-..\unowinreg\unowinreg.dll %_DEST%\bin\unowinreg.dll
-
-..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe
-..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe
-
-..\%__SRC%\bin\mingwm10.dll %_DEST%\bin\mingwm10.dll
-..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll
-..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll
-
-..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.*
-
-..\%__SRC%\lib\libgdiplus.dll.a %_DEST%\lib\libgdiplus.dll.a
-..\%__SRC%\lib\libmsi.dll.a %_DEST%\lib\libmsi.dll.a
-..\%__SRC%\lib\liburlmon.dll.a %_DEST%\lib\liburlmon.dll.a
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
-
-..\%__SRC%\lib\libjawt.dll.a %_DEST%\lib\libjawt.dll.a
-
-linklib: libgcc_s.*.*
-
diff --git a/external/unowinreg/README b/external/unowinreg/README
deleted file mode 100644
index 464f64b..0000000
--- a/external/unowinreg/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Copy unowinreg.dll from http://tools.openoffice.org/unowinreg_prebuild/680/
-here... [ or rebuild it using --with-mingwin= ]
diff --git a/external/vcredist/README_vcredistX.exe b/external/vcredist/README_vcredistX.exe
deleted file mode 100644
index fcea383..0000000
--- a/external/vcredist/README_vcredistX.exe
+++ /dev/null
@@ -1,2 +0,0 @@
-Put into this directory the vcredist_x86.exe and vcredist_x64.exe
-correspoding to the runtime your Visual Studio version links with.
diff --git a/external/wine/include/gdiplus.h b/external/wine/include/gdiplus.h
deleted file mode 100644
index f063b3e..0000000
--- a/external/wine/include/gdiplus.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUS_H
-#define _GDIPLUS_H
-
-#ifdef __cplusplus
-
-namespace Gdiplus
-{
-    namespace DllExports
-    {
-#include "gdiplusmem.h"
-    };
-
-#include "gdiplusenums.h"
-#include "gdiplustypes.h"
-#include "gdiplusinit.h"
-#include "gdipluspixelformats.h"
-#include "gdiplusmetaheader.h"
-#include "gdiplusimaging.h"
-#include "gdipluscolor.h"
-#include "gdipluscolormatrix.h"
-#include "gdiplusgpstubs.h"
-
-    namespace DllExports
-    {
-#include "gdiplusflat.h"
-    };
-};
-
-#else /* end c++ includes */
-
-#include "gdiplusmem.h"
-
-#include "gdiplusenums.h"
-#include "gdiplustypes.h"
-#include "gdiplusinit.h"
-#include "gdipluspixelformats.h"
-#include "gdiplusmetaheader.h"
-#include "gdiplusimaging.h"
-#include "gdipluscolor.h"
-#include "gdipluscolormatrix.h"
-#include "gdiplusgpstubs.h"
-
-#include "gdiplusflat.h"
-
-#endif /* end c includes */
-
-#endif /* _GDIPLUS_H_ */
diff --git a/external/wine/include/gdipluscolor.h b/external/wine/include/gdipluscolor.h
deleted file mode 100644
index 47a2e04..0000000
--- a/external/wine/include/gdipluscolor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2808 Google (Lei Zhang)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSCOLOR_H
-#define _GDIPLUSCOLOR_H
-
-enum ColorChannelFlags
-{
-    ColorChannelFlagsC,
-    ColorChannelFlagsM,
-    ColorChannelFlagsY,
-    ColorChannelFlagsK,
-    ColorChannelFlagsLast
-};
-
-#ifdef __cplusplus
-
-class Color
-{
- public:
-    Color(BYTE a, BYTE r, BYTE g, BYTE b)
-    {
-        Argb = (((a<<24)&0xFF000000) | ((r<<16)&0x00FF0000) | ((g<<8)&0x0000FF00) | (b&0x000000FF));
-    }
-    ARGB GetValue() const
-    {
-        return Argb;
-    }
-protected:
-    ARGB Argb;
-};
-
-#else /* end of c++ typedefs */
-
-typedef struct Color
-{
-    ARGB Argb;
-} Color;
-
-typedef enum ColorChannelFlags ColorChannelFlags;
-
-#endif  /* end of c typedefs */
-
-#endif  /* _GDIPLUSCOLOR_H */
diff --git a/external/wine/include/gdipluscolormatrix.h b/external/wine/include/gdipluscolormatrix.h
deleted file mode 100644
index fbf1b2a..0000000
--- a/external/wine/include/gdipluscolormatrix.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSCOLORMATRIX_H
-#define _GDIPLUSCOLORMATRIX_H
-
-struct ColorMatrix
-{
-    REAL m[5][5];
-};
-
-enum ColorMatrixFlags
-{
-    ColorMatrixFlagsDefault    = 0,
-    ColorMatrixFlagsSkipGrays  = 1,
-    ColorMatrixFlagsAltGray    = 2
-};
-
-enum ColorAdjustType
-{
-    ColorAdjustTypeDefault,
-    ColorAdjustTypeBitmap,
-    ColorAdjustTypeBrush,
-    ColorAdjustTypePen,
-    ColorAdjustTypeText,
-    ColorAdjustTypeCount,
-    ColorAdjustTypeAny
-};
-
-struct ColorMap
-{
-    Color oldColor;
-    Color newColor;
-};
-
-#ifndef __cplusplus
-
-typedef enum ColorAdjustType ColorAdjustType;
-typedef enum ColorMatrixFlags ColorMatrixFlags;
-typedef struct ColorMatrix ColorMatrix;
-typedef struct ColorMap ColorMap;
-
-#endif  /* end of c typedefs */
-
-#endif  /* _GDIPLUSCOLORMATRIX_H */
diff --git a/external/wine/include/gdiplusenums.h b/external/wine/include/gdiplusenums.h
deleted file mode 100644
index 69c8154..0000000
--- a/external/wine/include/gdiplusenums.h
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSENUMS_H
-#define _GDIPLUSENUMS_H
-
-typedef UINT GraphicsState;
-typedef UINT GraphicsContainer;
-
-enum Unit
-{
-    UnitWorld       = 0,
-    UnitDisplay     = 1,
-    UnitPixel       = 2,
-    UnitPoint       = 3,
-    UnitInch        = 4,
-    UnitDocument    = 5,
-    UnitMillimeter  = 6
-};
-
-enum BrushType
-{
-   BrushTypeSolidColor       = 0,
-   BrushTypeHatchFill        = 1,
-   BrushTypeTextureFill      = 2,
-   BrushTypePathGradient     = 3,
-   BrushTypeLinearGradient   = 4
-};
-
-enum DriverStringOptions
-{
-   DriverStringOptionsCmapLookup      = 1,
-   DriverStringOptionsVertical        = 2,
-   DriverStringOptionsRealizedAdvance = 4,
-   DriverStringOptionsLimitSubpixel   = 4
-};
-
-enum FillMode
-{
-    FillModeAlternate   = 0,
-    FillModeWinding     = 1
-};
-
-enum LineCap
-{
-    LineCapFlat             = 0x00,
-    LineCapSquare           = 0x01,
-    LineCapRound            = 0x02,
-    LineCapTriangle         = 0x03,
-
-    LineCapNoAnchor         = 0x10,
-    LineCapSquareAnchor     = 0x11,
-    LineCapRoundAnchor      = 0x12,
-    LineCapDiamondAnchor    = 0x13,
-    LineCapArrowAnchor      = 0x14,
-
-    LineCapCustom           = 0xff,
-    LineCapAnchorMask       = 0xf0
-};
-
-enum PathPointType{
-    PathPointTypeStart          = 0,    /* start of a figure */
-    PathPointTypeLine           = 1,
-    PathPointTypeBezier         = 3,
-    PathPointTypePathTypeMask   = 7,
-    PathPointTypePathDashMode   = 16,   /* not used */
-    PathPointTypePathMarker     = 32,
-    PathPointTypeCloseSubpath   = 128,  /* end of a closed figure */
-    PathPointTypeBezier3        = 3
-};
-
-enum PenType
-{
-   PenTypeSolidColor       = BrushTypeSolidColor,
-   PenTypeHatchFill        = BrushTypeHatchFill,
-   PenTypeTextureFill      = BrushTypeTextureFill,
-   PenTypePathGradient     = BrushTypePathGradient,
-   PenTypeLinearGradient   = BrushTypeLinearGradient,
-   PenTypeUnknown          = -1
-};
-
-enum LineJoin
-{
-    LineJoinMiter           = 0,
-    LineJoinBevel           = 1,
-    LineJoinRound           = 2,
-    LineJoinMiterClipped    = 3
-};
-
-enum QualityMode
-{
-    QualityModeInvalid  = -1,
-    QualityModeDefault  = 0,
-    QualityModeLow      = 1,
-    QualityModeHigh     = 2
-};
-
-enum SmoothingMode
-{
-    SmoothingModeInvalid     = QualityModeInvalid,
-    SmoothingModeDefault     = QualityModeDefault,
-    SmoothingModeHighSpeed   = QualityModeLow,
-    SmoothingModeHighQuality = QualityModeHigh,
-    SmoothingModeNone,
-    SmoothingModeAntiAlias
-};
-
-enum CompositingQuality
-{
-    CompositingQualityInvalid          = QualityModeInvalid,
-    CompositingQualityDefault          = QualityModeDefault,
-    CompositingQualityHighSpeed        = QualityModeLow,
-    CompositingQualityHighQuality      = QualityModeHigh,
-    CompositingQualityGammaCorrected,
-    CompositingQualityAssumeLinear
-};
-
-enum InterpolationMode
-{
-    InterpolationModeInvalid        = QualityModeInvalid,
-    InterpolationModeDefault        = QualityModeDefault,
-    InterpolationModeLowQuality     = QualityModeLow,
-    InterpolationModeHighQuality    = QualityModeHigh,
-    InterpolationModeBilinear,
-    InterpolationModeBicubic,
-    InterpolationModeNearestNeighbor,
-    InterpolationModeHighQualityBilinear,
-    InterpolationModeHighQualityBicubic
-};
-
-enum PenAlignment
-{
-    PenAlignmentCenter   = 0,
-    PenAlignmentInset    = 1
-};
-
-enum PixelOffsetMode
-{
-    PixelOffsetModeInvalid     = QualityModeInvalid,
-    PixelOffsetModeDefault     = QualityModeDefault,
-    PixelOffsetModeHighSpeed   = QualityModeLow,
-    PixelOffsetModeHighQuality = QualityModeHigh,
-    PixelOffsetModeNone,
-    PixelOffsetModeHalf
-};
-
-enum DashCap
-{
-    DashCapFlat     = 0,
-    DashCapRound    = 2,
-    DashCapTriangle = 3
-};
-
-enum DashStyle
-{
-    DashStyleSolid,
-    DashStyleDash,
-    DashStyleDot,
-    DashStyleDashDot,
-    DashStyleDashDotDot,
-    DashStyleCustom
-};
-
-enum MatrixOrder
-{
-    MatrixOrderPrepend = 0,
-    MatrixOrderAppend  = 1
-};
-
-enum ImageType
-{
-    ImageTypeUnknown,
-    ImageTypeBitmap,
-    ImageTypeMetafile
-};
-
-enum WarpMode {
-    WarpModePerspective,
-    WarpModeBilinear
-};
-
-enum WrapMode
-{
-    WrapModeTile,
-    WrapModeTileFlipX,
-    WrapModeTileFlipY,
-    WrapModeTileFlipXY,
-    WrapModeClamp
-};
-
-enum MetafileType
-{
-    MetafileTypeInvalid,
-    MetafileTypeWmf,
-    MetafileTypeWmfPlaceable,
-    MetafileTypeEmf,
-    MetafileTypeEmfPlusOnly,
-    MetafileTypeEmfPlusDual
-};
-
-enum LinearGradientMode
-{
-    LinearGradientModeHorizontal,
-    LinearGradientModeVertical,
-    LinearGradientModeForwardDiagonal,
-    LinearGradientModeBackwardDiagonal
-};
-
-enum EmfType
-{
-    EmfTypeEmfOnly     = MetafileTypeEmf,
-    EmfTypeEmfPlusOnly = MetafileTypeEmfPlusOnly,
-    EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual
-};
-
-enum CompositingMode
-{
-    CompositingModeSourceOver,
-    CompositingModeSourceCopy
-};
-
-enum TextRenderingHint
-{
-    TextRenderingHintSystemDefault = 0,
-    TextRenderingHintSingleBitPerPixelGridFit,
-    TextRenderingHintSingleBitPerPixel,
-    TextRenderingHintAntiAliasGridFit,
-    TextRenderingHintAntiAlias,
-    TextRenderingHintClearTypeGridFit
-};
-
-enum StringAlignment
-{
-    StringAlignmentNear    = 0,
-    StringAlignmentCenter  = 1,
-    StringAlignmentFar     = 2
-};
-
-enum  StringDigitSubstitute
-{
-    StringDigitSubstituteUser        = 0,
-    StringDigitSubstituteNone        = 1,
-    StringDigitSubstituteNational    = 2,
-    StringDigitSubstituteTraditional = 3
-};
-
-enum StringFormatFlags
-{
-    StringFormatFlagsDirectionRightToLeft  = 0x00000001,
-    StringFormatFlagsDirectionVertical     = 0x00000002,
-    StringFormatFlagsNoFitBlackBox         = 0x00000004,
-    StringFormatFlagsDisplayFormatControl  = 0x00000020,
-    StringFormatFlagsNoFontFallback        = 0x00000400,
-    StringFormatFlagsMeasureTrailingSpaces = 0x00000800,
-    StringFormatFlagsNoWrap                = 0x00001000,
-    StringFormatFlagsLineLimit             = 0x00002000,
-    StringFormatFlagsNoClip                = 0x00004000
-};
-
-enum StringTrimming
-{
-    StringTrimmingNone                 = 0,
-    StringTrimmingCharacter            = 1,
-    StringTrimmingWord                 = 2,
-    StringTrimmingEllipsisCharacter    = 3,
-    StringTrimmingEllipsisWord         = 4,
-    StringTrimmingEllipsisPath         = 5
-};
-
-enum FontStyle
-{
-    FontStyleRegular    = 0,
-    FontStyleBold       = 1,
-    FontStyleItalic     = 2,
-    FontStyleBoldItalic = 3,
-    FontStyleUnderline  = 4,
-    FontStyleStrikeout  = 8
-};
-
-enum HotkeyPrefix
-{
-    HotkeyPrefixNone   = 0,
-    HotkeyPrefixShow   = 1,
-    HotkeyPrefixHide   = 2
-};
-
-enum PaletteFlags
-{
-    PaletteFlagsHasAlpha        = 1,
-    PaletteFlagsGrayScale       = 2,
-    PaletteFlagsHalftone        = 4
-};
-
-enum ImageCodecFlags
-{
-    ImageCodecFlagsEncoder          = 1,
-    ImageCodecFlagsDecoder          = 2,
-    ImageCodecFlagsSupportBitmap    = 4,
-    ImageCodecFlagsSupportVector    = 8,
-    ImageCodecFlagsSeekableEncode   = 16,
-    ImageCodecFlagsBlockingDecode   = 32,
-    ImageCodecFlagsBuiltin          = 65536,
-    ImageCodecFlagsSystem           = 131072,
-    ImageCodecFlagsUser             = 262144
-};
-
-enum ImageFlags
-{
-    ImageFlagsNone              = 0,
-    ImageFlagsScalable          = 0x0001,
-    ImageFlagsHasAlpha          = 0x0002,
-    ImageFlagsHasTranslucent    = 0x0004,
-    ImageFlagsPartiallyScalable = 0x0008,
-    ImageFlagsColorSpaceRGB     = 0x0010,
-    ImageFlagsColorSpaceCMYK    = 0x0020,
-    ImageFlagsColorSpaceGRAY    = 0x0040,
-    ImageFlagsColorSpaceYCBCR   = 0x0080,
-    ImageFlagsColorSpaceYCCK    = 0x0100,
-    ImageFlagsHasRealDPI        = 0x1000,
-    ImageFlagsHasRealPixelSize  = 0x2000,
-    ImageFlagsReadOnly          = 0x00010000,
-    ImageFlagsCaching           = 0x00020000
-};
-
-enum CombineMode
-{
-    CombineModeReplace,
-    CombineModeIntersect,
-    CombineModeUnion,
-    CombineModeXor,
-    CombineModeExclude,
-    CombineModeComplement
-};
-
-enum FlushIntention
-{
-    FlushIntentionFlush = 0,
-    FlushIntentionSync  = 1
-};
-
-enum CoordinateSpace
-{
-    CoordinateSpaceWorld,
-    CoordinateSpacePage,
-    CoordinateSpaceDevice
-};
-
-enum GpTestControlEnum
-{
-    TestControlForceBilinear  = 0,
-    TestControlNoICM          = 1,
-    TestControlGetBuildNumber = 2
-};
-
-enum MetafileFrameUnit
-{
-    MetafileFrameUnitPixel      = UnitPixel,
-    MetafileFrameUnitPoint      = UnitPoint,
-    MetafileFrameUnitInch       = UnitInch,
-    MetafileFrameUnitDocument   = UnitDocument,
-    MetafileFrameUnitMillimeter = UnitMillimeter,
-    MetafileFrameUnitGdi
-};
-
-enum HatchStyle
-{
-	HatchStyleHorizontal = 0,
-	HatchStyleVertical = 1,
-	HatchStyleForwardDiagonal = 2,
-	HatchStyleBackwardDiagonal = 3,
-	HatchStyleCross = 4,
-	HatchStyleDiagonalCross = 5,
-	HatchStyle05Percent = 6,
-	HatchStyle10Percent = 7,
-	HatchStyle20Percent = 8,
-	HatchStyle25Percent = 9,
-	HatchStyle30Percent = 10,
-	HatchStyle40Percent = 11,
-	HatchStyle50Percent = 12,
-	HatchStyle60Percent = 13,
-	HatchStyle70Percent = 14,
-	HatchStyle75Percent = 15,
-	HatchStyle80Percent = 16,
-	HatchStyle90Percent = 17,
-	HatchStyleLightDownwardDiagonal = 18,
-	HatchStyleLightUpwardDiagonal = 19,
-	HatchStyleDarkDownwardDiagonal = 20,
-	HatchStyleDarkUpwardDiagonal = 21,
-	HatchStyleWideDownwardDiagonal = 22,
-	HatchStyleWideUpwardDiagonal = 23,
-	HatchStyleLightVertical = 24,
-	HatchStyleLightHorizontal = 25,
-	HatchStyleNarrowVertical = 26,
-	HatchStyleNarrowHorizontal = 27,
-	HatchStyleDarkVertical = 28,
-	HatchStyleDarkHorizontal = 29,
-	HatchStyleDashedDownwardDiagonal = 30,
-	HatchStyleDashedUpwardDiagonal = 31,
-	HatchStyleDashedHorizontal = 32,
-	HatchStyleDashedVertical = 33,
-	HatchStyleSmallConfetti = 34,
-	HatchStyleLargeConfetti = 35,
-	HatchStyleZigZag = 36,
-	HatchStyleWave = 37,
-	HatchStyleDiagonalBrick = 38,
-	HatchStyleHorizontalBrick = 39,
-	HatchStyleWeave = 40,
-	HatchStylePlaid = 41,
-	HatchStyleDivot = 42,
-	HatchStyleDottedGrid = 43,
-	HatchStyleDottedDiamond = 44,
-	HatchStyleShingle = 45,
-	HatchStyleTrellis = 46,
-	HatchStyleSphere = 47,
-	HatchStyleSmallGrid = 48,
-	HatchStyleSmallCheckerBoard = 49,
-	HatchStyleLargeCheckerBoard = 50,
-	HatchStyleOutlinedDiamond = 51,
-	HatchStyleSolidDiamond = 52,
-	HatchStyleTotal = 53,
-	HatchStyleLargeGrid = HatchStyleCross,
-	HatchStyleMin = HatchStyleHorizontal,
-	HatchStyleMax = HatchStyleTotal - 1
-};
-
-#define GDIP_EMFPLUS_RECORD_BASE 0x00004000
-#define GDIP_WMF_RECORD_BASE 0x00010000
-#define GDIP_WMF_RECORD_TO_EMFPLUS(x) ((x)|GDIP_WMF_RECORD_BASE)
-
-enum EmfPlusRecordType {
-    WmfRecordTypeSetBkColor = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETBKCOLOR),
-    WmfRecordTypeSetBkMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETBKMODE),
-    WmfRecordTypeSetMapMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETMAPMODE),
-    WmfRecordTypeSetROP2 = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETROP2),
-    WmfRecordTypeSetRelAbs = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETRELABS),
-    WmfRecordTypeSetPolyFillMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETPOLYFILLMODE),
-    WmfRecordTypeSetStretchBltMode = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETSTRETCHBLTMODE),
-    WmfRecordTypeSetTextCharExtra = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTCHAREXTRA),
-    WmfRecordTypeSetTextColor = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTCOLOR),
-    WmfRecordTypeSetTextJustification = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTJUSTIFICATION),
-    WmfRecordTypeSetWindowOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETWINDOWORG),
-    WmfRecordTypeSetWindowExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETWINDOWEXT),
-    WmfRecordTypeSetViewportOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETVIEWPORTORG),
-    WmfRecordTypeSetViewportExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETVIEWPORTEXT),
-    WmfRecordTypeOffsetWindowOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_OFFSETWINDOWORG),
-    WmfRecordTypeScaleWindowExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SCALEWINDOWEXT),
-    WmfRecordTypeOffsetViewportOrg = GDIP_WMF_RECORD_TO_EMFPLUS(META_OFFSETVIEWPORTORG),
-    WmfRecordTypeScaleViewportExt = GDIP_WMF_RECORD_TO_EMFPLUS(META_SCALEVIEWPORTEXT),
-    WmfRecordTypeLineTo = GDIP_WMF_RECORD_TO_EMFPLUS(META_LINETO),
-    WmfRecordTypeMoveTo = GDIP_WMF_RECORD_TO_EMFPLUS(META_MOVETO),
-    WmfRecordTypeExcludeClipRect = GDIP_WMF_RECORD_TO_EMFPLUS(META_EXCLUDECLIPRECT),
-    WmfRecordTypeIntersectClipRect = GDIP_WMF_RECORD_TO_EMFPLUS(META_INTERSECTCLIPRECT),
-    WmfRecordTypeArc = GDIP_WMF_RECORD_TO_EMFPLUS(META_ARC),
-    WmfRecordTypeEllipse = GDIP_WMF_RECORD_TO_EMFPLUS(META_ELLIPSE),
-    WmfRecordTypeFloodFill = GDIP_WMF_RECORD_TO_EMFPLUS(META_FLOODFILL),
-    WmfRecordTypePie = GDIP_WMF_RECORD_TO_EMFPLUS(META_PIE),
-    WmfRecordTypeRectangle = GDIP_WMF_RECORD_TO_EMFPLUS(META_RECTANGLE),
-    WmfRecordTypeRoundRect = GDIP_WMF_RECORD_TO_EMFPLUS(META_ROUNDRECT),
-    WmfRecordTypePatBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_PATBLT),
-    WmfRecordTypeSaveDC = GDIP_WMF_RECORD_TO_EMFPLUS(META_SAVEDC),
-    WmfRecordTypeSetPixel = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETPIXEL),
-    WmfRecordTypeOffsetClipRgn = GDIP_WMF_RECORD_TO_EMFPLUS(META_OFFSETCLIPRGN),
-    WmfRecordTypeTextOut = GDIP_WMF_RECORD_TO_EMFPLUS(META_TEXTOUT),
-    WmfRecordTypeBitBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_BITBLT),
-    WmfRecordTypeStretchBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_STRETCHBLT),
-    WmfRecordTypePolygon = GDIP_WMF_RECORD_TO_EMFPLUS(META_POLYGON),
-    WmfRecordTypePolyline = GDIP_WMF_RECORD_TO_EMFPLUS(META_POLYLINE),
-    WmfRecordTypeEscape = GDIP_WMF_RECORD_TO_EMFPLUS(META_ESCAPE),
-    WmfRecordTypeRestoreDC = GDIP_WMF_RECORD_TO_EMFPLUS(META_RESTOREDC),
-    WmfRecordTypeFillRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_FILLREGION),
-    WmfRecordTypeFrameRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_FRAMEREGION),
-    WmfRecordTypeInvertRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_INVERTREGION),
-    WmfRecordTypePaintRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_PAINTREGION),
-    WmfRecordTypeSelectClipRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_SELECTCLIPREGION),
-    WmfRecordTypeSelectObject = GDIP_WMF_RECORD_TO_EMFPLUS(META_SELECTOBJECT),
-    WmfRecordTypeSetTextAlign = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETTEXTALIGN),
-    WmfRecordTypeDrawText = GDIP_WMF_RECORD_TO_EMFPLUS(0x062F),
-    WmfRecordTypeChord = GDIP_WMF_RECORD_TO_EMFPLUS(META_CHORD),
-    WmfRecordTypeSetMapperFlags = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETMAPPERFLAGS),
-    WmfRecordTypeExtTextOut = GDIP_WMF_RECORD_TO_EMFPLUS(META_EXTTEXTOUT),
-    WmfRecordTypeSetDIBToDev = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETDIBTODEV),
-    WmfRecordTypeSelectPalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_SELECTPALETTE),
-    WmfRecordTypeRealizePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_REALIZEPALETTE),
-    WmfRecordTypeAnimatePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_ANIMATEPALETTE),
-    WmfRecordTypeSetPalEntries = GDIP_WMF_RECORD_TO_EMFPLUS(META_SETPALENTRIES),
-    WmfRecordTypePolyPolygon = GDIP_WMF_RECORD_TO_EMFPLUS(META_POLYPOLYGON),
-    WmfRecordTypeResizePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_RESIZEPALETTE),
-    WmfRecordTypeDIBBitBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_DIBBITBLT),
-    WmfRecordTypeDIBStretchBlt = GDIP_WMF_RECORD_TO_EMFPLUS(META_DIBSTRETCHBLT),
-    WmfRecordTypeDIBCreatePatternBrush = GDIP_WMF_RECORD_TO_EMFPLUS(META_DIBCREATEPATTERNBRUSH),
-    WmfRecordTypeStretchDIB = GDIP_WMF_RECORD_TO_EMFPLUS(META_STRETCHDIB),
-    WmfRecordTypeExtFloodFill = GDIP_WMF_RECORD_TO_EMFPLUS(META_EXTFLOODFILL),
-    WmfRecordTypeSetLayout = GDIP_WMF_RECORD_TO_EMFPLUS(0x0149),
-    WmfRecordTypeResetDC = GDIP_WMF_RECORD_TO_EMFPLUS(0x014C),
-    WmfRecordTypeStartDoc = GDIP_WMF_RECORD_TO_EMFPLUS(0x014D),
-    WmfRecordTypeStartPage = GDIP_WMF_RECORD_TO_EMFPLUS(0x004F),
-    WmfRecordTypeEndPage = GDIP_WMF_RECORD_TO_EMFPLUS(0x0050),
-    WmfRecordTypeAbortDoc = GDIP_WMF_RECORD_TO_EMFPLUS(0x0052),
-    WmfRecordTypeEndDoc = GDIP_WMF_RECORD_TO_EMFPLUS(0x005E),
-    WmfRecordTypeDeleteObject = GDIP_WMF_RECORD_TO_EMFPLUS(META_DELETEOBJECT),
-    WmfRecordTypeCreatePalette = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEPALETTE),
-    WmfRecordTypeCreateBrush = GDIP_WMF_RECORD_TO_EMFPLUS(0x00F8),
-    WmfRecordTypeCreatePatternBrush = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEPATTERNBRUSH),
-    WmfRecordTypeCreatePenIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEPENINDIRECT),
-    WmfRecordTypeCreateFontIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEFONTINDIRECT),
-    WmfRecordTypeCreateBrushIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEBRUSHINDIRECT),
-    WmfRecordTypeCreateBitmapIndirect = GDIP_WMF_RECORD_TO_EMFPLUS(0x02FD),
-    WmfRecordTypeCreateBitmap = GDIP_WMF_RECORD_TO_EMFPLUS(0x06FE),
-    WmfRecordTypeCreateRegion = GDIP_WMF_RECORD_TO_EMFPLUS(META_CREATEREGION),
-    EmfRecordTypeHeader = EMR_HEADER,
-    EmfRecordTypePolyBezier = EMR_POLYBEZIER,
-    EmfRecordTypePolygon = EMR_POLYGON,
-    EmfRecordTypePolyline = EMR_POLYLINE,
-    EmfRecordTypePolyBezierTo = EMR_POLYBEZIERTO,
-    EmfRecordTypePolyLineTo = EMR_POLYLINETO,
-    EmfRecordTypePolyPolyline = EMR_POLYPOLYLINE,
-    EmfRecordTypePolyPolygon = EMR_POLYPOLYGON,
-    EmfRecordTypeSetWindowExtEx = EMR_SETWINDOWEXTEX,
-    EmfRecordTypeSetWindowOrgEx = EMR_SETWINDOWORGEX,
-    EmfRecordTypeSetViewportExtEx = EMR_SETVIEWPORTEXTEX,
-    EmfRecordTypeSetViewportOrgEx = EMR_SETVIEWPORTORGEX,
-    EmfRecordTypeSetBrushOrgEx = EMR_SETBRUSHORGEX,
-    EmfRecordTypeEOF = EMR_EOF,
-    EmfRecordTypeSetPixelV = EMR_SETPIXELV,
-    EmfRecordTypeSetMapperFlags = EMR_SETMAPPERFLAGS,
-    EmfRecordTypeSetMapMode = EMR_SETMAPMODE,
-    EmfRecordTypeSetBkMode = EMR_SETBKMODE,
-    EmfRecordTypeSetPolyFillMode = EMR_SETPOLYFILLMODE,
-    EmfRecordTypeSetROP2 = EMR_SETROP2,
-    EmfRecordTypeSetStretchBltMode = EMR_SETSTRETCHBLTMODE,
-    EmfRecordTypeSetTextAlign = EMR_SETTEXTALIGN,
-    EmfRecordTypeSetColorAdjustment = EMR_SETCOLORADJUSTMENT,
-    EmfRecordTypeSetTextColor = EMR_SETTEXTCOLOR,
-    EmfRecordTypeSetBkColor = EMR_SETBKCOLOR,
-    EmfRecordTypeOffsetClipRgn = EMR_OFFSETCLIPRGN,
-    EmfRecordTypeMoveToEx = EMR_MOVETOEX,
-    EmfRecordTypeSetMetaRgn = EMR_SETMETARGN,
-    EmfRecordTypeExcludeClipRect = EMR_EXCLUDECLIPRECT,
-    EmfRecordTypeIntersectClipRect = EMR_INTERSECTCLIPRECT,
-    EmfRecordTypeScaleViewportExtEx = EMR_SCALEVIEWPORTEXTEX,
-    EmfRecordTypeScaleWindowExtEx = EMR_SCALEWINDOWEXTEX,
-    EmfRecordTypeSaveDC = EMR_SAVEDC,
-    EmfRecordTypeRestoreDC = EMR_RESTOREDC,
-    EmfRecordTypeSetWorldTransform = EMR_SETWORLDTRANSFORM,
-    EmfRecordTypeModifyWorldTransform = EMR_MODIFYWORLDTRANSFORM,
-    EmfRecordTypeSelectObject = EMR_SELECTOBJECT,
-    EmfRecordTypeCreatePen = EMR_CREATEPEN,
-    EmfRecordTypeCreateBrushIndirect = EMR_CREATEBRUSHINDIRECT,
-    EmfRecordTypeDeleteObject = EMR_DELETEOBJECT,
-    EmfRecordTypeAngleArc = EMR_ANGLEARC,
-    EmfRecordTypeEllipse = EMR_ELLIPSE,
-    EmfRecordTypeRectangle = EMR_RECTANGLE,
-    EmfRecordTypeRoundRect = EMR_ROUNDRECT,
-    EmfRecordTypeArc = EMR_ARC,
-    EmfRecordTypeChord = EMR_CHORD,
-    EmfRecordTypePie = EMR_PIE,
-    EmfRecordTypeSelectPalette = EMR_SELECTPALETTE,
-    EmfRecordTypeCreatePalette = EMR_CREATEPALETTE,
-    EmfRecordTypeSetPaletteEntries = EMR_SETPALETTEENTRIES,
-    EmfRecordTypeResizePalette = EMR_RESIZEPALETTE,
-    EmfRecordTypeRealizePalette = EMR_REALIZEPALETTE,
-    EmfRecordTypeExtFloodFill = EMR_EXTFLOODFILL,
-    EmfRecordTypeLineTo = EMR_LINETO,
-    EmfRecordTypeArcTo = EMR_ARCTO,
-    EmfRecordTypePolyDraw = EMR_POLYDRAW,
-    EmfRecordTypeSetArcDirection = EMR_SETARCDIRECTION,
-    EmfRecordTypeSetMiterLimit = EMR_SETMITERLIMIT,
-    EmfRecordTypeBeginPath = EMR_BEGINPATH,
-    EmfRecordTypeEndPath = EMR_ENDPATH,
-    EmfRecordTypeCloseFigure = EMR_CLOSEFIGURE,
-    EmfRecordTypeFillPath = EMR_FILLPATH,
-    EmfRecordTypeStrokeAndFillPath = EMR_STROKEANDFILLPATH,
-    EmfRecordTypeStrokePath = EMR_STROKEPATH,
-    EmfRecordTypeFlattenPath = EMR_FLATTENPATH,
-    EmfRecordTypeWidenPath = EMR_WIDENPATH,
-    EmfRecordTypeSelectClipPath = EMR_SELECTCLIPPATH,
-    EmfRecordTypeAbortPath = EMR_ABORTPATH,
-    EmfRecordTypeReserved_069 = 69,
-    EmfRecordTypeGdiComment = EMR_GDICOMMENT,
-    EmfRecordTypeFillRgn = EMR_FILLRGN,
-    EmfRecordTypeFrameRgn = EMR_FRAMERGN,
-    EmfRecordTypeInvertRgn = EMR_INVERTRGN,
-    EmfRecordTypePaintRgn = EMR_PAINTRGN,
-    EmfRecordTypeExtSelectClipRgn = EMR_EXTSELECTCLIPRGN,
-    EmfRecordTypeBitBlt = EMR_BITBLT,
-    EmfRecordTypeStretchBlt = EMR_STRETCHBLT,
-    EmfRecordTypeMaskBlt = EMR_MASKBLT,
-    EmfRecordTypePlgBlt = EMR_PLGBLT,
-    EmfRecordTypeSetDIBitsToDevice = 80,
-    EmfRecordTypeStretchDIBits = EMR_STRETCHDIBITS,
-    EmfRecordTypeExtCreateFontIndirect = EMR_EXTCREATEFONTINDIRECTW,
-    EmfRecordTypeExtTextOutA = EMR_EXTTEXTOUTA,
-    EmfRecordTypeExtTextOutW = EMR_EXTTEXTOUTW,
-    EmfRecordTypePolyBezier16 = EMR_POLYBEZIER16,
-    EmfRecordTypePolygon16 = EMR_POLYGON16,
-    EmfRecordTypePolyline16 = EMR_POLYLINE16,
-    EmfRecordTypePolyBezierTo16 = EMR_POLYBEZIERTO16,
-    EmfRecordTypePolylineTo16 = EMR_POLYLINETO16,
-    EmfRecordTypePolyPolyline16 = EMR_POLYPOLYLINE16,
-    EmfRecordTypePolyPolygon16 = EMR_POLYPOLYGON16,
-    EmfRecordTypePolyDraw16 = EMR_POLYDRAW16,
-    EmfRecordTypeCreateMonoBrush = EMR_CREATEMONOBRUSH,
-    EmfRecordTypeCreateDIBPatternBrushPt = EMR_CREATEDIBPATTERNBRUSHPT,
-    EmfRecordTypeExtCreatePen = EMR_EXTCREATEPEN,
-    EmfRecordTypePolyTextOutA = EMR_POLYTEXTOUTA,
-    EmfRecordTypePolyTextOutW = EMR_POLYTEXTOUTW,
-    EmfRecordTypeSetICMMode = 98,
-    EmfRecordTypeCreateColorSpace = 99,
-    EmfRecordTypeSetColorSpace = 100,
-    EmfRecordTypeDeleteColorSpace = 101,
-    EmfRecordTypeGLSRecord = 102,
-    EmfRecordTypeGLSBoundedRecord = 103,
-    EmfRecordTypePixelFormat = 104,
-    EmfRecordTypeDrawEscape = 105,
-    EmfRecordTypeExtEscape = 106,
-    EmfRecordTypeStartDoc = 107,
-    EmfRecordTypeSmallTextOut = 108,
-    EmfRecordTypeForceUFIMapping = 109,
-    EmfRecordTypeNamedEscape = 110,
-    EmfRecordTypeColorCorrectPalette = 111,
-    EmfRecordTypeSetICMProfileA = 112,
-    EmfRecordTypeSetICMProfileW = 113,
-    EmfRecordTypeAlphaBlend = 114,
-    EmfRecordTypeSetLayout = 115,
-    EmfRecordTypeTransparentBlt = 116,
-    EmfRecordTypeReserved_117 = 117,
-    EmfRecordTypeGradientFill = 118,
-    EmfRecordTypeSetLinkedUFIs = 119,
-    EmfRecordTypeSetTextJustification = 120,
-    EmfRecordTypeColorMatchToTargetW = 121,
-    EmfRecordTypeCreateColorSpaceW = 122,
-    EmfRecordTypeMax = 122,
-    EmfRecordTypeMin = 1,
-    EmfPlusRecordTypeInvalid = GDIP_EMFPLUS_RECORD_BASE,
-    EmfPlusRecordTypeHeader,
-    EmfPlusRecordTypeEndOfFile,
-    EmfPlusRecordTypeComment,
-    EmfPlusRecordTypeGetDC,
-    EmfPlusRecordTypeMultiFormatStart,
-    EmfPlusRecordTypeMultiFormatSection,
-    EmfPlusRecordTypeMultiFormatEnd,
-    EmfPlusRecordTypeObject,
-    EmfPlusRecordTypeClear,
-    EmfPlusRecordTypeFillRects,
-    EmfPlusRecordTypeDrawRects,
-    EmfPlusRecordTypeFillPolygon,
-    EmfPlusRecordTypeDrawLines,
-    EmfPlusRecordTypeFillEllipse,
-    EmfPlusRecordTypeDrawEllipse,
-    EmfPlusRecordTypeFillPie,
-    EmfPlusRecordTypeDrawPie,
-    EmfPlusRecordTypeDrawArc,
-    EmfPlusRecordTypeFillRegion,
-    EmfPlusRecordTypeFillPath,
-    EmfPlusRecordTypeDrawPath,
-    EmfPlusRecordTypeFillClosedCurve,
-    EmfPlusRecordTypeDrawClosedCurve,
-    EmfPlusRecordTypeDrawCurve,
-    EmfPlusRecordTypeDrawBeziers,
-    EmfPlusRecordTypeDrawImage,
-    EmfPlusRecordTypeDrawImagePoints,
-    EmfPlusRecordTypeDrawString,
-    EmfPlusRecordTypeSetRenderingOrigin,
-    EmfPlusRecordTypeSetAntiAliasMode,
-    EmfPlusRecordTypeSetTextRenderingHint,
-    EmfPlusRecordTypeSetTextContrast,
-    EmfPlusRecordTypeSetGammaValue,
-    EmfPlusRecordTypeSetInterpolationMode,
-    EmfPlusRecordTypeSetPixelOffsetMode,
-    EmfPlusRecordTypeSetCompositingMode,
-    EmfPlusRecordTypeSetCompositingQuality,
-    EmfPlusRecordTypeSave,
-    EmfPlusRecordTypeRestore,
-    EmfPlusRecordTypeBeginContainer,
-    EmfPlusRecordTypeBeginContainerNoParams,
-    EmfPlusRecordTypeEndContainer,
-    EmfPlusRecordTypeSetWorldTransform,
-    EmfPlusRecordTypeResetWorldTransform,
-    EmfPlusRecordTypeMultiplyWorldTransform,
-    EmfPlusRecordTypeTranslateWorldTransform,
-    EmfPlusRecordTypeScaleWorldTransform,
-    EmfPlusRecordTypeRotateWorldTransform,
-    EmfPlusRecordTypeSetPageTransform,
-    EmfPlusRecordTypeResetClip,
-    EmfPlusRecordTypeSetClipRect,
-    EmfPlusRecordTypeSetClipPath,
-    EmfPlusRecordTypeSetClipRegion,
-    EmfPlusRecordTypeOffsetClip,
-    EmfPlusRecordTypeDrawDriverString,
-    EmfPlusRecordTypeStrokeFillPath,
-    EmfPlusRecordTypeSerializableObject,
-    EmfPlusRecordTypeSetTSGraphics,
-    EmfPlusRecordTypeSetTSClip,
-    EmfPlusRecordTotal,
-    EmfPlusRecordTypeMax = EmfPlusRecordTotal-1,
-    EmfPlusRecordTypeMin = EmfPlusRecordTypeHeader
-};
-
-#ifndef __cplusplus
-
-typedef enum Unit Unit;
-typedef enum BrushType BrushType;
-typedef enum DriverStringOptions DriverStringOptions;
-typedef enum FillMode FillMode;
-typedef enum LineCap LineCap;
-typedef enum PathPointType PathPointType;
-typedef enum LineJoin LineJoin;
-typedef enum QualityMode QualityMode;
-typedef enum SmoothingMode SmoothingMode;
-typedef enum CompositingQuality CompositingQuality;
-typedef enum InterpolationMode InterpolationMode;
-typedef enum PixelOffsetMode PixelOffsetMode;
-typedef enum DashCap DashCap;
-typedef enum DashStyle DashStyle;
-typedef enum MatrixOrder MatrixOrder;
-typedef enum ImageType ImageType;
-typedef enum ImageFlags ImageFlags;
-typedef enum WarpMode WarpMode;
-typedef enum WrapMode WrapMode;
-typedef enum MetafileType MetafileType;
-typedef enum LinearGradientMode LinearGradientMode;
-typedef enum EmfType EmfType;
-typedef enum CompositingMode CompositingMode;
-typedef enum TextRenderingHint TextRenderingHint;
-typedef enum StringAlignment StringAlignment;
-typedef enum StringDigitSubstitute StringDigitSubstitute;
-typedef enum StringTrimming StringTrimming;
-typedef enum FontStyle FontStyle;
-typedef enum StringFormatFlags StringFormatFlags;
-typedef enum HotkeyPrefix HotkeyPrefix;
-typedef enum PenAlignment PenAlignment;
-typedef enum PaletteFlags PaletteFlags;
-typedef enum ImageCodecFlags ImageCodecFlags;
-typedef enum CombineMode CombineMode;
-typedef enum FlushIntention FlushIntention;
-typedef enum CoordinateSpace CoordinateSpace;
-typedef enum GpTestControlEnum GpTestControlEnum;
-typedef enum MetafileFrameUnit MetafileFrameUnit;
-typedef enum PenType PenType;
-typedef enum HatchStyle HatchStyle;
-typedef enum EmfPlusRecordType EmfPlusRecordType;
-
-#endif /* end of c typedefs */
-
-#undef GDIP_WMF_RECORD_TO_EMFPLUS
-#define GDIP_WMF_RECORD_TO_EMFPLUS(x) ((EmfPlusRecordType)((x)|GDIP_WMF_RECORD_BASE))
-
-#endif
diff --git a/external/wine/include/gdiplusflat.h b/external/wine/include/gdiplusflat.h
deleted file mode 100644
index 6792004..0000000
--- a/external/wine/include/gdiplusflat.h
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _FLATAPI_H
-#define _FLATAPI_H
-
-#define WINGDIPAPI __stdcall
-
-#define GDIPCONST const
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* AdjustableArrowCap */
-GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL,REAL,BOOL,GpAdjustableArrowCap**);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL*);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL*);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL*);
-GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL*);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL);
-GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL);
-
-/* Bitmap */
-GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*);
-GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*);
-GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*);
-GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT,
-    PixelFormat,BitmapData*);
-GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);
-GpStatus WINGDIPAPI GdipBitmapSetResolution(GpBitmap*,REAL,REAL);
-GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap*,BitmapData*);
-GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL,REAL,REAL,REAL,PixelFormat,GpBitmap*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT,INT,INT,INT,PixelFormat,GpBitmap*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON, GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE,GDIPCONST WCHAR*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,
-    GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**);
-GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap*,HBITMAP*,ARGB);
-GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap*,HICON*);
-GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect*);
-GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect*,const VOID*,const UINT);
-
-/* Brush */
-GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**);
-GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*);
-GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*);
-
-/* CachedBitmap */
-GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap*,GpGraphics*,
-    GpCachedBitmap**);
-GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap*);
-GpStatus WINGDIPAPI GdipDrawCachedBitmap(GpGraphics*,GpCachedBitmap*,INT,INT);
-
-/* CustomLineCap */
-GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL,
-    GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*);
-GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap);
-GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap*,REAL*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);
-GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap,
-    GpLineCap);
-GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin);
-GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*);
-GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL);
-GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);
-
-/* Font */
-GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**);
-GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily*, REAL, INT, Unit,
-    GpFont**);
-GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**);
-GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**);
-GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**);
-GpStatus WINGDIPAPI GdipDeleteFont(GpFont*);
-GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*);
-GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);
-GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*);
-GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*);
-GpStatus WINGDIPAPI GdipGetFontStyle(GpFont*, INT*);
-GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*,
-        REAL*);
-GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*);
-
-/* FontCollection */
-GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**);
-GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**);
-GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**);
-GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*);
-GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection*,
-        GDIPCONST void*,INT);
-GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(GpFontCollection*, INT*);
-GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList(GpFontCollection*, INT,
-        GpFontFamily*[], INT*);
-
-/* FontFamily */
-GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**);
-GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*,
-    GpFontCollection*, GpFontFamily**);
-GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*);
-GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID);
-GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**);
-GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*);
-GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily *, INT, BOOL*);
-
-/* Graphics */
-GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention);
-GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*);
-GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*);
-GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*);
-GpStatus WINGDIPAPI GdipEndContainer(GpGraphics*,GraphicsContainer);
-GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*);
-GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**);
-GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);
-GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);
-GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND,GpGraphics**);
-HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void);
-GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *);
-GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics*,GpPen*,INT,INT,INT,INT,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawClosedCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawClosedCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve3(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics*,GDIPCONST UINT16*,INT,
-    GDIPCONST GpFont*,GDIPCONST GpBrush*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*);
-GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT);
-GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL,REAL,REAL,GpUnit);
-GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,INT,INT,GpUnit);
-GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics*,GpImage*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics*,GpImage*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*,
-    GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit,
-    GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
-GpStatus WINGDIPAPI GdipDrawImagePointsRectI(GpGraphics*,GpImage*,
-    GDIPCONST GpPoint*,INT,INT,INT,INT,INT,GpUnit,
-    GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);
-GpStatus WINGDIPAPI GdipDrawImageRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics*,GpImage*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics*,GpImage*,REAL,REAL,REAL,
-    REAL,REAL,REAL,REAL,REAL,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,
-    VOID*);
-GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics*,GpImage*,INT,INT,INT,
-    INT,INT,INT,INT,INT,GpUnit,GDIPCONST GpImageAttributes*,DrawImageAbort,
-    VOID*);
-GpStatus WINGDIPAPI GdipDrawLine(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*);
-GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT);
-GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT);
-GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT);
-GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT);
-GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT,
-    GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*,
-    GDIPCONST GpBrush*);
-GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*,
-    GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit,
-    EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);
-GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT,
-    REAL,GpFillMode);
-GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT,
-    REAL,GpFillMode);
-GpStatus WINGDIPAPI GdipFillClosedCurve(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics*,GpBrush*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*);
-GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillPieI(GpGraphics*,GpBrush*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,
-    INT,GpFillMode);
-GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,
-    INT,GpFillMode);
-GpStatus WINGDIPAPI GdipFillPolygon2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics*,GpBrush*,GDIPCONST GpRectF*,INT);
-GpStatus WINGDIPAPI GdipFillRectanglesI(GpGraphics*,GpBrush*,GDIPCONST GpRect*,INT);
-GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*);
-GpStatus WINGDIPAPI GdipGetClip(GpGraphics*,GpRegion*);
-GpStatus WINGDIPAPI GdipGetClipBounds(GpGraphics*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetClipBoundsI(GpGraphics*,GpRect*);
-GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*);
-GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*);
-GpStatus WINGDIPAPI GdipGetDC(GpGraphics*,HDC*);
-GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*);
-GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageDecoders(UINT,UINT,ImageCodecInfo*);
-GpStatus WINGDIPAPI GdipGetImageDecodersSize(UINT*,UINT*);
-GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**);
-GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*);
-GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*);
-GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*);
-GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*);
-GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*);
-GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*);
-GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*);
-GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*);
-GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*);
-GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB);
-GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*);
-GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisibleRect(GpGraphics*,REAL,REAL,REAL,REAL,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics*,INT,INT,INT,INT,BOOL*);
-GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*,
-    INT, GDIPCONST GpFont*, GDIPCONST RectF*, GDIPCONST GpStringFormat*, INT,
-    GpRegion**);
-GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics*,GDIPCONST UINT16*,INT,
-    GDIPCONST GpFont*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*,RectF*);
-GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT,
-    GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*);
-GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics*,GDIPCONST GpMatrix*,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR*,HDC,EmfType,
-    GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType,
-    GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*,
-    MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC);
-GpStatus WINGDIPAPI GdipResetClip(GpGraphics*);
-GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*);
-GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState);
-GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*);
-GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics*,HRGN,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipGraphics(GpGraphics*,GpGraphics*,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode);
-GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics*,GpRegion*,CombineMode);
-GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics*,CompositingMode);
-GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality);
-GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode);
-GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL);
-GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit);
-GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode);
-GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics*,INT,INT);
-GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode);
-GpStatus WINGDIPAPI GdipSetTextContrast(GpGraphics*,UINT);
-GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint);
-GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*);
-GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,
-                                        GpPointF *, INT);
-GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics*, GpCoordinateSpace, GpCoordinateSpace,
-                                         GpPoint *, INT);
-GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics*,REAL,REAL);
-GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics*,INT,INT);
-GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder);
-
-/* GraphicsPath */
-GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath*,GDIPCONST GpPointF*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath*,GDIPCONST GpPoint*,INT,INT,INT,REAL);
-GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL);
-GpStatus WINGDIPAPI GdipAddPathPie(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathPieI(GpPath*,INT,INT,INT,INT,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath*,GDIPCONST GpPointF*,INT);
-GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath*,GDIPCONST GpPoint*,INT);
-GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT);
-GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT);
-GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath*,GDIPCONST GpRect*,INT);
-GpStatus WINGDIPAPI GdipAddPathString(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST RectF*,GDIPCONST GpStringFormat*);
-GpStatus WINGDIPAPI GdipAddPathStringI(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST Rect*,GDIPCONST GpStringFormat*);
-GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath*);
-GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**);
-GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);
-GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*);
-GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**);
-GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT,
-    GpFillMode,GpPath**);
-GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**);
-GpStatus WINGDIPAPI GdipDeletePath(GpPath*);
-GpStatus WINGDIPAPI GdipFlattenPath(GpPath*,GpMatrix*,REAL);
-GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath*,REAL,REAL,GpPen*,
-    GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath*,INT,INT,GpPen*,
-    GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath*,REAL,REAL,GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath*,INT,INT,GpGraphics*,BOOL*);
-GpStatus WINGDIPAPI GdipGetPathData(GpPath*,GpPathData*);
-GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*);
-GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath*,GpPointF*);
-GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT);
-GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT);
-GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT);
-GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);
-GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath*,GpRect*,GDIPCONST GpMatrix*,GDIPCONST GpPen*);
-GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*);
-GpStatus WINGDIPAPI GdipResetPath(GpPath*);
-GpStatus WINGDIPAPI GdipReversePath(GpPath*);
-GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath*,GpFillMode);
-GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*);
-GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*);
-GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*);
-GpStatus WINGDIPAPI GdipWarpPath(GpPath*,GpMatrix*,GDIPCONST GpPointF*,INT,REAL,
-    REAL,REAL,REAL,WarpMode,REAL);
-GpStatus WINGDIPAPI GdipWidenPath(GpPath*,GpPen*,GpMatrix*,REAL);
-
-/* HatchBrush */
-GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle,ARGB,ARGB,GpHatch**);
-GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch*,ARGB*);
-GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch*,ARGB*);
-GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch*,HatchStyle*);
-
-/* Image */
-GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**);
-GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**);
-GpStatus WINGDIPAPI GdipDisposeImage(GpImage*);
-GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE,UINT,LPBYTE,INT,INT);
-GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage*,ImageItemData*);
-GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*);
-GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage*,UINT,UINT,PropertyItem*);
-GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*);
-GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageFlags(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*);
-GpStatus WINGDIPAPI GdipGetImagePalette(GpImage*,ColorPalette*,INT);
-GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage*,INT*);
-GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*);
-GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*);
-GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*);
-GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*);
-GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*);
-GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage*,UINT,PROPID*);
-GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage*,PROPID,UINT,PropertyItem*);
-GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*);
-GpStatus WINGDIPAPI GdipGetPropertySize(GpImage*,UINT*,UINT*);
-GpStatus WINGDIPAPI GdipImageForceValidation(GpImage*);
-GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*);
-GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*);
-GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT);
-GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType);
-GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT);
-GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**);
-GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**);
-GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**);
-GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**);
-GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID);
-GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage*,GDIPCONST WCHAR*,GDIPCONST CLSID*,GDIPCONST EncoderParameters*);
-GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*,
-    GDIPCONST CLSID*,GDIPCONST EncoderParameters*);
-GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*);
-GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*);
-
-/* ImageAttributes */
-GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**);
-GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*);
-GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes*,
-    BOOL);
-GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,
-    ColorAdjustType,BOOL,ARGB,ARGB);
-GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes*,
-    ColorAdjustType,BOOL,GDIPCONST ColorMatrix*,GDIPCONST ColorMatrix*,
-    ColorMatrixFlags);
-GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes*,
-    ColorAdjustType,BOOL,REAL);
-GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes*,
-    ColorAdjustType,BOOL);
-GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes*,
-    ColorAdjustType,BOOL,ColorChannelFlags);
-GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(
-    GpImageAttributes*,ColorAdjustType,BOOL,GDIPCONST WCHAR*);
-GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes*,
-    ColorAdjustType,BOOL,UINT,GDIPCONST ColorMap*);
-GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes*,
-    ColorAdjustType,BOOL,REAL);
-GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes*,
-    ColorAdjustType);
-GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode,
-    ARGB,BOOL);
-
-/* LinearGradientBrush */
-GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*,
-    ARGB,ARGB,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint*,GDIPCONST GpPoint*,
-    ARGB,ARGB,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF*,ARGB,ARGB,
-    LinearGradientMode,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect*,ARGB,ARGB,
-    LinearGradientMode,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF*,
-    ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect*,
-    ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**);
-GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*);
-GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*);
-GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*);
-GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*);
-GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*,
-    GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*);
-GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient*,GDIPCONST ARGB*,
-    GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient*,ARGB*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient*,INT*);
-GpStatus WINGDIPAPI GdipGetLineTransform(GpLineGradient*,GpMatrix*);
-GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient*);
-GpStatus WINGDIPAPI GdipRotateLineTransform(GpLineGradient*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient*,REAL,REAL,
-    GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB);
-GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL);
-GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient*,GDIPCONST GpMatrix*);
-GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode);
-GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient*,REAL,REAL,
-    GpMatrixOrder);
-
-/* Matrix */
-GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**);
-GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**);
-GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*);
-GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*);
-GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*);
-GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*);
-GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*);
-GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*);
-GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GDIPCONST GpMatrix*,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL);
-GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
-GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix*,GpPoint*,INT);
-GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
-GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT);
-
-/* Metafile */
-GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*,
-    EmfType,const WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL,
-    GDIPCONST WmfPlaceableFileHeader*,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST WmfPlaceableFileHeader*,
-    GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**);
-GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**);
-GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*);
-GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*);
-GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT);
-GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);
-
-/* MetafileHeader */
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR*,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*);
-GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*);
-
-/* Notification */
-GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR*);
-void WINAPI GdiplusNotificationUnhook(ULONG_PTR);
-
-/* PathGradientBrush */
-GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode,GpPathGradient**);
-GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint*,INT,GpWrapMode,GpPathGradient**);
-GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*,
-    GpPathGradient**);
-GpStatus WINGDIPAPI GdipGetPathGradientBlend(GpPathGradient*,REAL*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetPathGradientBlendCount(GpPathGradient*,INT*);
-GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*);
-GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*);
-GpStatus WINGDIPAPI GdipGetPathGradientCenterPointI(GpPathGradient*,GpPoint*);
-GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);
-GpStatus WINGDIPAPI GdipGetPathGradientGammaCorrection(GpPathGradient*,BOOL*);
-GpStatus WINGDIPAPI GdipGetPathGradientPointCount(GpPathGradient*,INT*);
-GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient*,
-    GDIPCONST ARGB*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipGetPathGradientRect(GpPathGradient*,GpRectF*);
-GpStatus WINGDIPAPI GdipGetPathGradientRectI(GpPathGradient*,GpRect*);
-GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient*,
-    ARGB*,INT*);
-GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient*,GpWrapMode*);
-GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient*,GDIPCONST REAL*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB);
-GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*);
-GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*);
-GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL);
-GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL);
-GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*,
-    GDIPCONST ARGB*,INT*);
-GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode);
-GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient*,INT*);
-
-/* PathIterator */
-GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);
-GpStatus WINGDIPAPI GdipDeletePathIter(GpPathIterator*);
-GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*,
-    INT,INT);
-GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*);
-GpStatus WINGDIPAPI GdipPathIterGetSubpathCount(GpPathIterator*,INT*);
-GpStatus WINGDIPAPI GdipPathIterEnumerate(GpPathIterator*,INT*,GpPointF*,BYTE*,INT);
-GpStatus WINGDIPAPI GdipPathIterHasCurve(GpPathIterator*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterIsValid(GpPathIterator*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator*,INT*,INT*,INT*);
-GpStatus WINGDIPAPI GdipPathIterNextMarkerPath(GpPathIterator*,INT*,GpPath*);
-GpStatus WINGDIPAPI GdipPathIterNextPathType(GpPathIterator*,INT*,BYTE*,INT*,INT*);
-GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterNextSubpathPath(GpPathIterator*,INT*,GpPath*,BOOL*);
-GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*);
-
-/* Pen */
-GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**);
-GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**);
-GpStatus WINGDIPAPI GdipCreatePen2(GpBrush*,REAL,GpUnit,GpPen**);
-GpStatus WINGDIPAPI GdipDeletePen(GpPen*);
-GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**);
-GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*);
-GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**);
-GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT);
-GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*);
-GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*);
-GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*);
-GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*);
-GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*);
-GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);
-GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);
-GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*);
-GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*);
-GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT);
-GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen*,GpDashCap);
-GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen*,REAL);
-GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle);
-GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap);
-GpStatus WINGDIPAPI GdipGetPenFillType(GpPen*,GpPenType*);
-GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap);
-GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin);
-GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment);
-GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL);
-GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap);
-GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL);
-GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen*,GpDashCap*);
-GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*);
-GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*);
-GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*);
-GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*);
-GpStatus WINGDIPAPI GdipGetPenUnit(GpPen*,GpUnit*);
-GpStatus WINGDIPAPI GdipGetPenWidth(GpPen*,REAL*);
-
-/* Region */
-GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *, GpRegion **);
-GpStatus WINGDIPAPI GdipCombineRegionPath(GpRegion *, GpPath *, CombineMode);
-GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *, GDIPCONST GpRectF *, CombineMode);
-GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *, GDIPCONST GpRect *, CombineMode);
-GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *, GpRegion *, CombineMode);
-GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *, INT, GpRegion **);
-GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN, GpRegion **);
-GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *);
-GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *, GpGraphics *, GpRectF *);
-GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *, GpGraphics *, GpRect *);
-GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *, BYTE *, UINT, UINT *);
-GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *, UINT *);
-GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *);
-GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *, GpRectF *, INT *, GpMatrix *);
-GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *, GpRect *, INT *, GpMatrix *);
-GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *, UINT *, GpMatrix *);
-GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *, GpRegion *, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion *, REAL, REAL, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionPointI(GpRegion *, INT, INT, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionRect(GpRegion *, REAL, REAL, REAL, REAL, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipIsVisibleRegionRectI(GpRegion *, INT, INT, INT, INT, GpGraphics *, BOOL *);
-GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *);
-GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *);
-GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *, GpMatrix *);
-GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *, REAL, REAL);
-GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *, INT, INT);
-
-/* SolidBrush */
-GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**);
-GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*);
-GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB);
-
-/* StringFormat */
-GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringFormat**);
-GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**);
-GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);
-GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*);
-GpStatus WINGDIPAPI GdipGetStringFormatDigitSubstitution(GDIPCONST GpStringFormat*,LANGID*,
-        StringDigitSubstitute*);
-GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat*, INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);
-GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount(
-        GDIPCONST GpStringFormat*, INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatTabStopCount(GDIPCONST GpStringFormat*,INT*);
-GpStatus WINGDIPAPI GdipGetStringFormatTabStops(GDIPCONST GpStringFormat*,INT,REAL*,REAL*);
-GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*);
-GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment);
-GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat*,LANGID,StringDigitSubstitute);
-GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT);
-GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment);
-GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(
-        GpStringFormat*, INT, GDIPCONST CharacterRange*);
-GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat*,REAL,INT,GDIPCONST REAL*);
-GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming);
-GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat*, INT);
-GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **);
-GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **);
-
-/* Texture */
-GpStatus WINGDIPAPI GdipCreateTexture(GpImage*,GpWrapMode,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTexture2(GpImage*,GpWrapMode,REAL,REAL,REAL,REAL,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage*,GpWrapMode,INT,INT,INT,INT,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage*,GDIPCONST GpImageAttributes*,
-    REAL,REAL,REAL,REAL,GpTexture**);
-GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*,
-    INT,INT,INT,INT,GpTexture**);
-GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture*,GpMatrix*);
-GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture*, GpWrapMode*);
-GpStatus WINGDIPAPI GdipMultiplyTextureTransform(GpTexture*,
-    GDIPCONST GpMatrix*,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture*);
-GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture*,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipScaleTextureTransform(GpTexture*,REAL,REAL,GpMatrixOrder);
-GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*);
-GpStatus WINGDIPAPI GdipSetTextureWrapMode(GpTexture*, GpWrapMode);
-GpStatus WINGDIPAPI GdipTranslateTextureTransform(GpTexture*,REAL,REAL,
-    GpMatrixOrder);
-
-/* Without wrapper methods */
-GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR*,UINT,IStream**);
-GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size);
-GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders);
-GpStatus WINGDIPAPI GdipTestControl(GpTestControlEnum,void*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/external/wine/include/gdiplusgpstubs.h b/external/wine/include/gdiplusgpstubs.h
deleted file mode 100644
index 5a65cd8..0000000
--- a/external/wine/include/gdiplusgpstubs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSGPSTUBS_H
-#define _GDIPLUSGPSTUBS_H
-
-#ifdef __cplusplus
-
-class GpGraphics {};
-class GpPen {};
-class GpBrush {};
-class GpHatch : public GpBrush {};
-class GpSolidFill : public GpBrush {};
-class GpPath {};
-class GpMatrix {};
-class GpPathIterator {};
-class GpCustomLineCap {};
-class GpAdjustableArrowCap : public GpCustomLineCap {};
-class GpImage {};
-class GpMetafile : public GpImage {};
-class GpImageAttributes {};
-class GpCachedBitmap {};
-class GpBitmap : public GpImage {};
-class GpPathGradient : public GpBrush {};
-class GpLineGradient : public GpBrush {};
-class GpTexture : public GpBrush {};
-class GpFont {};
-class GpFontCollection {};
-class GpFontFamily {};
-class GpStringFormat {};
-class GpRegion {};
-class CGpEffect {};
-
-#else /* end of c++ declarations */
-
-typedef struct GpGraphics GpGraphics;
-typedef struct GpPen GpPen;
-typedef struct GpBrush GpBrush;
-typedef struct GpHatch GpHatch;
-typedef struct GpSolidFill GpSolidFill;
-typedef struct GpPath GpPath;
-typedef struct GpMatrix GpMatrix;
-typedef struct GpPathIterator GpPathIterator;
-typedef struct GpCustomLineCap GpCustomLineCap;
-typedef struct GpAdjustableArrowCap GpAdjustableArrowCap;
-typedef struct GpImage GpImage;
-typedef struct GpMetafile GpMetafile;
-typedef struct GpImageAttributes GpImageAttributes;
-typedef struct GpCachedBitmap GpCachedBitmap;
-typedef struct GpBitmap GpBitmap;
-typedef struct GpPathGradient GpPathGradient;
-typedef struct GpLineGradient GpLineGradient;
-typedef struct GpTexture GpTexture;
-typedef struct GpFont GpFont;
-typedef struct GpFontCollection GpFontCollection;
-typedef struct GpFontFamily GpFontFamily;
-typedef struct GpStringFormat GpStringFormat;
-typedef struct GpRegion GpRegion;
-typedef struct CGpEffect CGpEffect;
-
-#endif /* end of c declarations */
-
-typedef Status GpStatus;
-typedef Unit GpUnit;
-typedef BrushType GpBrushType;
-typedef PointF GpPointF;
-typedef FillMode GpFillMode;
-typedef PathData GpPathData;
-typedef LineCap GpLineCap;
-typedef RectF GpRectF;
-typedef Rect GpRect;
-typedef LineJoin GpLineJoin;
-typedef DashCap GpDashCap;
-typedef DashStyle GpDashStyle;
-typedef MatrixOrder GpMatrixOrder;
-typedef Point GpPoint;
-typedef WrapMode GpWrapMode;
-typedef Color GpColor;
-typedef FlushIntention GpFlushIntention;
-typedef CoordinateSpace GpCoordinateSpace;
-typedef PenAlignment GpPenAlignment;
-typedef PenType GpPenType;
-
-#endif
diff --git a/external/wine/include/gdiplusimaging.h b/external/wine/include/gdiplusimaging.h
deleted file mode 100644
index 7c199c3..0000000
--- a/external/wine/include/gdiplusimaging.h
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSIMAGING_H
-#define _GDIPLUSIMAGING_H
-
-DEFINE_GUID(ImageFormatUndefined, 0xb96b3ca9, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatMemoryBMP, 0xb96b3caa, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatBMP,       0xb96b3cab, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatEMF,       0xb96b3cac, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatWMF,       0xb96b3cad, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatJPEG,      0xb96b3cae, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatPNG,       0xb96b3caf, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatGIF,       0xb96b3cb0, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatTIFF,      0xb96b3cb1, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatEXIF,      0xb96b3cb2, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-DEFINE_GUID(ImageFormatIcon,      0xb96b3cb5, 0x728, 0x11d3, 0x9d, 0x7b, 0, 0, 0xf8, 0x1e, 0xf3, 0x2e);
-
-DEFINE_GUID(FrameDimensionTime,       0x6aedbd6d, 0x3fb5, 0x418a, 0x83, 0xa6, 0x7f, 0x45, 0x22, 0x9d, 0xc8, 0x72);
-DEFINE_GUID(FrameDimensionPage,       0x7462dc86, 0x6180, 0x4c7e, 0x8e, 0x3f, 0xee, 0x73, 0x33, 0xa7, 0xa4, 0x83);
-DEFINE_GUID(FrameDimensionResolution, 0x84236f7b, 0x3bd3, 0x428f, 0x8d, 0xab, 0x4e, 0xa1, 0x43, 0x9c, 0xa3, 0x15);
-
-enum ImageLockMode
-{
-    ImageLockModeRead           = 1,
-    ImageLockModeWrite          = 2,
-    ImageLockModeUserInputBuf   = 4
-};
-
-enum RotateFlipType
-{
-    RotateNoneFlipNone = 0,
-    Rotate180FlipXY    = RotateNoneFlipNone,
-
-    Rotate90FlipNone   = 1,
-    Rotate270FlipXY    = Rotate90FlipNone,
-
-    Rotate180FlipNone  = 2,
-    RotateNoneFlipXY   = Rotate180FlipNone,
-
-    Rotate270FlipNone  = 3,
-    Rotate90FlipXY     = Rotate270FlipNone,
-
-    RotateNoneFlipX    = 4,
-    Rotate180FlipY     = RotateNoneFlipX,
-
-    Rotate90FlipX      = 5,
-    Rotate270FlipY     = Rotate90FlipX,
-
-    Rotate180FlipX     = 6,
-    RotateNoneFlipY    = Rotate180FlipX,
-
-    Rotate270FlipX     = 7,
-    Rotate90FlipY      = Rotate270FlipX
-};
-
-#ifdef __cplusplus
-class EncoderParameter
-{
-public:
-    GUID    Guid;
-    ULONG   NumberOfValues;
-    ULONG   Type;
-    VOID*   Value;
-};
-
-class EncoderParameters
-{
-public:
-    UINT Count;
-    EncoderParameter Parameter[1];
-};
-
-class ImageCodecInfo
-{
-public:
-    CLSID Clsid;
-    GUID  FormatID;
-    const WCHAR* CodecName;
-    const WCHAR* DllName;
-    const WCHAR* FormatDescription;
-    const WCHAR* FilenameExtension;
-    const WCHAR* MimeType;
-    DWORD Flags;
-    DWORD Version;
-    DWORD SigCount;
-    DWORD SigSize;
-    const BYTE* SigPattern;
-    const BYTE* SigMask;
-};
-
-class BitmapData
-{
-public:
-    UINT Width;
-    UINT Height;
-    INT Stride;
-    Gdiplus::PixelFormat PixelFormat;
-    VOID* Scan0;
-    UINT_PTR Reserved;
-};
-
-class ImageItemData
-{
-public:
-    UINT  Size;
-    UINT  Position;
-    VOID* Desc;
-    UINT  DescSize;
-    VOID* Data;
-    UINT  DataSize;
-    UINT  Cookie;
-};
-
-class PropertyItem
-{
-public:
-    PROPID id;
-    ULONG  length;
-    WORD   type;
-    VOID*  value;
-};
-
-#else /* end of c++ typedefs */
-
-typedef enum ImageLockMode ImageLockMode;
-typedef enum RotateFlipType RotateFlipType;
-
-typedef struct EncoderParameter
-{
-    GUID Guid;
-    ULONG NumberOfValues;
-    ULONG Type;
-    VOID* Value;
-} EncoderParameter;
-
-typedef struct EncoderParameters
-{
-    UINT Count;
-    EncoderParameter Parameter[1];
-} EncoderParameters;
-
-typedef struct ImageCodecInfo
-{
-    CLSID Clsid;
-    GUID  FormatID;
-    const WCHAR* CodecName;
-    const WCHAR* DllName;
-    const WCHAR* FormatDescription;
-    const WCHAR* FilenameExtension;
-    const WCHAR* MimeType;
-    DWORD Flags;
-    DWORD Version;
-    DWORD SigCount;
-    DWORD SigSize;
-    const BYTE* SigPattern;
-    const BYTE* SigMask;
-} ImageCodecInfo;
-
-typedef struct BitmapData
-{
-    UINT Width;
-    UINT Height;
-    INT Stride;
-    PixelFormat PixelFormat;
-    VOID* Scan0;
-    UINT_PTR Reserved; /* undocumented: stores the lock mode */
-} BitmapData;
-
-typedef struct ImageItemData
-{
-    UINT  Size;
-    UINT  Position;
-    VOID* Desc;
-    UINT  DescSize;
-    VOID* Data;
-    UINT  DataSize;
-    UINT  Cookie;
-} ImageItemData;
-
-typedef struct PropertyItem
-{
-    PROPID id;
-    ULONG  length;
-    WORD   type;
-    VOID*  value;
-} PropertyItem;
-
-#endif /* end of c typedefs */
-
-/* property types */
-#define PropertyTagTypeByte       1
-#define PropertyTagTypeASCII      2
-#define PropertyTagTypeShort      3
-#define PropertyTagTypeLong       4
-#define PropertyTagTypeRational   5
-#define PropertyTagTypeUndefined  7
-#define PropertyTagTypeSLONG      9
-#define PropertyTagTypeSRational 10
-
-/* property IDs */
-#define PropertyTagExifIFD                0x8769
-#define PropertyTagGpsIFD                 0x8825
-
-#define PropertyTagNewSubfileType         0x00FE
-#define PropertyTagSubfileType            0x00FF
-#define PropertyTagImageWidth             0x0100
-#define PropertyTagImageHeight            0x0101
-#define PropertyTagBitsPerSample          0x0102
-#define PropertyTagCompression            0x0103
-#define PropertyTagPhotometricInterp      0x0106
-#define PropertyTagThreshHolding          0x0107
-#define PropertyTagCellWidth              0x0108
-#define PropertyTagCellHeight             0x0109
-#define PropertyTagFillOrder              0x010A
-#define PropertyTagDocumentName           0x010D
-#define PropertyTagImageDescription       0x010E
-#define PropertyTagEquipMake              0x010F
-#define PropertyTagEquipModel             0x0110
-#define PropertyTagStripOffsets           0x0111
-#define PropertyTagOrientation            0x0112
-#define PropertyTagSamplesPerPixel        0x0115
-#define PropertyTagRowsPerStrip           0x0116
-#define PropertyTagStripBytesCount        0x0117
-#define PropertyTagMinSampleValue         0x0118
-#define PropertyTagMaxSampleValue         0x0119
-#define PropertyTagXResolution            0x011A
-#define PropertyTagYResolution            0x011B
-#define PropertyTagPlanarConfig           0x011C
-#define PropertyTagPageName               0x011D
-#define PropertyTagXPosition              0x011E
-#define PropertyTagYPosition              0x011F
-#define PropertyTagFreeOffset             0x0120
-#define PropertyTagFreeByteCounts         0x0121
-#define PropertyTagGrayResponseUnit       0x0122
-#define PropertyTagGrayResponseCurve      0x0123
-#define PropertyTagT4Option               0x0124
-#define PropertyTagT6Option               0x0125
-#define PropertyTagResolutionUnit         0x0128
-#define PropertyTagPageNumber             0x0129
-#define PropertyTagTransferFuncition      0x012D
-#define PropertyTagSoftwareUsed           0x0131
-#define PropertyTagDateTime               0x0132
-#define PropertyTagArtist                 0x013B
-#define PropertyTagHostComputer           0x013C
-#define PropertyTagPredictor              0x013D
-#define PropertyTagWhitePoint             0x013E
-#define PropertyTagPrimaryChromaticities  0x013F
-#define PropertyTagColorMap               0x0140
-#define PropertyTagHalftoneHints          0x0141
-#define PropertyTagTileWidth              0x0142
-#define PropertyTagTileLength             0x0143
-#define PropertyTagTileOffset             0x0144
-#define PropertyTagTileByteCounts         0x0145
-#define PropertyTagInkSet                 0x014C
-#define PropertyTagInkNames               0x014D
-#define PropertyTagNumberOfInks           0x014E
-#define PropertyTagDotRange               0x0150
-#define PropertyTagTargetPrinter          0x0151
-#define PropertyTagExtraSamples           0x0152
-#define PropertyTagSampleFormat           0x0153
-#define PropertyTagSMinSampleValue        0x0154
-#define PropertyTagSMaxSampleValue        0x0155
-#define PropertyTagTransferRange          0x0156
-
-#define PropertyTagJPEGProc               0x0200
-#define PropertyTagJPEGInterFormat        0x0201
-#define PropertyTagJPEGInterLength        0x0202
-#define PropertyTagJPEGRestartInterval    0x0203
-#define PropertyTagJPEGLosslessPredictors 0x0205
-#define PropertyTagJPEGPointTransforms    0x0206
-#define PropertyTagJPEGQTables            0x0207
-#define PropertyTagJPEGDCTables           0x0208
-#define PropertyTagJPEGACTables           0x0209
-
-#define PropertyTagYCbCrCoefficients      0x0211
-#define PropertyTagYCbCrSubsampling       0x0212
-#define PropertyTagYCbCrPositioning       0x0213
-#define PropertyTagREFBlackWhite          0x0214
-
-#define PropertyTagICCProfile          0x8773
-
-#define PropertyTagGamma                0x0301
-#define PropertyTagICCProfileDescriptor 0x0302
-#define PropertyTagSRGBRenderingIntent  0x0303
-
-#define PropertyTagImageTitle          0x0320
-#define PropertyTagCopyright           0x8298
-
-#define PropertyTagResolutionXUnit            0x5001
-#define PropertyTagResolutionYUnit            0x5002
-#define PropertyTagResolutionXLengthUnit      0x5003
-#define PropertyTagResolutionYLengthUnit      0x5004
-#define PropertyTagPrintFlags                 0x5005
-#define PropertyTagPrintFlagsVersion          0x5006
-#define PropertyTagPrintFlagsCrop             0x5007
-#define PropertyTagPrintFlagsBleedWidth       0x5008
-#define PropertyTagPrintFlagsBleedWidthScale  0x5009
-#define PropertyTagHalftoneLPI                0x500A
-#define PropertyTagHalftoneLPIUnit            0x500B
-#define PropertyTagHalftoneDegree             0x500C
-#define PropertyTagHalftoneShape              0x500D
-#define PropertyTagHalftoneMisc               0x500E
-#define PropertyTagHalftoneScreen             0x500F
-#define PropertyTagJPEGQuality                0x5010
-#define PropertyTagGridSize                   0x5011
-#define PropertyTagThumbnailFormat            0x5012
-#define PropertyTagThumbnailWidth             0x5013
-#define PropertyTagThumbnailHeight            0x5014
-#define PropertyTagThumbnailColorDepth        0x5015
-#define PropertyTagThumbnailPlanes            0x5016
-#define PropertyTagThumbnailRawBytes          0x5017
-#define PropertyTagThumbnailSize              0x5018
-#define PropertyTagThumbnailCompressedSize    0x5019
-#define PropertyTagColorTransferFunction      0x501A
-#define PropertyTagThumbnailData              0x501B
-
-#define PropertyTagThumbnailImageWidth        0x5020
-#define PropertyTagThumbnailImageHeight       0x5021
-#define PropertyTagThumbnailBitsPerSample     0x5022
-#define PropertyTagThumbnailCompression       0x5023
-#define PropertyTagThumbnailPhotometricInterp 0x5024
-#define PropertyTagThumbnailImageDescription  0x5025
-#define PropertyTagThumbnailEquipMake         0x5026
-#define PropertyTagThumbnailEquipModel        0x5027
-#define PropertyTagThumbnailStripOffsets      0x5028
-#define PropertyTagThumbnailOrientation       0x5029
-#define PropertyTagThumbnailSamplesPerPixel   0x502A
-#define PropertyTagThumbnailRowsPerStrip      0x502B
-#define PropertyTagThumbnailStripBytesCount   0x502C
-#define PropertyTagThumbnailResolutionX       0x502D
-#define PropertyTagThumbnailResolutionY       0x502E
-#define PropertyTagThumbnailPlanarConfig      0x502F
-#define PropertyTagThumbnailResolutionUnit    0x5030
-#define PropertyTagThumbnailTransferFunction  0x5031
-#define PropertyTagThumbnailSoftwareUsed      0x5032
-#define PropertyTagThumbnailDateTime          0x5033
-#define PropertyTagThumbnailArtist            0x5034
-#define PropertyTagThumbnailWhitePoint        0x5035
-#define PropertyTagThumbnailPrimaryChromaticities 0x5036
-#define PropertyTagThumbnailYCbCrCoefficients 0x5037
-#define PropertyTagThumbnailYCbCrSubsampling  0x5038
-#define PropertyTagThumbnailYCbCrPositioning  0x5039
-#define PropertyTagThumbnailRefBlackWhite     0x503A
-#define PropertyTagThumbnailCopyRight         0x503B
-
-#define PropertyTagLuminanceTable    0x5090
-#define PropertyTagChrominanceTable  0x5091
-
-#define PropertyTagFrameDelay        0x5100
-#define PropertyTagLoopCount         0x5101
-
-#define PropertyTagPixelUnit         0x5110
-#define PropertyTagPixelPerUnitX     0x5111
-#define PropertyTagPixelPerUnitY     0x5112
-#define PropertyTagPaletteHistogram  0x5113
-
-#define PropertyTagExifExposureTime  0x829A
-#define PropertyTagExifFNumber       0x829D
-
-#define PropertyTagExifExposureProg  0x8822
-#define PropertyTagExifSpectralSense 0x8824
-#define PropertyTagExifISOSpeed      0x8827
-#define PropertyTagExifOECF          0x8828
-
-#define PropertyTagExifVer           0x9000
-#define PropertyTagExifDTOrig        0x9003
-#define PropertyTagExifDTDigitized   0x9004
-
-#define PropertyTagExifCompConfig    0x9101
-#define PropertyTagExifCompBPP       0x9102
-
-#define PropertyTagExifShutterSpeed  0x9201
-#define PropertyTagExifAperture      0x9202
-#define PropertyTagExifBrightness    0x9203
-#define PropertyTagExifExposureBias  0x9204
-#define PropertyTagExifMaxAperture   0x9205
-#define PropertyTagExifSubjectDist   0x9206
-#define PropertyTagExifMeteringMode  0x9207
-#define PropertyTagExifLightSource   0x9208
-#define PropertyTagExifFlash         0x9209
-#define PropertyTagExifFocalLength   0x920A
-#define PropertyTagExifMakerNote     0x927C
-#define PropertyTagExifUserComment   0x9286
-#define PropertyTagExifDTSubsec      0x9290
-#define PropertyTagExifDTOrigSS      0x9291
-#define PropertyTagExifDTDigSS       0x9292
-
-#define PropertyTagExifFPXVer        0xA000
-#define PropertyTagExifColorSpace    0xA001
-#define PropertyTagExifPixXDim       0xA002
-#define PropertyTagExifPixYDim       0xA003
-#define PropertyTagExifRelatedWav    0xA004
-#define PropertyTagExifInterop       0xA005
-#define PropertyTagExifFlashEnergy   0xA20B
-#define PropertyTagExifSpatialFR     0xA20C
-#define PropertyTagExifFocalXRes     0xA20E
-#define PropertyTagExifFocalYRes     0xA20F
-#define PropertyTagExifFocalResUnit  0xA210
-#define PropertyTagExifSubjectLoc    0xA214
-#define PropertyTagExifExposureIndex 0xA215
-#define PropertyTagExifSensingMethod 0xA217
-#define PropertyTagExifFileSource    0xA300
-#define PropertyTagExifSceneType     0xA301
-#define PropertyTagExifCfaPattern    0xA302
-
-#define PropertyTagGpsVer            0x0000
-#define PropertyTagGpsLatitudeRef    0x0001
-#define PropertyTagGpsLatitude       0x0002
-#define PropertyTagGpsLongitudeRef   0x0003
-#define PropertyTagGpsLongitude      0x0004
-#define PropertyTagGpsAltitudeRef    0x0005
-#define PropertyTagGpsAltitude       0x0006
-#define PropertyTagGpsGpsTime        0x0007
-#define PropertyTagGpsGpsSatellites  0x0008
-#define PropertyTagGpsGpsStatus      0x0009
-#define PropertyTagGpsGpsMeasureMode 0x000A
-#define PropertyTagGpsGpsDop         0x000B
-#define PropertyTagGpsSpeedRef       0x000C
-#define PropertyTagGpsSpeed          0x000D
-#define PropertyTagGpsTrackRef       0x000E
-#define PropertyTagGpsTrack          0x000F
-#define PropertyTagGpsImgDirRef      0x0010
-#define PropertyTagGpsImgDir         0x0011
-#define PropertyTagGpsMapDatum       0x0012
-#define PropertyTagGpsDestLatRef     0x0013
-#define PropertyTagGpsDestLat        0x0014
-#define PropertyTagGpsDestLongRef    0x0015
-#define PropertyTagGpsDestLong       0x0016
-#define PropertyTagGpsDestBearRef    0x0017
-#define PropertyTagGpsDestBear       0x0018
-#define PropertyTagGpsDestDistRef    0x0019
-#define PropertyTagGpsDestDist       0x001A
-
-#endif /* _GDIPLUSIMAGING_H */
diff --git a/external/wine/include/gdiplusinit.h b/external/wine/include/gdiplusinit.h
deleted file mode 100644
index 22155b7..0000000
--- a/external/wine/include/gdiplusinit.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSINIT_H
-#define _GDIPLUSINIT_H
-
-enum DebugEventLevel
-{
-    DebugEventLevelFatal,
-    DebugEventLevelWarning
-};
-
-typedef VOID (WINAPI *DebugEventProc)(enum DebugEventLevel, CHAR *);
-typedef Status (WINAPI *NotificationHookProc)(ULONG_PTR *);
-typedef void (WINAPI *NotificationUnhookProc)(ULONG_PTR);
-
-struct GdiplusStartupInput
-{
-    UINT32 GdiplusVersion;
-    DebugEventProc DebugEventCallback;
-    BOOL SuppressBackgroundThread;
-    BOOL SuppressExternalCodecs;
-
-#ifdef __cplusplus
-    GdiplusStartupInput(DebugEventProc debugEventCallback = NULL,
-        BOOL suppressBackgroundThread = FALSE,
-        BOOL suppressExternalCodecs = FALSE)
-    {
-        GdiplusVersion = 1;
-        DebugEventCallback = debugEventCallback;
-        SuppressBackgroundThread = suppressBackgroundThread;
-        SuppressExternalCodecs = suppressExternalCodecs;
-    }
-#endif
-};
-
-struct GdiplusStartupOutput
-{
-    NotificationHookProc NotificationHook;
-    NotificationUnhookProc NotificationUnhook;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Status WINAPI GdiplusStartup(ULONG_PTR *, const struct GdiplusStartupInput *, struct GdiplusStartupOutput *);
-void WINAPI GdiplusShutdown(ULONG_PTR);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/external/wine/include/gdiplusmem.h b/external/wine/include/gdiplusmem.h
deleted file mode 100644
index a0496ba..0000000
--- a/external/wine/include/gdiplusmem.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSMEM_H
-#define _GDIPLUSMEM_H
-
-#define WINGDIPAPI __stdcall
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void* WINGDIPAPI GdipAlloc(SIZE_T);
-void WINGDIPAPI GdipFree(void*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/external/wine/include/gdiplusmetaheader.h b/external/wine/include/gdiplusmetaheader.h
deleted file mode 100644
index e59ab09..0000000
--- a/external/wine/include/gdiplusmetaheader.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSMETAHEADER_H
-#define _GDIPLUSMETAHEADER_H
-
-typedef struct
-{
-    DWORD   iType;
-    DWORD   nSize;
-    RECTL   rclBounds;
-    RECTL   rclFrame;
-    DWORD   dSignature;
-    DWORD   nVersion;
-    DWORD   nBytes;
-    DWORD   nRecords;
-    WORD    nHandles;
-    WORD    sReserved;
-    DWORD   nDescription;
-    DWORD   offDescription;
-    DWORD   nPalEntries;
-    SIZEL   szlDevice;
-    SIZEL   szlMillimeters;
-} ENHMETAHEADER3;
-
-#include <pshpack2.h>
-
-typedef struct
-{
-    INT16  Left;
-    INT16  Top;
-    INT16  Right;
-    INT16  Bottom;
-} PWMFRect16;
-
-typedef struct
-{
-    UINT32     Key;
-    INT16      Hmf;
-    PWMFRect16 BoundingBox;
-    INT16      Inch;
-    UINT32     Reserved;
-    INT16      Checksum;
-} WmfPlaceableFileHeader;
-
-#include <poppack.h>
-
-#define GDIP_EMFPLUSFLAGS_DISPLAY       0x00000001
-
-#ifdef __cplusplus
-class MetafileHeader
-{
-public:
-    MetafileType        Type;
-    UINT                Size;
-    UINT                Version;
-    UINT                EmfPlusFlags;
-    REAL                DpiX;
-    REAL                DpiY;
-    INT                 X;
-    INT                 Y;
-    INT                 Width;
-    INT                 Height;
-    union
-    {
-        METAHEADER      WmfHeader;
-        ENHMETAHEADER3  EmfHeader;
-    };
-    INT                 EmfPlusHeaderSize;
-    INT                 LogicalDpiX;
-    INT                 LogicalDpiY;
-
-public:
-    MetafileType GetType() const { return Type; }
-
-    UINT GetMetafileSize() const { return Size; }
-
-    UINT GetVersion() const { return Version; }
-
-    UINT GetEmfPlusFlags() const { return EmfPlusFlags; }
-
-    REAL GetDpiX() const { return DpiX; }
-
-    REAL GetDpiY() const { return DpiY; }
-
-    VOID GetBounds (OUT Rect *r) const
-    {
-        r->X = X;
-        r->Y = Y;
-        r->Width = Width;
-        r->Height = Height;
-    }
-
-    BOOL IsWmf() const
-    {
-       return ((Type == MetafileTypeWmf) || (Type == MetafileTypeWmfPlaceable));
-    }
-
-    BOOL IsWmfPlaceable() const { return (Type == MetafileTypeWmfPlaceable); }
-
-    BOOL IsEmf() const { return (Type == MetafileTypeEmf); }
-
-    BOOL IsEmfOrEmfPlus() const { return (Type >= MetafileTypeEmf); }
-
-    BOOL IsEmfPlus() const { return (Type >= MetafileTypeEmfPlusOnly); }
-
-    BOOL IsEmfPlusDual() const { return (Type == MetafileTypeEmfPlusDual); }
-
-    BOOL IsEmfPlusOnly() const { return (Type == MetafileTypeEmfPlusOnly); }
-
-    BOOL IsDisplay() const
-    {
-        return IsEmfPlus() && ((EmfPlusFlags & GDIP_EMFPLUSFLAGS_DISPLAY) != 0);
-    }
-
-    const METAHEADER * GetWmfHeader() const
-    {
-        return IsWmf() ? &WmfHeader : NULL;
-    }
-
-    const ENHMETAHEADER3 * GetEmfHeader() const
-    {
-        return IsEmfOrEmfPlus() ? &EmfHeader : NULL;
-    }
-};
-#else /* end of c++ typedefs */
-
-typedef struct MetafileHeader
-{
-    MetafileType        Type;
-    UINT                Size;
-    UINT                Version;
-    UINT                EmfPlusFlags;
-    REAL                DpiX;
-    REAL                DpiY;
-    INT                 X;
-    INT                 Y;
-    INT                 Width;
-    INT                 Height;
-    union
-    {
-        METAHEADER      WmfHeader;
-        ENHMETAHEADER3  EmfHeader;
-    } DUMMYUNIONNAME;
-    INT                 EmfPlusHeaderSize;
-    INT                 LogicalDpiX;
-    INT                 LogicalDpiY;
-} MetafileHeader;
-
-#endif /* end of c typedefs */
-
-#endif /* _GDIPLUSMETAHEADER_H */
diff --git a/external/wine/include/gdipluspixelformats.h b/external/wine/include/gdipluspixelformats.h
deleted file mode 100644
index d7382f1..0000000
--- a/external/wine/include/gdipluspixelformats.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSPIXELFORMATS_H
-#define _GDIPLUSPIXELFORMATS_H
-
-typedef DWORD ARGB;
-typedef INT PixelFormat;
-
-#define    PixelFormatIndexed   0x00010000
-#define    PixelFormatGDI       0x00020000
-#define    PixelFormatAlpha     0x00040000
-#define    PixelFormatPAlpha    0x00080000
-#define    PixelFormatExtended  0x00100000
-#define    PixelFormatCanonical 0x00200000
-
-#define    PixelFormatUndefined 0
-#define    PixelFormatDontCare  0
-
-#define    PixelFormat1bppIndexed       (1 | ( 1 << 8) | PixelFormatIndexed | PixelFormatGDI)
-#define    PixelFormat4bppIndexed       (2 | ( 4 << 8) | PixelFormatIndexed | PixelFormatGDI)
-#define    PixelFormat8bppIndexed       (3 | ( 8 << 8) | PixelFormatIndexed | PixelFormatGDI)
-#define    PixelFormat16bppGrayScale    (4 | (16 << 8) | PixelFormatExtended)
-#define    PixelFormat16bppRGB555       (5 | (16 << 8) | PixelFormatGDI)
-#define    PixelFormat16bppRGB565       (6 | (16 << 8) | PixelFormatGDI)
-#define    PixelFormat16bppARGB1555     (7 | (16 << 8) | PixelFormatAlpha | PixelFormatGDI)
-#define    PixelFormat24bppRGB          (8 | (24 << 8) | PixelFormatGDI)
-#define    PixelFormat32bppRGB          (9 | (32 << 8) | PixelFormatGDI)
-#define    PixelFormat32bppARGB         (10 | (32 << 8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical)
-#define    PixelFormat32bppPARGB        (11 | (32 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI)
-#define    PixelFormat48bppRGB          (12 | (48 << 8) | PixelFormatExtended)
-#define    PixelFormat64bppARGB         (13 | (64 << 8) | PixelFormatAlpha  | PixelFormatCanonical | PixelFormatExtended)
-#define    PixelFormat64bppPARGB        (14 | (64 << 8) | PixelFormatAlpha  | PixelFormatPAlpha | PixelFormatExtended)
-#define    PixelFormatMax               15
-
-#ifdef __cplusplus
-
-struct ColorPalette
-{
-public:
-    UINT Flags;
-    UINT Count;
-    ARGB Entries[1];
-};
-
-#else /* end of c++ typedefs */
-
-typedef struct ColorPalette
-{
-    UINT Flags;
-    UINT Count;
-    ARGB Entries[1];
-} ColorPalette;
-
-#endif  /* end of c typedefs */
-
-#endif
diff --git a/external/wine/include/gdiplustypes.h b/external/wine/include/gdiplustypes.h
deleted file mode 100644
index 2e46bb4..0000000
--- a/external/wine/include/gdiplustypes.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (C) 2007 Google (Evan Stade)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef _GDIPLUSTYPES_H
-#define _GDIPLUSTYPES_H
-
-typedef float REAL;
-
-enum Status{
-    Ok                          = 0,
-    GenericError                = 1,
-    InvalidParameter            = 2,
-    OutOfMemory                 = 3,
-    ObjectBusy                  = 4,
-    InsufficientBuffer          = 5,
-    NotImplemented              = 6,
-    Win32Error                  = 7,
-    WrongState                  = 8,
-    Aborted                     = 9,
-    FileNotFound                = 10,
-    ValueOverflow               = 11,
-    AccessDenied                = 12,
-    UnknownImageFormat          = 13,
-    FontFamilyNotFound          = 14,
-    FontStyleNotFound           = 15,
-    NotTrueTypeFont             = 16,
-    UnsupportedGdiplusVersion   = 17,
-    GdiplusNotInitialized       = 18,
-    PropertyNotFound            = 19,
-    PropertyNotSupported        = 20,
-    ProfileNotFound             = 21
-};
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef BOOL (CALLBACK * ImageAbort)(VOID *);
-typedef ImageAbort DrawImageAbort;
-typedef ImageAbort GetThumbnailImageAbort;
-
-typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#ifdef __cplusplus
-
-class Point
-{
-public:
-   Point()
-   {
-       X = Y = 0;
-   }
-
-   Point(IN const Point &pt)
-   {
-       X = pt.X;
-       Y = pt.Y;
-   }
-
-   /* FIXME: missing constructor that takes a Size */
-
-   Point(IN INT x, IN INT y)
-   {
-       X = x;
-       Y = y;
-   }
-
-   Point operator+(IN const Point& pt) const
-   {
-       return Point(X + pt.X, Y + pt.Y);
-   }
-
-   Point operator-(IN const Point& pt) const
-   {
-       return Point(X - pt.X, Y - pt.Y);
-   }
-
-   BOOL Equals(IN const Point& pt)
-   {
-       return (X == pt.X) && (Y == pt.Y);
-   }
-
-public:
-    INT X;
-    INT Y;
-};
-
-class PointF
-{
-public:
-   PointF()
-   {
-       X = Y = 0.0f;
-   }
-
-   PointF(IN const PointF &pt)
-   {
-       X = pt.X;
-       Y = pt.Y;
-   }
-
-   /* FIXME: missing constructor that takes a SizeF */
-
-   PointF(IN REAL x, IN REAL y)
-   {
-       X = x;
-       Y = y;
-   }
-
-   PointF operator+(IN const PointF& pt) const
-   {
-       return PointF(X + pt.X, Y + pt.Y);
-   }
-
-   PointF operator-(IN const PointF& pt) const
-   {
-       return PointF(X - pt.X, Y - pt.Y);
-   }
-
-   BOOL Equals(IN const PointF& pt)
-   {
-       return (X == pt.X) && (Y == pt.Y);
-   }
-
-public:
-    REAL X;
-    REAL Y;
-};
-
-class PathData
-{
-public:
-    PathData()
-    {
-        Count = 0;
-        Points = NULL;
-        Types = NULL;
-    }
-
-    ~PathData()
-    {
-        if (Points != NULL)
-        {
-            delete Points;
-        }
-
-        if (Types != NULL)
-        {
-            delete Types;
-        }
-    }
-
-private:
-    PathData(const PathData &);
-    PathData& operator=(const PathData &);
-
-public:
-    INT Count;
-    PointF* Points;
-    BYTE* Types;
-};
-
-/* FIXME: missing the methods. */
-class RectF
-{
-public:
-    REAL X;
-    REAL Y;
-    REAL Width;
-    REAL Height;
-};
-
-/* FIXME: missing the methods. */
-class Rect
-{
-public:
-    INT X;
-    INT Y;
-    INT Width;
-    INT Height;
-};
-
-class CharacterRange
-{
-public:
-    CharacterRange()
-    {
-        First = Length = 0;
-    }
-
-    CharacterRange(INT first, INT length)
-    {
-        First = first;
-        Length = length;
-    }
-
-    CharacterRange& operator=(const CharacterRange& rhs)
-    {
-        First = rhs.First;
-        Length = rhs.Length;
-        return *this;
-    }
-public:
-    INT First;
-    INT Length;
-};
-
-#else /* end of c++ typedefs */
-
-typedef struct Point
-{
-    INT X;
-    INT Y;
-} Point;
-
-typedef struct PointF
-{
-    REAL X;
-    REAL Y;
-} PointF;
-
-typedef struct PathData
-{
-    INT Count;
-    PointF* Points;
-    BYTE* Types;
-} PathData;
-
-typedef struct RectF
-{
-    REAL X;
-    REAL Y;
-    REAL Width;
-    REAL Height;
-} RectF;
-
-typedef struct Rect
-{
-    INT X;
-    INT Y;
-    INT Width;
-    INT Height;
-} Rect;
-
-typedef struct CharacterRange
-{
-    INT First;
-    INT Length;
-} CharacterRange;
-
-typedef enum Status Status;
-
-#endif /* end of c typedefs */
-
-#endif
diff --git a/external/wine/include/vsstyle.h b/external/wine/include/vsstyle.h
deleted file mode 100644
index ce9f7c7..0000000
--- a/external/wine/include/vsstyle.h
+++ /dev/null
@@ -1,1746 +0,0 @@
-/*
- * Copyright (C) 2011 Piotr Caban for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __VSSTYLE_H__
-#define __VSSTYLE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TMTVS_RESERVEDLOW 100000
-#define TMTVS_RESERVEDHIGH 19999
-
-/* AEROWIZARDSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_AEROWIZARDSTYLE (const WCHAR []){'A','E','R','O','W','I','Z','A','R','D','S','T','Y','L','E',0}
-#define VSCLASS_AEROWIZARD (const WCHAR []){'A','E','R','O','W','I','Z','A','R','D',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_AEROWIZARDSTYLE L"AEROWIZARDSTYLE"
-#define VSCLASS_AEROWIZARD L"AEROWIZARD"
-#else
-static const WCHAR VSCLASS_AEROWIZARDSTYLE[] = {'A','E','R','O','W','I','Z','A','R','D','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_AEROWIZARD [] = {'A','E','R','O','W','I','Z','A','R','D',0};
-#endif
-
-enum AEROWIZARDPARTS {
-    AW_TITLEBAR = 1,
-    AW_HEADERAREA = 2,
-    AW_CONTENTAREA = 3,
-    AW_COMMANDAREA = 4,
-    AW_BUTTON = 5,
-};
-
-#define AEROWIZARDSTYLEPARTS AEROWIZARDPARTS;
-
-enum TITLEBARSTATES {
-    AW_S_TITLEBAR_ACTIVE = 1,
-    AW_S_TITLEBAR_INACTIVE = 2,
-};
-
-enum HEADERAREASTATES {
-    AW_S_HEADERAREA_NOMARGIN = 1,
-};
-
-enum CONTENTAREASTATES {
-    AW_S_CONTENTAREA_NOMARGIN = 1,
-};
-
-/* BUTTONSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_BUTTONSTYLE (const WCHAR []){'B','U','T','T','O','N','S','T','Y','L','E',0}
-#define VSCLASS_BUTTON (const WCHAR []){'B','U','T','T','O','N',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_BUTTONSTYLE L"BUTTONSTYLE"
-#define VSCLASS_BUTTON L"BUTTON"
-#else
-static const WCHAR VSCLASS_BUTTONSTYLE [] = {'B','U','T','T','O','N','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_BUTTON [] = {'B','U','T','T','O','N',0};
-#endif
-
-enum BUTTONPARTS {
-    BP_PUSHBUTTON = 1,
-    BP_RADIOBUTTON = 2,
-    BP_CHECKBOX = 3,
-    BP_GROUPBOX = 4,
-    BP_USERBUTTON = 5,
-    BP_COMMANDLINK = 6,
-    BP_COMMANDLINKGLYPH = 7,
-};
-
-#define BUTTONSTYLEPARTS BUTTONPARTS;
-
-enum PUSHBUTTONSTATES {
-    PBS_NORMAL = 1,
-    PBS_HOT = 2,
-    PBS_PRESSED = 3,
-    PBS_DISABLED = 4,
-    PBS_DEFAULTED = 5,
-    PBS_DEFAULTED_ANIMATING = 6,
-};
-
-enum RADIOBUTTONSTATES {
-    RBS_UNCHECKEDNORMAL = 1,
-    RBS_UNCHECKEDHOT = 2,
-    RBS_UNCHECKEDPRESSED = 3,
-    RBS_UNCHECKEDDISABLED = 4,
-    RBS_CHECKEDNORMAL = 5,
-    RBS_CHECKEDHOT = 6,
-    RBS_CHECKEDPRESSED = 7,
-    RBS_CHECKEDDISABLED = 8,
-};
-
-enum CHECKBOXSTATES {
-    CBS_UNCHECKEDNORMAL = 1,
-    CBS_UNCHECKEDHOT = 2,
-    CBS_UNCHECKEDPRESSED = 3,
-    CBS_UNCHECKEDDISABLED = 4,
-    CBS_CHECKEDNORMAL = 5,
-    CBS_CHECKEDHOT = 6,
-    CBS_CHECKEDPRESSED = 7,
-    CBS_CHECKEDDISABLED = 8,
-    CBS_MIXEDNORMAL = 9,
-    CBS_MIXEDHOT = 10,
-    CBS_MIXEDPRESSED = 11,
-    CBS_MIXEDDISABLED = 12,
-    CBS_IMPLICITNORMAL = 13,
-    CBS_IMPLICITHOT = 14,
-    CBS_IMPLICITPRESSED = 15,
-    CBS_IMPLICITDISABLED = 16,
-    CBS_EXCLUDEDNORMAL = 17,
-    CBS_EXCLUDEDHOT = 18,
-    CBS_EXCLUDEDPRESSED = 19,
-    CBS_EXCLUDEDDISABLED = 20,
-};
-
-enum GROUPBOXSTATES {
-    GBS_NORMAL = 1,
-    GBS_DISABLED = 2,
-};
-
-enum COMMANDLINKSTATES {
-    CMDLS_NORMAL = 1,
-    CMDLS_HOT = 2,
-    CMDLS_PRESSED = 3,
-    CMDLS_DISABLED = 4,
-    CMDLS_DEFAULTED = 5,
-    CMDLS_DEFAULTED_ANIMATING = 6,
-};
-
-enum COMMANDLINKGLYPHSTATES {
-    CMDLGS_NORMAL = 1,
-    CMDLGS_HOT = 2,
-    CMDLGS_PRESSED = 3,
-    CMDLGS_DISABLED = 4,
-    CMDLGS_DEFAULTED = 5,
-};
-
-/* COMBOBOXSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_COMBOBOXSTYLE (const WCHAR []){'C','O','M','B','O','B','O','X','S','T','Y','L','E',0}
-#define VSCLASS_COMBOBOX (const WCHAR []){'C','O','M','B','O','B','O','X',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_COMBOBOXSTYLE L"COMBOBOXSTYLE"
-#define VSCLASS_COMBOBOX L"COMBOBOX"
-#else
-static const WCHAR VSCLASS_COMBOBOXSTYLE [] = {'C','O','M','B','O','B','O','X','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_COMBOBOX [] = {'C','O','M','B','O','B','O','X',0};
-#endif
-
-enum COMBOBOXPARTS {
-    CP_DROPDOWNBUTTON = 1,
-    CP_BACKGROUND = 2,
-    CP_TRANSPARENTBACKGROUND = 3,
-    CP_BORDER = 4,
-    CP_READONLY = 5,
-    CP_DROPDOWNBUTTONRIGHT = 6,
-    CP_DROPDOWNBUTTONLEFT = 7,
-    CP_CUEBANNER = 8,
-};
-
-#define COMBOBOXSTYLEPARTS COMBOBOXPARTS;
-
-enum COMBOBOXSTYLESTATES {
-    CBXS_NORMAL = 1,
-    CBXS_HOT = 2,
-    CBXS_PRESSED = 3,
-    CBXS_DISABLED = 4,
-};
-
-enum DROPDOWNBUTTONRIGHTSTATES {
-    CBXSR_NORMAL = 1,
-    CBXSR_HOT = 2,
-    CBXSR_PRESSED = 3,
-    CBXSR_DISABLED = 4,
-};
-
-enum DROPDOWNBUTTONLEFTSTATES {
-    CBXSL_NORMAL = 1,
-    CBXSL_HOT = 2,
-    CBXSL_PRESSED = 3,
-    CBXSL_DISABLED = 4,
-};
-
-enum TRANSPARENTBACKGROUNDSTATES {
-    CBTBS_NORMAL = 1,
-    CBTBS_HOT = 2,
-    CBTBS_DISABLED = 3,
-    CBTBS_FOCUSED = 4,
-};
-
-enum BORDERSTATES {
-    CBB_NORMAL = 1,
-    CBB_HOT = 2,
-    CBB_FOCUSED = 3,
-    CBB_DISABLED = 4,
-};
-
-enum READONLYSTATES {
-    CBRO_NORMAL = 1,
-    CBRO_HOT = 2,
-    CBRO_PRESSED = 3,
-    CBRO_DISABLED = 4,
-};
-
-enum CUEBANNERSTATES {
-    CBCB_NORMAL = 1,
-    CBCB_HOT = 2,
-    CBCB_PRESSED = 3,
-    CBCB_DISABLED = 4,
-};
-
-/* COMMUNICATIONSSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_COMMUNICATIONSSTYLE (const WCHAR []){'C','O','M','M','U','N','I','C','A','T','I','O','N','S','S','T','Y','L','E',0}
-#define VSCLASS_COMMUNICATIONS (const WCHAR []){'C','O','M','M','U','N','I','C','A','T','I','O','N','S',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_COMMUNICATIONSSTYLE L"COMMUNICATIONSSTYLE"
-#define VSCLASS_COMMUNICATIONS L"COMMUNICATIONS"
-#else
-static const WCHAR VSCLASS_COMMUNICATIONSSTYLE [] = {'C','O','M','M','U','N','I','C','A','T','I','O','N','S','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_COMMUNICATIONS [] = {'C','O','M','M','U','N','I','C','A','T','I','O','N','S',0};
-#endif
-
-enum COMMUNICATIONSPARTS {
-    CSST_TAB = 1,
-};
-
-#define COMMUNICATIONSSTYLEPARTS COMMUNICATIONSPARTS;
-
-enum TABSTATES {
-    CSTB_NORMAL = 1,
-    CSTB_HOT = 2,
-    CSTB_SELECTED = 3,
-};
-
-/* CONTROLPANELSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_CONTROLPANELSTYLE (const WCHAR []){'C','O','N','T','R','O','L','P','A','N','E','L','S','T','Y','L','E',0}
-#define VSCLASS_CONTROLPANEL (const WCHAR []){'C','O','N','T','R','O','L','P','A','N','E','L',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_CONTROLPANELSTYLE L"CONTROLPANELSTYLE"
-#define VSCLASS_CONTROLPANEL L"CONTROLPANEL"
-#else
-static const WCHAR VSCLASS_CONTROLPANELSTYLE [] = {'C','O','N','T','R','O','L','P','A','N','E','L','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_CONTROLPANEL [] = {'C','O','N','T','R','O','L','P','A','N','E','L',0};
-#endif
-
-enum CONTROLPANELPARTS {
-    CPANEL_NAVIGATIONPANE = 1,
-    CPANEL_CONTENTPANE = 2,
-    CPANEL_NAVIGATIONPANELABEL = 3,
-    CPANEL_CONTENTPANELABEL = 4,
-    CPANEL_TITLE = 5,
-    CPANEL_BODYTEXT = 6,
-    CPANEL_HELPLINK = 7,
-    CPANEL_TASKLINK = 8,
-    CPANEL_GROUPTEXT = 9,
-    CPANEL_CONTENTLINK = 10,
-    CPANEL_SECTIONTITLELINK = 11,
-    CPANEL_LARGECOMMANDAREA = 12,
-    CPANEL_SMALLCOMMANDAREA = 13,
-    CPANEL_BUTTON = 14,
-    CPANEL_MESSAGETEXT = 15,
-    CPANEL_NAVIGATIONPANELINE = 16,
-    CPANEL_CONTENTPANELINE = 17,
-    CPANEL_BANNERAREA = 18,
-    CPANEL_BODYTITLE = 19,
-};
-
-#define CONTROLPANELSTYLEPARTS CONTROLPANELPARTS;
-
-enum HELPLINKSTATES {
-    CPHL_NORMAL = 1,
-    CPHL_HOT = 2,
-    CPHL_PRESSED = 3,
-    CPHL_DISABLED = 4,
-};
-
-enum TASKLINKSTATES {
-    CPTL_NORMAL = 1,
-    CPTL_HOT = 2,
-    CPTL_PRESSED = 3,
-    CPTL_DISABLED = 4,
-    CPTL_PAGE = 5,
-};
-
-enum CONTENTLINKSTATES {
-    CPCL_NORMAL = 1,
-    CPCL_HOT = 2,
-    CPCL_PRESSED = 3,
-    CPCL_DISABLED = 4,
-};
-
-enum SECTIONTITLELINKSTATES {
-    CPSTL_NORMAL = 1,
-    CPSTL_HOT = 2,
-};
-
-/* DATEPICKERSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_DATEPICKERSTYLE (const WCHAR []){'D','A','T','E','P','I','C','K','E','R','S','T','Y','L','E',0}
-#define VSCLASS_DATEPICKER (const WCHAR []){'D','A','T','E','P','I','C','K','E','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_DATEPICKERSTYLE L"DATEPICKERSTYLE"
-#define VSCLASS_DATEPICKER L"DATEPICKER"
-#else
-static const WCHAR VSCLASS_DATEPICKERSTYLE[] = {'D','A','T','E','P','I','C','K','E','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_DATEPICKER [] = {'D','A','T','E','P','I','C','K','E','R',0};
-#endif
-
-enum DATEPICKERPARTS {
-    DP_DATETEXT = 1,
-    DP_DATEBORDER = 2,
-    DP_SHOWCALENDARBUTTONRIGHT = 3,
-};
-
-#define DATEPICKERSTYLEPARTS DATEPICKERPARTS;
-
-enum DATETEXTSTATES {
-    DPDT_NORMAL = 1,
-    DPDT_DISABLED = 2,
-    DPDT_SELECTED = 3,
-};
-
-enum DATEBORDERSTATES {
-    DPDB_NORMAL = 1,
-    DPDB_HOT = 2,
-    DPDB_FOCUSED = 3,
-    DPDB_DISABLED = 4,
-};
-
-enum SHOWCALENDARBUTTONRIGHTSTATES {
-    DPSCBR_NORMAL = 1,
-    DPSCBR_HOT = 2,
-    DPSCBR_PRESSED = 3,
-    DPSCBR_DISABLED = 4,
-};
-
-/* DRAGDROPSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_DRAGDROPSTYLE (const WCHAR []){'D','R','A','G','D','R','O','P','S','T','Y','L','E',0}
-#define VSCLASS_DRAGDROP (const WCHAR []){'D','R','A','G','D','R','O','P',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_DRAGDROPSTYLE L"DRAGDROPSTYLE"
-#define VSCLASS_DRAGDROP L"DRAGDROP"
-#else
-static const WCHAR VSCLASS_DRAGDROPSTYLE [] = {'D','R','A','G','D','R','O','P','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_DRAGDROP [] = {'D','R','A','G','D','R','O','P',0};
-#endif
-
-enum DRAGDROPPARTS {
-    DD_COPY = 1,
-    DD_MOVE = 2,
-    DD_UPDATEMETADATA = 3,
-    DD_CREATELINK = 4,
-    DD_WARNING = 5,
-    DD_NONE = 6,
-    DD_IMAGEBG = 7,
-    DD_TEXTBG = 8,
-};
-
-#define DRAGDROPSTYLEPARTS DRAGDROPPARTS;
-
-enum COPYSTATES {
-    DDCOPY_HIGHLIGHT = 1,
-    DDCOPY_NOHIGHLIGHT = 2,
-};
-
-enum MOVESTATES {
-    DDMOVE_HIGHLIGHT = 1,
-    DDMOVE_NOHIGHLIGHT = 2,
-};
-
-enum UPDATEMETADATASTATES {
-    DDUPDATEMETADATA_HIGHLIGHT = 1,
-    DDUPDATEMETADATA_NOHIGHLIGHT = 2,
-};
-
-enum CREATELINKSTATES {
-    DDCREATELINK_HIGHLIGHT = 1,
-    DDCREATELINK_NOHIGHLIGHT = 2,
-};
-
-enum WARNINGSTATES {
-    DDWARNING_HIGHLIGHT = 1,
-    DDWARNING_NOHIGHLIGHT = 2,
-};
-
-enum NONESTATES {
-    DDNONE_HIGHLIGHT = 1,
-    DDNONE_NOHIGHLIGHT = 2,
-};
-
-/* EDITSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_EDITSTYLE (const WCHAR []){'E','D','I','T','S','T','Y','L','E',0}
-#define VSCLASS_EDIT (const WCHAR []){'E','D','I','T',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_EDITSTYLE L"EDITSTYLE"
-#define VSCLASS_EDIT L"EDIT"
-#else
-static const WCHAR VSCLASS_EDITSTYLE [] = {'E','D','I','T','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_EDIT [] = {'E','D','I','T',0};
-#endif
-
-enum EDITPARTS {
-    EP_EDITTEXT = 1,
-    EP_CARET = 2,
-    EP_BACKGROUND = 3,
-    EP_PASSWORD = 4,
-    EP_BACKGROUNDWITHBORDER = 5,
-    EP_EDITBORDER_NOSCROLL = 6,
-    EP_EDITBORDER_HSCROLL = 7,
-    EP_EDITBORDER_VSCROLL = 8,
-    EP_EDITBORDER_HVSCROLL = 9,
-};
-
-#define EDITSTYLEPARTS EDITPARTS;
-
-enum EDITTEXTSTATES {
-    ETS_NORMAL = 1,
-    ETS_HOT = 2,
-    ETS_SELECTED = 3,
-    ETS_DISABLED = 4,
-    ETS_FOCUSED = 5,
-    ETS_READONLY = 6,
-    ETS_ASSIST = 7,
-    ETS_CUEBANNER = 8,
-};
-
-enum BACKGROUNDSTATES {
-    EBS_NORMAL = 1,
-    EBS_HOT = 2,
-    EBS_DISABLED = 3,
-    EBS_FOCUSED = 4,
-    EBS_READONLY = 5,
-    EBS_ASSIST = 6,
-};
-
-enum BACKGROUNDWITHBORDERSTATES {
-    EBWBS_NORMAL = 1,
-    EBWBS_HOT = 2,
-    EBWBS_DISABLED = 3,
-    EBWBS_FOCUSED = 4,
-};
-
-enum EDITBORDER_NOSCROLLSTATES {
-    EPSN_NORMAL = 1,
-    EPSN_HOT = 2,
-    EPSN_FOCUSED = 3,
-    EPSN_DISABLED = 4,
-};
-
-enum EDITBORDER_HSCROLLSTATES {
-    EPSH_NORMAL = 1,
-    EPSH_HOT = 2,
-    EPSH_FOCUSED = 3,
-    EPSH_DISABLED = 4,
-};
-
-enum EDITBORDER_VSCROLLSTATES {
-    EPSV_NORMAL = 1,
-    EPSV_HOT = 2,
-    EPSV_FOCUSED = 3,
-    EPSV_DISABLED = 4,
-};
-
-enum EDITBORDER_HVSCROLLSTATES {
-    EPSHV_NORMAL = 1,
-    EPSHV_HOT = 2,
-    EPSHV_FOCUSED = 3,
-    EPSHV_DISABLED = 4,
-};
-
-/* EXPLORERBARSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_EXPLORERBARSTYLE (const WCHAR []){'E','X','P','L','O','R','E','R','B','A','R','S','T','Y','L','E',0}
-#define VSCLASS_EXPLORERBAR (const WCHAR []){'E','X','P','L','O','R','E','R','B','A','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_EXPLORERBARSTYLE L"EXPLORERBARSTYLE"
-#define VSCLASS_EXPLORERBAR L"EXPLORERBAR"
-#else
-static const WCHAR VSCLASS_EXPLORERBARSTYLE [] = {'E','X','P','L','O','R','E','R','B','A','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_EXPLORERBAR [] = {'E','X','P','L','O','R','E','R','B','A','R',0};
-#endif
-
-enum EXPLORERBARPARTS {
-    EBP_HEADERBACKGROUND = 1,
-    EBP_HEADERCLOSE = 2,
-    EBP_HEADERPIN = 3,
-    EBP_IEBARMENU = 4,
-    EBP_NORMALGROUPBACKGROUND = 5,
-    EBP_NORMALGROUPCOLLAPSE = 6,
-    EBP_NORMALGROUPEXPAND = 7,
-    EBP_NORMALGROUPHEAD = 8,
-    EBP_SPECIALGROUPBACKGROUND = 9,
-    EBP_SPECIALGROUPCOLLAPSE = 10,
-    EBP_SPECIALGROUPEXPAND = 11,
-    EBP_SPECIALGROUPHEAD = 12,
-};
-
-#define EXPLORERBARSTYLEPARTS EXPLORERBARPARTS;
-
-enum HEADERCLOSESTATES {
-    EBHC_NORMAL = 1,
-    EBHC_HOT = 2,
-    EBHC_PRESSED = 3,
-};
-
-enum HEADERPINSTATES {
-    EBHP_NORMAL = 1,
-    EBHP_HOT = 2,
-    EBHP_PRESSED = 3,
-    EBHP_SELECTEDNORMAL = 4,
-    EBHP_SELECTEDHOT = 5,
-    EBHP_SELECTEDPRESSED = 6,
-};
-
-enum IEBARMENUSTATES {
-    EBM_NORMAL = 1,
-    EBM_HOT = 2,
-    EBM_PRESSED = 3,
-};
-
-enum NORMALGROUPCOLLAPSESTATES {
-    EBNGC_NORMAL = 1,
-    EBNGC_HOT = 2,
-    EBNGC_PRESSED = 3,
-};
-
-enum NORMALGROUPEXPANDSTATES {
-    EBNGE_NORMAL = 1,
-    EBNGE_HOT = 2,
-    EBNGE_PRESSED = 3,
-};
-
-enum SPECIALGROUPCOLLAPSESTATES {
-    EBSGC_NORMAL = 1,
-    EBSGC_HOT = 2,
-    EBSGC_PRESSED = 3,
-};
-
-enum SPECIALGROUPEXPANDSTATES {
-    EBSGE_NORMAL = 1,
-    EBSGE_HOT = 2,
-    EBSGE_PRESSED = 3,
-};
-
-/* FLYOUTSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_FLYOUTSTYLE (const WCHAR []){'F','L','Y','O','U','T','S','T','Y','L','E',0}
-#define VSCLASS_FLYOUT (const WCHAR []){'F','L','Y','O','U','T',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_FLYOUTSTYLE L"FLYOUTSTYLE"
-#define VSCLASS_FLYOUT L"FLYOUT"
-#else
-static const WCHAR VSCLASS_FLYOUTSTYLE [] = {'F','L','Y','O','U','T','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_FLYOUT [] = {'F','L','Y','O','U','T',0};
-#endif
-
-enum FLYOUTPARTS {
-    FLYOUT_HEADER = 1,
-    FLYOUT_BODY = 2,
-    FLYOUT_LABEL = 3,
-    FLYOUT_LINK = 4,
-    FLYOUT_DIVIDER = 5,
-    FLYOUT_WINDOW = 6,
-    FLYOUT_LINKAREA = 7,
-    FLYOUT_LINKHEADER = 8,
-};
-
-#define FLYOUTSTYLEPARTS FLYOUTPARTS;
-
-enum LABELSTATES {
-    FLS_NORMAL = 1,
-    FLS_SELECTED = 2,
-    FLS_EMPHASIZED = 3,
-    FLS_DISABLED = 4,
-};
-
-enum LINKSTATES {
-    FLYOUTLINK_NORMAL = 1,
-    FLYOUTLINK_HOVER = 2,
-};
-
-enum BODYSTATES {
-    FBS_NORMAL = 1,
-    FBS_EMPHASIZED = 2,
-};
-
-enum LINKHEADERSTATES {
-    FLH_NORMAL = 1,
-    FLH_HOVER = 2,
-};
-
-/* HEADERSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_HEADERSTYLE (const WCHAR []){'H','E','A','D','E','R','S','T','Y','L','E',0}
-#define VSCLASS_HEADER (const WCHAR []){'H','E','A','D','E','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_HEADERSTYLE L"HEADERSTYLE"
-#define VSCLASS_HEADER L"HEADER"
-#else
-static const WCHAR VSCLASS_HEADERSTYLE [] = {'H','E','A','D','E','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_HEADER [] = {'H','E','A','D','E','R',0};
-#endif
-
-enum HEADERPARTS {
-    HP_HEADERITEM = 1,
-    HP_HEADERITEMLEFT = 2,
-    HP_HEADERITEMRIGHT = 3,
-    HP_HEADERSORTARROW = 4,
-    HP_HEADERDROPDOWN = 5,
-    HP_HEADERDROPDOWNFILTER = 6,
-    HP_HEADEROVERFLOW = 7,
-};
-
-#define HEADERSTYLEPARTS HEADERPARTS;
-
-enum HEADERSTYLESTATES {
-    HBG_DETAILS = 1,
-    HBG_ICON = 2,
-};
-
-enum HEADERITEMSTATES {
-    HIS_NORMAL = 1,
-    HIS_HOT = 2,
-    HIS_PRESSED = 3,
-    HIS_SORTEDNORMAL = 4,
-    HIS_SORTEDHOT = 5,
-    HIS_SORTEDPRESSED = 6,
-    HIS_ICONNORMAL = 7,
-    HIS_ICONHOT = 8,
-    HIS_ICONPRESSED = 9,
-    HIS_ICONSORTEDNORMAL = 10,
-    HIS_ICONSORTEDHOT = 11,
-    HIS_ICONSORTEDPRESSED = 12,
-};
-
-enum HEADERITEMLEFTSTATES {
-    HILS_NORMAL = 1,
-    HILS_HOT = 2,
-    HILS_PRESSED = 3,
-};
-
-enum HEADERITEMRIGHTSTATES {
-    HIRS_NORMAL = 1,
-    HIRS_HOT = 2,
-    HIRS_PRESSED = 3,
-};
-
-enum HEADERSORTARROWSTATES {
-    HSAS_SORTEDUP = 1,
-    HSAS_SORTEDDOWN = 2,
-};
-
-enum HEADERDROPDOWNSTATES {
-    HDDS_NORMAL = 1,
-    HDDS_SOFTHOT = 2,
-    HDDS_HOT = 3,
-};
-
-enum HEADERDROPDOWNFILTERSTATES {
-    HDDFS_NORMAL = 1,
-    HDDFS_SOFTHOT = 2,
-    HDDFS_HOT = 3,
-};
-
-enum HEADEROVERFLOWSTATES {
-    HOFS_NORMAL = 1,
-    HOFS_HOT = 2,
-};
-
-/* LISTBOXSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_LISTBOXSTYLE (const WCHAR []){'L','I','S','T','B','O','X','S','T','Y','L','E',0}
-#define VSCLASS_LISTBOX (const WCHAR []){'L','I','S','T','B','O','X',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_LISTBOXSTYLE L"LISTBOXSTYLE"
-#define VSCLASS_LISTBOX L"LISTBOX"
-#else
-static const WCHAR VSCLASS_LISTBOXSTYLE [] = {'L','I','S','T','B','O','X','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_LISTBOX[] = {'L','I','S','T','B','O','X',0};
-#endif
-
-enum LISTBOXPARTS {
-    LBCP_BORDER_HSCROLL = 1,
-    LBCP_BORDER_HVSCROLL = 2,
-    LBCP_BORDER_NOSCROLL = 3,
-    LBCP_BORDER_VSCROLL = 4,
-    LBCP_ITEM = 5,
-};
-
-#define LISTBOXSTYLEPARTS LISTBOXPARTS;
-
-enum BORDER_HSCROLLSTATES {
-    LBPSH_NORMAL = 1,
-    LBPSH_FOCUSED = 2,
-    LBPSH_HOT = 3,
-    LBPSH_DISABLED = 4,
-};
-
-enum BORDER_HVSCROLLSTATES {
-    LBPSHV_NORMAL = 1,
-    LBPSHV_FOCUSED = 2,
-    LBPSHV_HOT = 3,
-    LBPSHV_DISABLED = 4,
-};
-
-enum BORDER_NOSCROLLSTATES {
-    LBPSN_NORMAL = 1,
-    LBPSN_FOCUSED = 2,
-    LBPSN_HOT = 3,
-    LBPSN_DISABLED = 4,
-};
-
-enum BORDER_VSCROLLSTATES {
-    LBPSV_NORMAL = 1,
-    LBPSV_FOCUSED = 2,
-    LBPSV_HOT = 3,
-    LBPSV_DISABLED = 4,
-};
-
-enum ITEMSTATES {
-    LBPSI_HOT = 1,
-    LBPSI_HOTSELECTED = 2,
-    LBPSI_SELECTED = 3,
-    LBPSI_SELECTEDNOTFOCUS = 4,
-};
-
-/* LISTVIEWSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_LISTVIEWSTYLE (const WCHAR []){'L','I','S','T','V','I','E','W','S','T','Y','L','E',0}
-#define VSCLASS_LISTVIEW (const WCHAR []){'L','I','S','T','V','I','E','W',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_LISTVIEWSTYLE L"LISTVIEWSTYLE"
-#define VSCLASS_LISTVIEW L"LISTVIEW"
-#else
-static const WCHAR VSCLASS_LISTVIEWSTYLE [] = {'L','I','S','T','V','I','E','W','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_LISTVIEW [] = {'L','I','S','T','V','I','E','W',0};
-#endif
-
-enum LISTVIEWPARTS {
-    LVP_LISTITEM = 1,
-    LVP_LISTGROUP = 2,
-    LVP_LISTDETAIL = 3,
-    LVP_LISTSORTEDDETAIL = 4,
-    LVP_EMPTYTEXT = 5,
-    LVP_GROUPHEADER = 6,
-    LVP_GROUPHEADERLINE = 7,
-    LVP_EXPANDBUTTON = 8,
-    LVP_COLLAPSEBUTTON = 9,
-    LVP_COLUMNDETAIL = 10,
-};
-
-#define LISTVIEWSTYLEPARTS LISTVIEWPARTS;
-
-enum LISTITEMSTATES {
-    LISS_NORMAL = 1,
-    LISS_HOT = 2,
-    LISS_SELECTED = 3,
-    LISS_DISABLED = 4,
-    LISS_SELECTEDNOTFOCUS = 5,
-    LISS_HOTSELECTED = 6,
-};
-
-enum GROUPHEADERSTATES {
-    LVGH_OPEN = 1,
-    LVGH_OPENHOT = 2,
-    LVGH_OPENSELECTED = 3,
-    LVGH_OPENSELECTEDHOT = 4,
-    LVGH_OPENSELECTEDNOTFOCUSED = 5,
-    LVGH_OPENSELECTEDNOTFOCUSEDHOT = 6,
-    LVGH_OPENMIXEDSELECTION = 7,
-    LVGH_OPENMIXEDSELECTIONHOT = 8,
-    LVGH_CLOSE = 9,
-    LVGH_CLOSEHOT = 10,
-    LVGH_CLOSESELECTED = 11,
-    LVGH_CLOSESELECTEDHOT = 12,
-    LVGH_CLOSESELECTEDNOTFOCUSED = 13,
-    LVGH_CLOSESELECTEDNOTFOCUSEDHOT = 14,
-    LVGH_CLOSEMIXEDSELECTION = 15,
-    LVGH_CLOSEMIXEDSELECTIONHOT = 16,
-};
-
-enum GROUPHEADERLINESTATES {
-    LVGHL_OPEN = 1,
-    LVGHL_OPENHOT = 2,
-    LVGHL_OPENSELECTED = 3,
-    LVGHL_OPENSELECTEDHOT = 4,
-    LVGHL_OPENSELECTEDNOTFOCUSED = 5,
-    LVGHL_OPENSELECTEDNOTFOCUSEDHOT = 6,
-    LVGHL_OPENMIXEDSELECTION = 7,
-    LVGHL_OPENMIXEDSELECTIONHOT = 8,
-    LVGHL_CLOSE = 9,
-    LVGHL_CLOSEHOT = 10,
-    LVGHL_CLOSESELECTED = 11,
-    LVGHL_CLOSESELECTEDHOT = 12,
-    LVGHL_CLOSESELECTEDNOTFOCUSED = 13,
-    LVGHL_CLOSESELECTEDNOTFOCUSEDHOT = 14,
-    LVGHL_CLOSEMIXEDSELECTION = 15,
-    LVGHL_CLOSEMIXEDSELECTIONHOT = 16,
-};
-
-enum EXPANDBUTTONSTATES {
-    LVEB_NORMAL = 1,
-    LVEB_HOVER = 2,
-    LVEB_PUSHED = 3,
-};
-
-enum COLLAPSEBUTTONSTATES {
-    LVCB_NORMAL = 1,
-    LVCB_HOVER = 2,
-    LVCB_PUSHED = 3,
-};
-
-/* MENUSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_MENUSTYLE (const WCHAR []){'M','E','N','U','S','T','Y','L','E',0}
-#define VSCLASS_MENU (const WCHAR []){'M','E','N','U',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_MENUSTYLE L"MENUSTYLE"
-#define VSCLASS_MENU L"MENU"
-#else
-static const WCHAR VSCLASS_MENUSTYLE [] = {'M','E','N','U','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_MENU [] = {'M','E','N','U',0};
-#endif
-
-enum MENUPARTS {
-    MENU_MENUITEM_TMSCHEMA = 1,
-    MENU_MENUDROPDOWN_TMSCHEMA = 2,
-    MENU_MENUBARITEM_TMSCHEMA = 3,
-    MENU_MENUBARDROPDOWN_TMSCHEMA = 4,
-    MENU_CHEVRON_TMSCHEMA = 5,
-    MENU_SEPARATOR_TMSCHEMA = 6,
-    MENU_BARBACKGROUND = 7,
-    MENU_BARITEM = 8,
-    MENU_POPUPBACKGROUND = 9,
-    MENU_POPUPBORDERS = 10,
-    MENU_POPUPCHECK = 11,
-    MENU_POPUPCHECKBACKGROUND = 12,
-    MENU_POPUPGUTTER = 13,
-    MENU_POPUPITEM = 14,
-    MENU_POPUPSEPARATOR = 15,
-    MENU_POPUPSUBMENU = 16,
-    MENU_SYSTEMCLOSE = 17,
-    MENU_SYSTEMMAXIMIZE = 18,
-    MENU_SYSTEMMINIMIZE = 19,
-    MENU_SYSTEMRESTORE = 20,
-};
-
-#define MENUSTYLEPARTS MENUPARTS;
-
-enum BARBACKGROUNDSTATES {
-    MB_ACTIVE = 1,
-    MB_INACTIVE = 2,
-};
-
-enum BARITEMSTATES {
-    MBI_NORMAL = 1,
-    MBI_HOT = 2,
-    MBI_PUSHED = 3,
-    MBI_DISABLED = 4,
-    MBI_DISABLEDHOT = 5,
-    MBI_DISABLEDPUSHED = 6,
-};
-
-enum POPUPCHECKSTATES {
-    MC_CHECKMARKNORMAL = 1,
-    MC_CHECKMARKDISABLED = 2,
-    MC_BULLETNORMAL = 3,
-    MC_BULLETDISABLED = 4,
-};
-
-enum POPUPCHECKBACKGROUNDSTATES {
-    MCB_DISABLED = 1,
-    MCB_NORMAL = 2,
-    MCB_BITMAP = 3,
-};
-
-enum POPUPITEMSTATES {
-    MPI_NORMAL = 1,
-    MPI_HOT = 2,
-    MPI_DISABLED = 3,
-    MPI_DISABLEDHOT = 4,
-};
-
-enum POPUPSUBMENUSTATES {
-    MSM_NORMAL = 1,
-    MSM_DISABLED = 2,
-};
-
-enum SYSTEMCLOSESTATES {
-    MSYSC_NORMAL = 1,
-    MSYSC_DISABLED = 2,
-};
-
-enum SYSTEMMAXIMIZESTATES {
-    MSYSMX_NORMAL = 1,
-    MSYSMX_DISABLED = 2,
-};
-
-enum SYSTEMMINIMIZESTATES {
-    MSYSMN_NORMAL = 1,
-    MSYSMN_DISABLED = 2,
-};
-
-enum SYSTEMRESTORESTATES {
-    MSYSR_NORMAL = 1,
-    MSYSR_DISABLED = 2,
-};
-
-/* NAVIGATION class */
-#if defined(__GNUC__)
-#define VSCLASS_NAVIGATION (const WCHAR []){'N','A','V','I','G','A','T','I','O','N',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_NAVIGATION L"NAVIGATION"
-#else
-static const WCHAR VSCLASS_NAVIGATION [] = {'N','A','V','I','G','A','T','I','O','N',0};
-#endif
-
-enum NAVIGATIONPARTS {
-    NAV_BACKBUTTON = 1,
-    NAV_FORWARDBUTTON = 2,
-    NAV_MENUBUTTON = 3,
-};
-
-enum NAV_BACKBUTTONSTATES {
-    NAV_BB_NORMAL = 1,
-    NAV_BB_HOT = 2,
-    NAV_BB_PRESSED = 3,
-    NAV_BB_DISABLED = 4,
-};
-
-enum NAV_FORWARDBUTTONSTATES {
-    NAV_FB_NORMAL = 1,
-    NAV_FB_HOT = 2,
-    NAV_FB_PRESSED = 3,
-    NAV_FB_DISABLED = 4,
-};
-
-enum NAV_MENUBUTTONSTATES {
-    NAV_MB_NORMAL = 1,
-    NAV_MB_HOT = 2,
-    NAV_MB_PRESSED = 3,
-    NAV_MB_DISABLED = 4,
-};
-
-/* PROGRESSSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_PROGRESSSTYLE (const WCHAR []){'P','R','O','G','R','E','S','S','S','T','Y','L','E',0}
-#define VSCLASS_PROGRESS (const WCHAR []){'P','R','O','G','R','E','S','S',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_PROGRESSSTYLE L"PROGRESSSTYLE"
-#define VSCLASS_PROGRESS L"PROGRESS"
-#else
-static const WCHAR VSCLASS_PROGRESSSTYLE [] = {'P','R','O','G','R','E','S','S','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_PROGRESS [] = {'P','R','O','G','R','E','S','S',0};
-#endif
-
-enum PROGRESSPARTS {
-    PP_BAR = 1,
-    PP_BARVERT = 2,
-    PP_CHUNK = 3,
-    PP_CHUNKVERT = 4,
-    PP_FILL = 5,
-    PP_FILLVERT = 6,
-    PP_PULSEOVERLAY = 7,
-    PP_MOVEOVERLAY = 8,
-    PP_PULSEOVERLAYVERT = 9,
-    PP_MOVEOVERLAYVERT = 10,
-    PP_TRANSPARENTBAR = 11,
-    PP_TRANSPARENTBARVERT = 12,
-};
-
-#define PROGRESSSTYLEPARTS PROGRESSPARTS;
-
-enum TRANSPARENTBARSTATES {
-    PBBS_NORMAL = 1,
-    PBBS_PARTIAL = 2,
-};
-
-enum TRANSPARENTBARVERTSTATES {
-    PBBVS_NORMAL = 1,
-    PBBVS_PARTIAL = 2,
-};
-
-enum FILLSTATES {
-    PBFS_NORMAL = 1,
-    PBFS_ERROR = 2,
-    PBFS_PAUSED = 3,
-    PBFS_PARTIAL = 4,
-};
-
-enum FILLVERTSTATES {
-    PBFVS_NORMAL = 1,
-    PBFVS_ERROR = 2,
-    PBFVS_PAUSED = 3,
-    PBFVS_PARTIAL = 4,
-};
-
-/* REBARSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_REBARSTYLE (const WCHAR []){'R','E','B','A','R','S','T','Y','L','E',0}
-#define VSCLASS_REBAR (const WCHAR []){'R','E','B','A','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_REBARSTYLE L"REBARSTYLE"
-#define VSCLASS_REBAR L"REBAR"
-#else
-static const WCHAR VSCLASS_REBARSTYLE [] = {'R','E','B','A','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_REBAR [] = {'R','E','B','A','R',0};
-#endif
-
-enum REBARPARTS {
-    RP_GRIPPER = 1,
-    RP_GRIPPERVERT = 2,
-    RP_BAND = 3,
-    RP_CHEVRON = 4,
-    RP_CHEVRONVERT = 5,
-    RP_BACKGROUND = 6,
-    RP_SPLITTER = 7,
-    RP_SPLITTERVERT = 8,
-};
-
-#define REBARSTYLEPARTS REBARPARTS;
-
-enum CHEVRONSTATES {
-    CHEVS_NORMAL = 1,
-    CHEVS_HOT = 2,
-    CHEVS_PRESSED = 3,
-};
-
-enum CHEVRONVERTSTATES {
-    CHEVSV_NORMAL = 1,
-    CHEVSV_HOT = 2,
-    CHEVSV_PRESSED = 3,
-};
-
-enum SPLITTERSTATES {
-    SPLITS_NORMAL = 1,
-    SPLITS_HOT = 2,
-    SPLITS_PRESSED = 3,
-};
-
-enum SPLITTERVERTSTATES {
-    SPLITSV_NORMAL = 1,
-    SPLITSV_HOT = 2,
-    SPLITSV_PRESSED = 3,
-};
-
-/* SCROLLBARSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_SCROLLBARSTYLE (const WCHAR []){'S','C','R','O','L','L','B','A','R','S','T','Y','L','E',0}
-#define VSCLASS_SCROLLBAR (const WCHAR []){'S','C','R','O','L','L','B','A','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_SCROLLBARSTYLE L"SCROLLBARSTYLE"
-#define VSCLASS_SCROLLBAR L"SCROLLBAR"
-#else
-static const WCHAR VSCLASS_SCROLLBARSTYLE [] = {'S','C','R','O','L','L','B','A','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_SCROLLBAR [] = {'S','C','R','O','L','L','B','A','R',0};
-#endif
-
-enum SCROLLBARPARTS {
-    SBP_ARROWBTN = 1,
-    SBP_THUMBBTNHORZ = 2,
-    SBP_THUMBBTNVERT = 3,
-    SBP_LOWERTRACKHORZ = 4,
-    SBP_UPPERTRACKHORZ = 5,
-    SBP_LOWERTRACKVERT = 6,
-    SBP_UPPERTRACKVERT = 7,
-    SBP_GRIPPERHORZ = 8,
-    SBP_GRIPPERVERT = 9,
-    SBP_SIZEBOX = 10,
-};
-
-#define SCROLLBARSTYLEPARTS SCROLLBARPARTS;
-
-enum ARROWBTNSTATES {
-    ABS_UPNORMAL = 1,
-    ABS_UPHOT = 2,
-    ABS_UPPRESSED = 3,
-    ABS_UPDISABLED = 4,
-    ABS_DOWNNORMAL = 5,
-    ABS_DOWNHOT = 6,
-    ABS_DOWNPRESSED = 7,
-    ABS_DOWNDISABLED = 8,
-    ABS_LEFTNORMAL = 9,
-    ABS_LEFTHOT = 10,
-    ABS_LEFTPRESSED = 11,
-    ABS_LEFTDISABLED = 12,
-    ABS_RIGHTNORMAL = 13,
-    ABS_RIGHTHOT = 14,
-    ABS_RIGHTPRESSED = 15,
-    ABS_RIGHTDISABLED = 16,
-    ABS_UPHOVER = 17,
-    ABS_DOWNHOVER = 18,
-    ABS_LEFTHOVER = 19,
-    ABS_RIGHTHOVER = 20,
-};
-
-enum SCROLLBARSTYLESTATES {
-    SCRBS_NORMAL = 1,
-    SCRBS_HOT = 2,
-    SCRBS_PRESSED = 3,
-    SCRBS_DISABLED = 4,
-    SCRBS_HOVER = 5,
-};
-
-enum SIZEBOXSTATES {
-    SZB_RIGHTALIGN = 1,
-    SZB_LEFTALIGN = 2,
-    SZB_TOPRIGHTALIGN = 3,
-    SZB_TOPLEFTALIGN = 4,
-    SZB_HALFBOTTOMRIGHTALIGN = 5,
-    SZB_HALFBOTTOMLEFTALIGN = 6,
-    SZB_HALFTOPRIGHTALIGN = 7,
-    SZB_HALFTOPLEFTALIGN = 8,
-};
-
-/* SPINSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_SPINSTYLE (const WCHAR []){'S','P','I','N','S','T','Y','L','E',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_SPINSTYLE L"SPINSTYLE"
-#else
-static const WCHAR VSCLASS_SPINSTYLE [] = {'S','P','I','N','S','T','Y','L','E',0};
-#endif
-#if defined(__GNUC__)
-#define VSCLASS_SPIN (const WCHAR []){'S','P','I','N',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_SPIN L"SPIN"
-#else
-static const WCHAR VSCLASS_SPIN [] = {'S','P','I','N',0};
-#endif
-
-enum SPINPARTS {
-    SPNP_UP = 1,
-    SPNP_DOWN = 2,
-    SPNP_UPHORZ = 3,
-    SPNP_DOWNHORZ = 4,
-};
-
-#define SPINSTYLEPARTS SPINPARTS;
-
-enum UPSTATES {
-    UPS_NORMAL = 1,
-    UPS_HOT = 2,
-    UPS_PRESSED = 3,
-    UPS_DISABLED = 4,
-};
-
-enum DOWNSTATES {
-    DNS_NORMAL = 1,
-    DNS_HOT = 2,
-    DNS_PRESSED = 3,
-    DNS_DISABLED = 4,
-};
-
-enum UPHORZSTATES {
-    UPHZS_NORMAL = 1,
-    UPHZS_HOT = 2,
-    UPHZS_PRESSED = 3,
-    UPHZS_DISABLED = 4,
-};
-
-enum DOWNHORZSTATES {
-    DNHZS_NORMAL = 1,
-    DNHZS_HOT = 2,
-    DNHZS_PRESSED = 3,
-    DNHZS_DISABLED = 4,
-};
-
-/* STATUSSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_STATUSSTYLE (const WCHAR []){'S','T','A','T','U','S','S','T','Y','L','E',0}
-#define VSCLASS_STATUS (const WCHAR []){'S','T','A','T','U','S',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_STATUSSTYLE L"STATUSSTYLE"
-#define VSCLASS_STATUS L"STATUS"
-#else
-static const WCHAR VSCLASS_STATUSSTYLE [] = {'S','T','A','T','U','S','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_STATUS [] = {'S','T','A','T','U','S',0};
-#endif
-
-enum STATUSPARTS {
-    SP_PANE = 1,
-    SP_GRIPPERPANE = 2,
-    SP_GRIPPER = 3,
-};
-
-#define STATUSSTYLEPARTS STATUSPARTS;
-
-/* TABSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TABSTYLE (const WCHAR []){'T','A','B','S','T','Y','L','E',0}
-#define VSCLASS_TAB (const WCHAR []){'T','A','B',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TABSTYLE L"TABSTYLE"
-#define VSCLASS_TAB L"TAB"
-#else
-static const WCHAR VSCLASS_TABSTYLE [] = {'T','A','B','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_TAB [] = {'T','A','B',0};
-#endif
-
-enum TABPARTS {
-    TABP_TABITEM = 1,
-    TABP_TABITEMLEFTEDGE = 2,
-    TABP_TABITEMRIGHTEDGE = 3,
-    TABP_TABITEMBOTHEDGE = 4,
-    TABP_TOPTABITEM = 5,
-    TABP_TOPTABITEMLEFTEDGE = 6,
-    TABP_TOPTABITEMRIGHTEDGE = 7,
-    TABP_TOPTABITEMBOTHEDGE = 8,
-    TABP_PANE = 9,
-    TABP_BODY = 10,
-    TABP_AEROWIZARDBODY = 11,
-};
-
-#define TABSTYLEPARTS TABPARTS;
-
-enum TABITEMSTATES {
-    TIS_NORMAL = 1,
-    TIS_HOT = 2,
-    TIS_SELECTED = 3,
-    TIS_DISABLED = 4,
-    TIS_FOCUSED = 5,
-};
-
-enum TABITEMLEFTEDGESTATES {
-    TILES_NORMAL = 1,
-    TILES_HOT = 2,
-    TILES_SELECTED = 3,
-    TILES_DISABLED = 4,
-    TILES_FOCUSED = 5,
-};
-
-enum TABITEMRIGHTEDGESTATES {
-    TIRES_NORMAL = 1,
-    TIRES_HOT = 2,
-    TIRES_SELECTED = 3,
-    TIRES_DISABLED = 4,
-    TIRES_FOCUSED = 5,
-};
-
-enum TABITEMBOTHEDGESTATES {
-    TIBES_NORMAL = 1,
-    TIBES_HOT = 2,
-    TIBES_SELECTED = 3,
-    TIBES_DISABLED = 4,
-    TIBES_FOCUSED = 5,
-};
-
-enum TOPTABITEMSTATES {
-    TTIS_NORMAL = 1,
-    TTIS_HOT = 2,
-    TTIS_SELECTED = 3,
-    TTIS_DISABLED = 4,
-    TTIS_FOCUSED = 5,
-};
-
-enum TOPTABITEMLEFTEDGESTATES {
-    TTILES_NORMAL = 1,
-    TTILES_HOT = 2,
-    TTILES_SELECTED = 3,
-    TTILES_DISABLED = 4,
-    TTILES_FOCUSED = 5,
-};
-
-enum TOPTABITEMRIGHTEDGESTATES {
-    TTIRES_NORMAL = 1,
-    TTIRES_HOT = 2,
-    TTIRES_SELECTED = 3,
-    TTIRES_DISABLED = 4,
-    TTIRES_FOCUSED = 5,
-};
-
-enum TOPTABITEMBOTHEDGESTATES {
-    TTIBES_NORMAL = 1,
-    TTIBES_HOT = 2,
-    TTIBES_SELECTED = 3,
-    TTIBES_DISABLED = 4,
-    TTIBES_FOCUSED = 5,
-};
-
-/* TASKDIALOGSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TASKDIALOGSTYLE (const WCHAR []){'T','A','S','K','D','I','A','L','O','G','S','T','Y','L','E',0}
-#define VSCLASS_TASKDIALOG (const WCHAR []){'T','A','S','K','D','I','A','L','O','G',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TASKDIALOGSTYLE L"TASKDIALOGSTYLE"
-#define VSCLASS_TASKDIALOG L"TASKDIALOG"
-#else
-static const WCHAR VSCLASS_TASKDIALOGSTYLE[] = {'T','A','S','K','D','I','A','L','O','G','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_TASKDIALOG [] = {'T','A','S','K','D','I','A','L','O','G',0};
-#endif
-
-enum TASKDIALOGPARTS {
-    TDLG_PRIMARYPANEL = 1,
-    TDLG_MAININSTRUCTIONPANE = 2,
-    TDLG_MAINICON = 3,
-    TDLG_CONTENTPANE = 4,
-    TDLG_CONTENTICON = 5,
-    TDLG_EXPANDEDCONTENT = 6,
-    TDLG_COMMANDLINKPANE = 7,
-    TDLG_SECONDARYPANEL = 8,
-    TDLG_CONTROLPANE = 9,
-    TDLG_BUTTONSECTION = 10,
-    TDLG_BUTTONWRAPPER = 11,
-    TDLG_EXPANDOTEXT = 12,
-    TDLG_EXPANDOBUTTON = 13,
-    TDLG_VERIFICATIONTEXT = 14,
-    TDLG_FOOTNOTEPANE = 15,
-    TDLG_FOOTNOTEAREA = 16,
-    TDLG_FOOTNOTESEPARATOR = 17,
-    TDLG_EXPANDEDFOOTERAREA = 18,
-    TDLG_PROGRESSBAR = 19,
-    TDLG_IMAGEALIGNMENT = 20,
-    TDLG_RADIOBUTTONPANE = 21,
-};
-
-#define TASKDIALOGSTYLEPARTS TASKDIALOGPARTS;
-
-enum CONTENTPANESTATES {
-    TDLGCPS_STANDALONE = 1,
-};
-
-enum EXPANDOBUTTONSTATES {
-    TDLGEBS_NORMAL = 1,
-    TDLGEBS_HOVER = 2,
-    TDLGEBS_PRESSED = 3,
-    TDLGEBS_EXPANDEDNORMAL = 4,
-    TDLGEBS_EXPANDEDHOVER = 5,
-    TDLGEBS_EXPANDEDPRESSED = 6,
-};
-
-/* TEXTSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TEXTSTYLE (const WCHAR []){'T','E','X','T','S','T','Y','L','E',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TEXTSTYLE L"TEXTSTYLE"
-#else
-static const WCHAR VSCLASS_TEXTSTYLE [] = {'T','E','X','T','S','T','Y','L','E',0};
-#endif
-
-enum TEXTSTYLEPARTS {
-    TEXT_MAININSTRUCTION = 1,
-    TEXT_INSTRUCTION = 2,
-    TEXT_BODYTITLE = 3,
-    TEXT_BODYTEXT = 4,
-    TEXT_SECONDARYTEXT = 5,
-    TEXT_HYPERLINKTEXT = 6,
-    TEXT_EXPANDED = 7,
-    TEXT_LABEL = 8,
-    TEXT_CONTROLLABEL = 9,
-};
-
-enum HYPERLINKTEXTSTATES {
-    TS_HYPERLINK_NORMAL = 1,
-    TS_HYPERLINK_HOT = 2,
-    TS_HYPERLINK_PRESSED = 3,
-    TS_HYPERLINK_DISABLED = 4,
-};
-
-enum CONTROLLABELSTATES {
-    TS_CONTROLLABEL_NORMAL = 1,
-    TS_CONTROLLABEL_DISABLED = 2,
-};
-
-/* TOOLBARSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TOOLBARSTYLE (const WCHAR []){'T','O','O','L','B','A','R','S','T','Y','L','E',0}
-#define VSCLASS_TOOLBAR (const WCHAR []){'T','O','O','L','B','A','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TOOLBARSTYLE L"TOOLBARSTYLE"
-#define VSCLASS_TOOLBAR L"TOOLBAR"
-#else
-static const WCHAR VSCLASS_TOOLBARSTYLE [] = {'T','O','O','L','B','A','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_TOOLBAR[] = {'T','O','O','L','B','A','R',0};
-#endif
-
-enum TOOLBARPARTS {
-    TP_BUTTON = 1,
-    TP_DROPDOWNBUTTON = 2,
-    TP_SPLITBUTTON = 3,
-    TP_SPLITBUTTONDROPDOWN = 4,
-    TP_SEPARATOR = 5,
-    TP_SEPARATORVERT = 6,
-};
-
-#define TOOLBARSTYLEPARTS TOOLBARPARTS;
-
-enum TOOLBARSTYLESTATES {
-    TS_NORMAL = 1,
-    TS_HOT = 2,
-    TS_PRESSED = 3,
-    TS_DISABLED = 4,
-    TS_CHECKED = 5,
-    TS_HOTCHECKED = 6,
-    TS_NEARHOT = 7,
-    TS_OTHERSIDEHOT = 8,
-};
-
-/* TOOLTIPSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TOOLTIPSTYLE (const WCHAR []){'T','O','O','L','T','I','P','S','T','Y','L','E',0}
-#define VSCLASS_TOOLTIP (const WCHAR []){'T','O','O','L','T','I','P',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TOOLTIPSTYLE L"TOOLTIPSTYLE"
-#define VSCLASS_TOOLTIP L"TOOLTIP"
-#else
-static const WCHAR VSCLASS_TOOLTIPSTYLE [] = {'T','O','O','L','T','I','P','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_TOOLTIP[] = {'T','O','O','L','T','I','P',0};
-#endif
-
-enum TOOLTIPPARTS {
-    TTP_STANDARD = 1,
-    TTP_STANDARDTITLE = 2,
-    TTP_BALLOON = 3,
-    TTP_BALLOONTITLE = 4,
-    TTP_CLOSE = 5,
-    TTP_BALLOONSTEM = 6,
-};
-
-#define TOOLTIPSTYLEPARTS TOOLTIPPARTS;
-
-enum CLOSESTATES {
-    TTCS_NORMAL = 1,
-    TTCS_HOT = 2,
-    TTCS_PRESSED = 3,
-};
-
-enum STANDARDSTATES {
-    TTSS_NORMAL = 1,
-    TTSS_LINK = 2,
-};
-
-enum BALLOONSTATES {
-    TTBS_NORMAL = 1,
-    TTBS_LINK = 2,
-};
-
-enum BALLOONSTEMSTATES {
-    TTBSS_POINTINGUPLEFTWALL = 1,
-    TTBSS_POINTINGUPCENTERED = 2,
-    TTBSS_POINTINGUPRIGHTWALL = 3,
-    TTBSS_POINTINGDOWNRIGHTWALL = 4,
-    TTBSS_POINTINGDOWNCENTERED = 5,
-    TTBSS_POINTINGDOWNLEFTWALL = 6,
-};
-
-/* TRACKBARSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TRACKBARSTYLE (const WCHAR []){'T','R','A','C','K','B','A','R','S','T','Y','L','E',0}
-#define VSCLASS_TRACKBAR (const WCHAR []){'T','R','A','C','K','B','A','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TRACKBARSTYLE L"TRACKBARSTYLE"
-#define VSCLASS_TRACKBAR L"TRACKBAR"
-#else
-static const WCHAR VSCLASS_TRACKBARSTYLE [] = {'T','R','A','C','K','B','A','R','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_TRACKBAR [] = {'T','R','A','C','K','B','A','R',0};
-#endif
-
-enum TRACKBARPARTS {
-    TKP_TRACK = 1,
-    TKP_TRACKVERT = 2,
-    TKP_THUMB = 3,
-    TKP_THUMBBOTTOM = 4,
-    TKP_THUMBTOP = 5,
-    TKP_THUMBVERT = 6,
-    TKP_THUMBLEFT = 7,
-    TKP_THUMBRIGHT = 8,
-    TKP_TICS = 9,
-    TKP_TICSVERT = 10,
-};
-
-#define TRACKBARSTYLEPARTS TRACKBARPARTS;
-
-enum TRACKBARSTYLESTATES {
-    TKS_NORMAL = 1,
-};
-
-enum TRACKSTATES {
-    TRS_NORMAL = 1,
-};
-
-enum TRACKVERTSTATES {
-    TRVS_NORMAL = 1,
-};
-
-enum THUMBSTATES {
-    TUS_NORMAL = 1,
-    TUS_HOT = 2,
-    TUS_PRESSED = 3,
-    TUS_FOCUSED = 4,
-    TUS_DISABLED = 5,
-};
-
-enum THUMBBOTTOMSTATES {
-    TUBS_NORMAL = 1,
-    TUBS_HOT = 2,
-    TUBS_PRESSED = 3,
-    TUBS_FOCUSED = 4,
-    TUBS_DISABLED = 5,
-};
-
-enum THUMBTOPSTATES {
-    TUTS_NORMAL = 1,
-    TUTS_HOT = 2,
-    TUTS_PRESSED = 3,
-    TUTS_FOCUSED = 4,
-    TUTS_DISABLED = 5,
-};
-
-enum THUMBVERTSTATES {
-    TUVS_NORMAL = 1,
-    TUVS_HOT = 2,
-    TUVS_PRESSED = 3,
-    TUVS_FOCUSED = 4,
-    TUVS_DISABLED = 5,
-};
-
-enum THUMBLEFTSTATES {
-    TUVLS_NORMAL = 1,
-    TUVLS_HOT = 2,
-    TUVLS_PRESSED = 3,
-    TUVLS_FOCUSED = 4,
-    TUVLS_DISABLED = 5,
-};
-
-enum THUMBRIGHTSTATES {
-    TUVRS_NORMAL = 1,
-    TUVRS_HOT = 2,
-    TUVRS_PRESSED = 3,
-    TUVRS_FOCUSED = 4,
-    TUVRS_DISABLED = 5,
-};
-
-enum TICSSTATES {
-    TSS_NORMAL = 1,
-};
-
-enum TICSVERTSTATES {
-    TSVS_NORMAL = 1,
-};
-
-/* TREEVIEWSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_TREEVIEWSTYLE (const WCHAR []){'T','R','E','E','V','I','E','W','S','T','Y','L','E',0}
-#define VSCLASS_TREEVIEW (const WCHAR []){'T','R','E','E','V','I','E','W',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TREEVIEWSTYLE L"TREEVIEWSTYLE"
-#define VSCLASS_TREEVIEW L"TREEVIEW"
-#else
-static const WCHAR VSCLASS_TREEVIEWSTYLE [] = {'T','R','E','E','V','I','E','W','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_TREEVIEW [] = {'T','R','E','E','V','I','E','W',0};
-#endif
-
-enum TREEVIEWPARTS {
-    TVP_TREEITEM = 1,
-    TVP_GLYPH = 2,
-    TVP_BRANCH = 3,
-    TVP_HOTGLYPH = 4,
-};
-
-#define TREEVIEWSTYLEPARTS TREEVIEWPARTS;
-
-enum TREEITEMSTATES {
-    TREIS_NORMAL = 1,
-    TREIS_HOT = 2,
-    TREIS_SELECTED = 3,
-    TREIS_DISABLED = 4,
-    TREIS_SELECTEDNOTFOCUS = 5,
-    TREIS_HOTSELECTED = 6,
-};
-
-enum GLYPHSTATES {
-    GLPS_CLOSED = 1,
-    GLPS_OPENED = 2,
-};
-
-enum HOTGLYPHSTATES {
-    HGLPS_CLOSED = 1,
-    HGLPS_OPENED = 2,
-};
-
-/* WINDOWSTYLE class */
-#if defined(__GNUC__)
-#define VSCLASS_WINDOWSTYLE (const WCHAR []){'W','I','N','D','O','W','S','T','Y','L','E',0}
-#define VSCLASS_WINDOW (const WCHAR []){'W','I','N','D','O','W',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_WINDOWSTYLE L"WINDOWSTYLE"
-#define VSCLASS_WINDOW L"WINDOW"
-#else
-static const WCHAR VSCLASS_WINDOWSTYLE [] = {'W','I','N','D','O','W','S','T','Y','L','E',0};
-static const WCHAR VSCLASS_WINDOW [] = {'W','I','N','D','O','W',0};
-#endif
-
-enum WINDOWPARTS {
-    WP_CAPTION = 1,
-    WP_SMALLCAPTION = 2,
-    WP_MINCAPTION = 3,
-    WP_SMALLMINCAPTION = 4,
-    WP_MAXCAPTION = 5,
-    WP_SMALLMAXCAPTION = 6,
-    WP_FRAMELEFT = 7,
-    WP_FRAMERIGHT = 8,
-    WP_FRAMEBOTTOM = 9,
-    WP_SMALLFRAMELEFT = 10,
-    WP_SMALLFRAMERIGHT = 11,
-    WP_SMALLFRAMEBOTTOM = 12,
-    WP_SYSBUTTON = 13,
-    WP_MDISYSBUTTON = 14,
-    WP_MINBUTTON = 15,
-    WP_MDIMINBUTTON = 16,
-    WP_MAXBUTTON = 17,
-    WP_CLOSEBUTTON = 18,
-    WP_SMALLCLOSEBUTTON = 19,
-    WP_MDICLOSEBUTTON = 20,
-    WP_RESTOREBUTTON = 21,
-    WP_MDIRESTOREBUTTON = 22,
-    WP_HELPBUTTON = 23,
-    WP_MDIHELPBUTTON = 24,
-    WP_HORZSCROLL = 25,
-    WP_HORZTHUMB = 26,
-    WP_VERTSCROLL = 27,
-    WP_VERTTHUMB = 28,
-    WP_DIALOG = 29,
-    WP_CAPTIONSIZINGTEMPLATE = 30,
-    WP_SMALLCAPTIONSIZINGTEMPLATE = 31,
-    WP_FRAMELEFTSIZINGTEMPLATE = 32,
-    WP_SMALLFRAMELEFTSIZINGTEMPLATE = 33,
-    WP_FRAMERIGHTSIZINGTEMPLATE = 34,
-    WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,
-    WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,
-    WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37,
-    WP_FRAME = 38,
-};
-
-#define WINDOWSTYLEPARTS WINDOWPARTS;
-
-enum FRAMESTATES {
-    FS_ACTIVE = 1,
-    FS_INACTIVE = 2,
-};
-
-enum CAPTIONSTATES {
-    CS_ACTIVE = 1,
-    CS_INACTIVE = 2,
-    CS_DISABLED = 3,
-};
-
-enum MAXCAPTIONSTATES {
-    MXCS_ACTIVE = 1,
-    MXCS_INACTIVE = 2,
-    MXCS_DISABLED = 3,
-};
-
-enum MINCAPTIONSTATES {
-    MNCS_ACTIVE = 1,
-    MNCS_INACTIVE = 2,
-    MNCS_DISABLED = 3,
-};
-
-enum HORZSCROLLSTATES {
-    HSS_NORMAL = 1,
-    HSS_HOT = 2,
-    HSS_PUSHED = 3,
-    HSS_DISABLED = 4,
-};
-
-enum HORZTHUMBSTATES {
-    HTS_NORMAL = 1,
-    HTS_HOT = 2,
-    HTS_PUSHED = 3,
-    HTS_DISABLED = 4,
-};
-
-enum VERTSCROLLSTATES {
-    VSS_NORMAL = 1,
-    VSS_HOT = 2,
-    VSS_PUSHED = 3,
-    VSS_DISABLED = 4,
-};
-
-enum VERTTHUMBSTATES {
-    VTS_NORMAL = 1,
-    VTS_HOT = 2,
-    VTS_PUSHED = 3,
-    VTS_DISABLED = 4,
-};
-
-enum SYSBUTTONSTATES {
-    SBS_NORMAL = 1,
-    SBS_HOT = 2,
-    SBS_PUSHED = 3,
-    SBS_DISABLED = 4,
-};
-
-enum MINBUTTONSTATES {
-    MINBS_NORMAL = 1,
-    MINBS_HOT = 2,
-    MINBS_PUSHED = 3,
-    MINBS_DISABLED = 4,
-};
-
-enum RESTOREBUTTONSTATES {
-    RBS_NORMAL = 1,
-    RBS_HOT = 2,
-    RBS_PUSHED = 3,
-    RBS_DISABLED = 4,
-};
-
-enum HELPBUTTONSTATES {
-    HBS_NORMAL = 1,
-    HBS_HOT = 2,
-    HBS_PUSHED = 3,
-    HBS_DISABLED = 4,
-};
-
-enum CLOSEBUTTONSTATES {
-    CBS_NORMAL = 1,
-    CBS_HOT = 2,
-    CBS_PUSHED = 3,
-    CBS_DISABLED = 4,
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __VSSTYLE_H__ */
diff --git a/external/wine/include/vssym32.h b/external/wine/include/vssym32.h
deleted file mode 100644
index c58be0b..0000000
--- a/external/wine/include/vssym32.h
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * Copyright (C) 2011 Piotr Caban for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __VSSYM32_H__
-#define __VSSYM32_H__
-
-#include "vsstyle.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum BGTYPE {
-    BT_IMAGEFILE = 0,
-    BT_BORDERFILL = 1,
-    BT_NONE = 2,
-};
-
-enum IMAGELAYOUT {
-    IL_VERTICAL = 0,
-    IL_HORIZONTAL = 1,
-};
-
-enum BORDERTYPE {
-    BT_RECT = 0,
-    BT_ROUNDRECT = 1,
-    BT_ELLIPSE = 2,
-};
-
-enum FILLTYPE {
-    FT_SOLID = 0,
-    FT_VERTGRADIENT = 1,
-    FT_HORZGRADIENT = 2,
-    FT_RADIALGRADIENT = 3,
-    FT_TILEIMAGE = 4,
-};
-
-enum SIZINGTYPE {
-    ST_TRUESIZE = 0,
-    ST_STRETCH = 1,
-    ST_TILE = 2,
-};
-
-enum HALIGN {
-    HA_LEFT = 0,
-    HA_CENTER = 1,
-    HA_RIGHT = 2,
-};
-
-enum CONTENTALIGNMENT {
-    CA_LEFT = 0,
-    CA_CENTER = 1,
-    CA_RIGHT = 2,
-};
-
-enum VALIGN {
-    VA_TOP = 0,
-    VA_CENTER = 1,
-    VA_BOTTOM = 2,
-};
-
-enum OFFSETTYPE {
-    OT_TOPLEFT = 0,
-    OT_TOPRIGHT = 1,
-    OT_TOPMIDDLE = 2,
-    OT_BOTTOMLEFT = 3,
-    OT_BOTTOMRIGHT = 4,
-    OT_BOTTOMMIDDLE = 5,
-    OT_MIDDLELEFT = 6,
-    OT_MIDDLERIGHT = 7,
-    OT_LEFTOFCAPTION = 8,
-    OT_RIGHTOFCAPTION = 9,
-    OT_LEFTOFLASTBUTTON = 10,
-    OT_RIGHTOFLASTBUTTON = 11,
-    OT_ABOVELASTBUTTON = 12,
-    OT_BELOWLASTBUTTON = 13,
-};
-
-enum ICONEFFECT {
-    ICE_NONE = 0,
-    ICE_GLOW = 1,
-    ICE_SHADOW = 2,
-    ICE_PULSE = 3,
-    ICE_ALPHA = 4,
-};
-
-enum TEXTSHADOWTYPE {
-    TST_NONE = 0,
-    TST_SINGLE = 1,
-    TST_CONTINUOUS = 2,
-};
-
-enum GLYPHTYPE {
-    GT_NONE = 0,
-    GT_IMAGEGLYPH = 1,
-    GT_FONTGLYPH = 2,
-};
-
-enum IMAGESELECTTYPE {
-    IST_NONE = 0,
-    IST_SIZE = 1,
-    IST_DPI = 2,
-};
-
-enum TRUESIZESCALINGTYPE {
-    TSST_NONE = 0,
-    TSST_SIZE = 1,
-    TSST_DPI = 2,
-};
-
-enum GLYPHFONTSIZINGTYPE {
-    GFST_NONE = 0,
-    GFST_SIZE = 1,
-    GFST_DPI = 2,
-};
-
-#define TMT_RESERVEDLOW 0
-#define TMT_RESERVEDHIGH 7999
-
-#define TMT_DIBDATA 2
-#define TMT_GLYPHDIBDATA 8
-#define TMT_ENUM 200
-#define TMT_STRING 201
-#define TMT_INT 202
-#define TMT_BOOL 203
-#define TMT_COLOR 204
-#define TMT_MARGINS 205
-#define TMT_FILENAME 206
-#define TMT_SIZE 207
-#define TMT_POSITION 208
-#define TMT_RECT 209
-#define TMT_FONT 210
-#define TMT_INTLIST 211
-#define TMT_HBITMAP 212
-#define TMT_DISKSTREAM 213
-#define TMT_STREAM 214
-#define TMT_BITMAPREF 215
-#define TMT_COLORSCHEMES 401
-#define TMT_SIZES 402
-#define TMT_CHARSET 403
-#define TMT_NAME 600
-#define TMT_DISPLAYNAME 601
-#define TMT_TOOLTIP 602
-#define TMT_COMPANY 603
-#define TMT_AUTHOR 604
-#define TMT_COPYRIGHT 605
-#define TMT_URL 606
-#define TMT_VERSION 607
-#define TMT_DESCRIPTION 608
-#define TMT_FIRST_RCSTRING_NAME TMT_DISPLAYNAME
-#define TMT_LAST_RCSTRING_NAME TMT_DESCRIPTION
-#define TMT_CAPTIONFONT 801
-#define TMT_SMALLCAPTIONFONT 802
-#define TMT_MENUFONT 803
-#define TMT_STATUSFONT 804
-#define TMT_MSGBOXFONT 805
-#define TMT_ICONTITLEFONT 806
-#define TMT_HEADING1FONT 807
-#define TMT_HEADING2FONT 808
-#define TMT_BODYFONT 809
-#define TMT_FIRSTFONT TMT_CAPTIONFONT
-#define TMT_LASTFONT TMT_BODYFONT
-#define TMT_FLATMENUS 1001
-#define TMT_FIRSTBOOL TMT_FLATMENUS
-#define TMT_LASTBOOL TMT_FLATMENUS
-#define TMT_SIZINGBORDERWIDTH 1201
-#define TMT_SCROLLBARWIDTH 1202
-#define TMT_SCROLLBARHEIGHT 1203
-#define TMT_CAPTIONBARWIDTH 1204
-#define TMT_CAPTIONBARHEIGHT 1205
-#define TMT_SMCAPTIONBARWIDTH 1206
-#define TMT_SMCAPTIONBARHEIGHT 1207
-#define TMT_MENUBARWIDTH 1208
-#define TMT_MENUBARHEIGHT 1209
-#define TMT_PADDEDBORDERWIDTH 1210
-#define TMT_FIRSTSIZE TMT_SIZINGBORDERWIDTH
-#define TMT_LASTSIZE TMT_PADDEDBORDERWIDTH
-#define TMT_MINCOLORDEPTH 1301
-#define TMT_FIRSTINT TMT_MINCOLORDEPTH
-#define TMT_LASTINT TMT_MINCOLORDEPTH
-#define TMT_CSSNAME 1401
-#define TMT_XMLNAME 1402
-#define TMT_LASTUPDATED 1403
-#define TMT_ALIAS 1404
-#define TMT_FIRSTSTRING TMT_CSSNAME
-#define TMT_LASTSTRING TMT_ALIAS
-#define TMT_SCROLLBAR 1601
-#define TMT_BACKGROUND 1602
-#define TMT_ACTIVECAPTION 1603
-#define TMT_INACTIVECAPTION 1604
-#define TMT_MENU 1605
-#define TMT_WINDOW 1606
-#define TMT_WINDOWFRAME 1607
-#define TMT_MENUTEXT 1608
-#define TMT_WINDOWTEXT 1609
-#define TMT_CAPTIONTEXT 1610
-#define TMT_ACTIVEBORDER 1611
-#define TMT_INACTIVEBORDER 1612
-#define TMT_APPWORKSPACE 1613
-#define TMT_HIGHLIGHT 1614
-#define TMT_HIGHLIGHTTEXT 1615
-#define TMT_BTNFACE 1616
-#define TMT_BTNSHADOW 1617
-#define TMT_GRAYTEXT 1618
-#define TMT_BTNTEXT 1619
-#define TMT_INACTIVECAPTIONTEXT 1620
-#define TMT_BTNHIGHLIGHT 1621
-#define TMT_DKSHADOW3D 1622
-#define TMT_LIGHT3D 1623
-#define TMT_INFOTEXT 1624
-#define TMT_INFOBK 1625
-#define TMT_BUTTONALTERNATEFACE 1626
-#define TMT_HOTTRACKING 1627
-#define TMT_GRADIENTACTIVECAPTION 1628
-#define TMT_GRADIENTINACTIVECAPTION 1629
-#define TMT_MENUHILIGHT 1630
-#define TMT_MENUBAR 1631
-#define TMT_FIRSTCOLOR TMT_SCROLLBAR
-#define TMT_LASTCOLOR TMT_MENUBAR
-#define TMT_FROMHUE1 1801
-#define TMT_FROMHUE2 1802
-#define TMT_FROMHUE3 1803
-#define TMT_FROMHUE4 1804
-#define TMT_FROMHUE5 1805
-#define TMT_TOHUE1 1806
-#define TMT_TOHUE2 1807
-#define TMT_TOHUE3 1808
-#define TMT_TOHUE4 1809
-#define TMT_TOHUE5 1810
-#define TMT_FROMCOLOR1 2001
-#define TMT_FROMCOLOR2 2002
-#define TMT_FROMCOLOR3 2003
-#define TMT_FROMCOLOR4 2004
-#define TMT_FROMCOLOR5 2005
-#define TMT_TOCOLOR1 2006
-#define TMT_TOCOLOR2 2007
-#define TMT_TOCOLOR3 2008
-#define TMT_TOCOLOR4 2009
-#define TMT_TOCOLOR5 2010
-#define TMT_TRANSPARENT 2201
-#define TMT_AUTOSIZE 2202
-#define TMT_BORDERONLY 2203
-#define TMT_COMPOSITED 2204
-#define TMT_BGFILL 2205
-#define TMT_GLYPHTRANSPARENT 2206
-#define TMT_GLYPHONLY 2207
-#define TMT_ALWAYSSHOWSIZINGBAR 2208
-#define TMT_MIRRORIMAGE 2209
-#define TMT_UNIFORMSIZING 2210
-#define TMT_INTEGRALSIZING 2211
-#define TMT_SOURCEGROW 2212
-#define TMT_SOURCESHRINK 2213
-#define TMT_DRAWBORDERS 2214
-#define TMT_NOETCHEDEFFECT 2215
-#define TMT_TEXTAPPLYOVERLAY 2216
-#define TMT_TEXTGLOW 2217
-#define TMT_TEXTITALIC 2218
-#define TMT_COMPOSITEDOPAQUE 2219
-#define TMT_LOCALIZEDMIRRORIMAGE 2220
-#define TMT_IMAGECOUNT 2401
-#define TMT_ALPHALEVEL 2402
-#define TMT_BORDERSIZE 2403
-#define TMT_ROUNDCORNERWIDTH 2404
-#define TMT_ROUNDCORNERHEIGHT 2405
-#define TMT_GRADIENTRATIO1 2406
-#define TMT_GRADIENTRATIO2 2407
-#define TMT_GRADIENTRATIO3 2408
-#define TMT_GRADIENTRATIO4 2409
-#define TMT_GRADIENTRATIO5 2410
-#define TMT_PROGRESSCHUNKSIZE 2411
-#define TMT_PROGRESSSPACESIZE 2412
-#define TMT_SATURATION 2413
-#define TMT_TEXTBORDERSIZE 2414
-#define TMT_ALPHATHRESHOLD 2415
-#define TMT_WIDTH 2416
-#define TMT_HEIGHT 2417
-#define TMT_GLYPHINDEX 2418
-#define TMT_TRUESIZESTRETCHMARK 2419
-#define TMT_MINDPI1 2420
-#define TMT_MINDPI2 2421
-#define TMT_MINDPI3 2422
-#define TMT_MINDPI4 2423
-#define TMT_MINDPI5 2424
-#define TMT_TEXTGLOWSIZE 2425
-#define TMT_FRAMESPERSECOND 2426
-#define TMT_PIXELSPERFRAME 2427
-#define TMT_ANIMATIONDELAY 2428
-#define TMT_GLOWINTENSITY 2429
-#define TMT_OPACITY 2430
-#define TMT_COLORIZATIONCOLOR 2431
-#define TMT_COLORIZATIONOPACITY 2432
-#define TMT_GLYPHFONT 2601
-#define TMT_IMAGEFILE 3001
-#define TMT_IMAGEFILE1 3002
-#define TMT_IMAGEFILE2 3003
-#define TMT_IMAGEFILE3 3004
-#define TMT_IMAGEFILE4 3005
-#define TMT_IMAGEFILE5 3006
-#define TMT_GLYPHIMAGEFILE 3008
-#define TMT_TEXT 3201
-#define TMT_CLASSICVALUE 3202
-#define TMT_OFFSET 3401
-#define TMT_TEXTSHADOWOFFSET 3402
-#define TMT_MINSIZE 3403
-#define TMT_MINSIZE1 3404
-#define TMT_MINSIZE2 3405
-#define TMT_MINSIZE3 3406
-#define TMT_MINSIZE4 3407
-#define TMT_MINSIZE5 3408
-#define TMT_NORMALSIZE 3409
-#define TMT_SIZINGMARGINS 3601
-#define TMT_CONTENTMARGINS 3602
-#define TMT_CAPTIONMARGINS 3603
-#define TMT_BORDERCOLOR 3801
-#define TMT_FILLCOLOR 3802
-#define TMT_TEXTCOLOR 3803
-#define TMT_EDGELIGHTCOLOR 3804
-#define TMT_EDGEHIGHLIGHTCOLOR 3805
-#define TMT_EDGESHADOWCOLOR 3806
-#define TMT_EDGEDKSHADOWCOLOR 3807
-#define TMT_EDGEFILLCOLOR 3808
-#define TMT_TRANSPARENTCOLOR 3809
-#define TMT_GRADIENTCOLOR1 3810
-#define TMT_GRADIENTCOLOR2 3811
-#define TMT_GRADIENTCOLOR3 3812
-#define TMT_GRADIENTCOLOR4 3813
-#define TMT_GRADIENTCOLOR5 3814
-#define TMT_SHADOWCOLOR 3815
-#define TMT_GLOWCOLOR 3816
-#define TMT_TEXTBORDERCOLOR 3817
-#define TMT_TEXTSHADOWCOLOR 3818
-#define TMT_GLYPHTEXTCOLOR 3819
-#define TMT_GLYPHTRANSPARENTCOLOR 3820
-#define TMT_FILLCOLORHINT 3821
-#define TMT_BORDERCOLORHINT 3822
-#define TMT_ACCENTCOLORHINT 3823
-#define TMT_TEXTCOLORHINT 3824
-#define TMT_HEADING1TEXTCOLOR 3825
-#define TMT_HEADING2TEXTCOLOR 3826
-#define TMT_BODYTEXTCOLOR 3827
-#define TMT_BGTYPE 4001
-#define TMT_BORDERTYPE 4002
-#define TMT_FILLTYPE 4003
-#define TMT_SIZINGTYPE 4004
-#define TMT_HALIGN 4005
-#define TMT_CONTENTALIGNMENT 4006
-#define TMT_VALIGN 4007
-#define TMT_OFFSETTYPE 4008
-#define TMT_ICONEFFECT 4009
-#define TMT_TEXTSHADOWTYPE 4010
-#define TMT_IMAGELAYOUT 4011
-#define TMT_GLYPHTYPE 4012
-#define TMT_IMAGESELECTTYPE 4013
-#define TMT_GLYPHFONTSIZINGTYPE 4014
-#define TMT_TRUESIZESCALINGTYPE 4015
-#define TMT_USERPICTURE 5001
-#define TMT_DEFAULTPANESIZE 5002
-#define TMT_BLENDCOLOR 5003
-#define TMT_CUSTOMSPLITRECT 5004
-#define TMT_ANIMATIONBUTTONRECT 5005
-#define TMT_ANIMATIONDURATION 5006
-#define TMT_TRANSITIONDURATIONS 6000
-#define TMT_SCALEDBACKGROUND 7001
-#define TMT_ATLASIMAGE 8000
-#define TMT_ATLASINPUTIMAGE 8001
-#define TMT_ATLASRECT 8002
-
-/* LINK class */
-#if defined(__GNUC__)
-#define VSCLASS_LINK (const WCHAR []){'L','I','N','K',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_LINK L"LINK"
-#else
-static const WCHAR VSCLASS_LINK[] = {'L','I','N','K',0};
-#endif
-
-enum LINKPARTS {
-    LP_HYPERLINK = 1,
-};
-
-enum HYPERLINKSTATES {
-    HLS_NORMALTEXT = 1,
-    HLS_LINKTEXT = 2,
-};
-
-/* EMPTYMARKUP class */
-#if defined(__GNUC__)
-#define VSCLASS_EMPTYMARKUP (const WCHAR []){'E','M','P','T','Y','M','A','R','K','U','P',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_EMPTYMARKUP L"EMPTYMARKUP"
-#else
-static const WCHAR VSCLASS_EMPTYMARKUP[] = {'E','M','P','T','Y','M','A','R','K','U','P',0};
-#endif
-
-enum EMPTYMARKUPPARTS {
-    EMP_MARKUPTEXT = 1,
-};
-
-enum MARKUPTEXTSTATES {
-    EMT_NORMALTEXT = 1,
-    EMT_LINKTEXT = 2,
-};
-
-/* STATIC class */
-#if defined(__GNUC__)
-#define VSCLASS_STATIC (const WCHAR []){'S','T','A','T','I','C',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_STATIC L"STATIC"
-#else
-static const WCHAR VSCLASS_STATIC[] = {'S','T','A','T','I','C',0};
-#endif
-
-enum STATICPARTS {
-    STAT_TEXT = 1,
-};
-
-/* PAGE class */
-#if defined(__GNUC__)
-#define VSCLASS_PAGE (const WCHAR []){'P','A','G','E',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_PAGE L"PAGE"
-#else
-static const WCHAR VSCLASS_PAGE[] = {'P','A','G','E',0};
-#endif
-
-enum PAGEPARTS {
-    PGRP_UP = 1,
-    PGRP_DOWN = 2,
-    PGRP_UPHORZ = 3,
-    PGRP_DOWNHORZ = 4,
-};
-
-/* MONTHCAL class */
-#if defined(__GNUC__)
-#define VSCLASS_MONTHCAL (const WCHAR []){'M','O','N','T','H','C','A','L',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_MONTHCAL L"MONTHCAL"
-#else
-static const WCHAR VSCLASS_MONTHCAL[] = {'M','O','N','T','H','C','A','L',0};
-#endif
-
-enum MONTHCALPARTS {
-    MC_BACKGROUND = 1,
-    MC_BORDERS = 2,
-    MC_GRIDBACKGROUND = 3,
-    MC_COLHEADERSPLITTER = 4,
-    MC_GRIDCELLBACKGROUND = 5,
-    MC_GRIDCELL = 6,
-    MC_GRIDCELLUPPER = 7,
-    MC_TRAILINGGRIDCELL = 8,
-    MC_TRAILINGGRIDCELLUPPER = 9,
-    MC_NAVNEXT = 10,
-    MC_NAVPREV = 11,
-};
-
-enum GRIDCELLBACKGROUNDSTATES {
-    MCGCB_SELECTED = 1,
-    MCGCB_HOT = 2,
-    MCGCB_SELECTEDHOT = 3,
-    MCGCB_SELECTEDNOTFOCUSED = 4,
-    MCGCB_TODAY = 5,
-};
-
-enum GRIDCELLSTATES {
-    MCGC_HOT = 1,
-    MCGC_HASSTATE = 2,
-    MCGC_HASSTATEHOT = 3,
-    MCGC_TODAY = 4,
-};
-
-enum GRIDCELLUPPERSTATES {
-    MCGCU_HOT = 1,
-    MCGCU_HASSTATE = 2,
-    MCGCU_HASSTATEHOT = 3,
-};
-
-enum TRAILINGGRIDCELLSTATES {
-    MCTGC_HOT = 1,
-    MCTGC_HASSTATE = 2,
-    MCTGC_HASSTATEHOT = 3,
-    MCTGC_TODAY = 4,
-};
-
-enum TRAILINGGRIDCELLUPPERSTATES {
-    MCTGCU_HOT = 1,
-    MCTGCU_HASSTATE = 2,
-    MCTGCU_HASSTATEHOT = 3,
-};
-
-enum NAVNEXTSTATES {
-    MCNN_NORMAL = 1,
-    MCNN_HOT = 2,
-    MCNN_PRESSED = 3,
-    MCNN_DISABLED = 4,
-};
-
-enum NAVPREVSTATES {
-    MCNP_NORMAL = 1,
-    MCNP_HOT = 2,
-    MCNP_PRESSED = 3,
-    MCNP_DISABLED = 4,
-};
-
-/* CLOCK class */
-#if defined(__GNUC__)
-#define VSCLASS_CLOCK (const WCHAR []){'C','L','O','C','K',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_CLOCK L"CLOCK"
-#else
-static const WCHAR VSCLASS_CLOCK[] = {'C','L','O','C','K',0};
-#endif
-
-enum CLOCKPARTS {
-    CLP_TIME = 1,
-};
-
-enum CLOCKSTATES {
-    CLS_NORMAL = 1,
-};
-
-/* TRAYNOTIFY class */
-#if defined(__GNUC__)
-#define VSCLASS_TRAYNOTIFY (const WCHAR []){'T','R','A','Y','N','O','T','I','F','Y',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TRAYNOTIFY L"TRAYNOTIFY"
-#else
-static const WCHAR VSCLASS_TRAYNOTIFY[] = {'T','R','A','Y','N','O','T','I','F','Y',0};
-#endif
-
-enum TRAYNOTIFYPARTS {
-    TNP_BACKGROUND = 1,
-    TNP_ANIMBACKGROUND = 2,
-};
-
-/* TASKBAR class */
-#if defined(__GNUC__)
-#define VSCLASS_TASKBAR (const WCHAR []){'T','A','S','K','B','A','R',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TASKBAR L"TASKBAR"
-#else
-static const WCHAR VSCLASS_TASKBAR[] = {'T','A','S','K','B','A','R',0};
-#endif
-
-enum TASKBARPARTS {
-    TBP_BACKGROUNDBOTTOM = 1,
-    TBP_BACKGROUNDRIGHT = 2,
-    TBP_BACKGROUNDTOP = 3,
-    TBP_BACKGROUNDLEFT = 4,
-    TBP_SIZINGBARBOTTOM = 5,
-    TBP_SIZINGBARRIGHT = 6,
-    TBP_SIZINGBARTOP = 7,
-    TBP_SIZINGBARLEFT = 8,
-};
-
-/* TASKBAND class */
-#if defined(__GNUC__)
-#define VSCLASS_TASKBAND (const WCHAR []){'T','A','S','K','B','A','N','D',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_TASKBAND L"TASKBAND"
-#else
-static const WCHAR VSCLASS_TASKBAND[] = {'T','A','S','K','B','A','N','D',0};
-#endif
-
-enum TASKBANDPARTS {
-    TDP_GROUPCOUNT = 1,
-    TDP_FLASHBUTTON = 2,
-    TDP_FLASHBUTTONGROUPMENU = 3,
-};
-
-/* STARTPANEL class */
-#if defined(__GNUC__)
-#define VSCLASS_STARTPANEL (const WCHAR []){'S','T','A','R','T','P','A','N','E','L',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_STARTPANEL L"STARTPANEL"
-#else
-static const WCHAR VSCLASS_STARTPANEL[] = {'S','T','A','R','T','P','A','N','E','L',0};
-#endif
-
-enum STARTPANELPARTS {
-    SPP_USERPANE = 1,
-    SPP_MOREPROGRAMS = 2,
-    SPP_MOREPROGRAMSARROW = 3,
-    SPP_PROGLIST = 4,
-    SPP_PROGLISTSEPARATOR = 5,
-    SPP_PLACESLIST = 6,
-    SPP_PLACESLISTSEPARATOR = 7,
-    SPP_LOGOFF = 8,
-    SPP_LOGOFFBUTTONS = 9,
-    SPP_USERPICTURE = 10,
-    SPP_PREVIEW = 11,
-    SPP_MOREPROGRAMSTAB = 12,
-    SPP_NSCHOST = 13,
-    SPP_SOFTWAREEXPLORER = 14,
-    SPP_OPENBOX = 15,
-    SPP_SEARCHVIEW = 16,
-    SPP_MOREPROGRAMSARROWBACK = 17,
-    SPP_TOPMATCH = 18,
-    SPP_LOGOFFSPLITBUTTONDROPDOWN = 19,
-};
-
-enum MOREPROGRAMSTABSTATES {
-    SPMPT_NORMAL = 1,
-    SPMPT_HOT = 2,
-    SPMPT_SELECTED = 3,
-    SPMPT_DISABLED = 4,
-    SPMPT_FOCUSED = 5,
-};
-
-enum SOFTWAREEXPLORERSTATES {
-    SPSE_NORMAL = 1,
-    SPSE_HOT = 2,
-    SPSE_SELECTED = 3,
-    SPSE_DISABLED = 4,
-    SPSE_FOCUSED = 5,
-};
-
-enum OPENBOXSTATES {
-    SPOB_NORMAL = 1,
-    SPOB_HOT = 2,
-    SPOB_SELECTED = 3,
-    SPOB_DISABLED = 4,
-    SPOB_FOCUSED = 5,
-};
-
-enum MOREPROGRAMSARROWSTATES {
-    SPS_NORMAL = 1,
-    SPS_HOT = 2,
-    SPS_PRESSED = 3,
-};
-
-enum MOREPROGRAMSARROWBACKSTATES {
-    SPSB_NORMAL = 1,
-    SPSB_HOT = 2,
-    SPSB_PRESSED = 3,
-};
-
-enum LOGOFFBUTTONSSTATES {
-    SPLS_NORMAL = 1,
-    SPLS_HOT = 2,
-    SPLS_PRESSED = 3,
-};
-
-/* MENUBAND class */
-#if defined(__GNUC__)
-#define VSCLASS_MENUBAND (const WCHAR []){'M','E','N','U','B','A','N','D',0}
-#elif defined(_MSC_VER)
-#define VSCLASS_MENUBAND L"MENUBAND"
-#else
-static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0};
-#endif
-
-enum MENUBANDPARTS {
-    MDP_NEWAPPBUTTON = 1,
-    MDP_SEPERATOR = 2,
-};
-
-enum MENUBANDSTATES {
-    MDS_NORMAL = 1,
-    MDS_HOT = 2,
-    MDS_PRESSED = 3,
-    MDS_DISABLED = 4,
-    MDS_CHECKED = 5,
-    MDS_HOTCHECKED = 6,
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __VSSYM32_H__ */
diff --git a/external/wine/lib/gdiplus.def b/external/wine/lib/gdiplus.def
deleted file mode 100644
index 81df907..0000000
--- a/external/wine/lib/gdiplus.def
+++ /dev/null
@@ -1,510 +0,0 @@
-; File generated automatically from ./gdiplus.spec; do not edit!
-
-LIBRARY gdiplus.dll
-
-EXPORTS
-  GdipAddPathArc@28 @1
-  GdipAddPathArcI@28 @2
-  GdipAddPathBezier@36 @3
-  GdipAddPathBezierI@36 @4
-  GdipAddPathBeziers@12 @5
-  GdipAddPathBeziersI@12 @6
-  GdipAddPathClosedCurve2@16 @7
-  GdipAddPathClosedCurve2I@16 @8
-  GdipAddPathClosedCurve@12 @9
-  GdipAddPathClosedCurveI@12 @10
-  GdipAddPathCurve2@16 @11
-  GdipAddPathCurve2I@16 @12
-  GdipAddPathCurve3@24 @13
-  GdipAddPathCurve3I@24 @14
-  GdipAddPathCurve@12 @15
-  GdipAddPathCurveI@12 @16
-  GdipAddPathEllipse@20 @17
-  GdipAddPathEllipseI@20 @18
-  GdipAddPathLine2@12 @19
-  GdipAddPathLine2I@12 @20
-  GdipAddPathLine@20 @21
-  GdipAddPathLineI@20 @22
-  GdipAddPathPath@12 @23
-  GdipAddPathPie@28 @24
-  GdipAddPathPieI@28 @25
-  GdipAddPathPolygon@12 @26
-  GdipAddPathPolygonI@12 @27
-  GdipAddPathRectangle@20 @28
-  GdipAddPathRectangleI@20 @29
-  GdipAddPathRectangles@12 @30
-  GdipAddPathRectanglesI@12 @31
-  GdipAlloc@4 @34
-  GdipBeginContainer2@8 @35
-  GdipBitmapGetPixel@16 @43
-  GdipBitmapLockBits@20 @44
-  GdipBitmapUnlockBits@8 @47
-  GdipClearPathMarkers@4 @48
-  GdipCloneBitmapAreaI@28 @50
-  GdipCloneBrush@8 @51
-  GdipCloneCustomLineCap@8 @52
-  GdipCloneFont@8 @53
-  GdipCloneFontFamily@8 @54
-  GdipCloneImage@8 @55
-  GdipCloneImageAttributes@8 @56
-  GdipCloneMatrix@8 @57
-  GdipClonePath@8 @58
-  GdipClonePen@8 @59
-  GdipCloneRegion@8 @60
-  GdipCloneStringFormat@8 @61
-  GdipClosePathFigure@4 @62
-  GdipClosePathFigures@4 @63
-  GdipCombineRegionPath@12 @64
-  GdipCombineRegionRect@12 @65
-  GdipCombineRegionRectI@12 @66
-  GdipCombineRegionRegion@12 @67
-  GdipConvertToEmfPlus@24 @69
-  GdipCreateAdjustableArrowCap@16 @72
-  GdipCreateBitmapFromFile@8 @74
-  GdipCreateBitmapFromFileICM@8 @75
-  GdipCreateBitmapFromGdiDib@12 @76
-  GdipCreateBitmapFromGraphics@16 @77
-  GdipCreateBitmapFromHBITMAP@12 @78
-  GdipCreateBitmapFromHICON@8 @79
-  GdipCreateBitmapFromResource@12 @80
-  GdipCreateBitmapFromScan0@24 @81
-  GdipCreateBitmapFromStream@8 @82
-  GdipCreateBitmapFromStreamICM@8 @83
-  GdipCreateCachedBitmap@12 @84
-  GdipCreateCustomLineCap@20 @85
-  GdipCreateFont@20 @87
-  GdipCreateFontFamilyFromName@12 @88
-  GdipCreateFontFromDC@8 @89
-  GdipCreateFontFromLogfontA@12 @90
-  GdipCreateFontFromLogfontW@12 @91
-  GdipCreateFromHDC2@12 @92
-  GdipCreateFromHDC@8 @93
-  GdipCreateFromHWND@8 @94
-  GdipCreateFromHWNDICM@8 @95
-  GdipCreateHBITMAPFromBitmap@12 @96
-  GdipCreateHalftonePalette@0 @98
-  GdipCreateHatchBrush@16 @99
-  GdipCreateImageAttributes@4 @100
-  GdipCreateLineBrush@24 @101
-  GdipCreateLineBrushFromRect@24 @102
-  GdipCreateLineBrushFromRectI@24 @103
-  GdipCreateLineBrushFromRectWithAngle@28 @104
-  GdipCreateLineBrushFromRectWithAngleI@28 @105
-  GdipCreateLineBrushI@24 @106
-  GdipCreateMatrix2@28 @107
-  GdipCreateMatrix3@12 @108
-  GdipCreateMatrix3I@12 @109
-  GdipCreateMatrix@4 @110
-  GdipCreateMetafileFromEmf@12 @111
-  GdipCreateMetafileFromWmf@16 @114
-  GdipCreateMetafileFromWmfFile@12 @115
-  GdipCreatePath2@20 @116
-  GdipCreatePath2I@20 @117
-  GdipCreatePath@8 @118
-  GdipCreatePathGradient@16 @119
-  GdipCreatePathGradientFromPath@8 @120
-  GdipCreatePathGradientI@16 @121
-  GdipCreatePathIter@8 @122
-  GdipCreatePen1@16 @123
-  GdipCreatePen2@16 @124
-  GdipCreateRegion@4 @125
-  GdipCreateRegionHrgn@8 @126
-  GdipCreateRegionPath@8 @127
-  GdipCreateRegionRect@8 @128
-  GdipCreateRegionRectI@8 @129
-  GdipCreateRegionRgnData@12 @130
-  GdipCreateSolidFill@8 @131
-  GdipCreateStreamOnFile@12 @132
-  GdipCreateStringFormat@12 @133
-  GdipCreateTexture2@28 @134
-  GdipCreateTexture2I@28 @135
-  GdipCreateTexture@12 @136
-  GdipCreateTextureIA@28 @137
-  GdipCreateTextureIAI@28 @138
-  GdipDeleteBrush@4 @139
-  GdipDeleteCachedBitmap@4 @140
-  GdipDeleteCustomLineCap@4 @141
-  GdipDeleteFont@4 @143
-  GdipDeleteFontFamily@4 @144
-  GdipDeleteGraphics@4 @145
-  GdipDeleteMatrix@4 @146
-  GdipDeletePath@4 @147
-  GdipDeletePathIter@4 @148
-  GdipDeletePen@4 @149
-  GdipDeletePrivateFontCollection@4 @150
-  GdipDeleteRegion@4 @151
-  GdipDeleteStringFormat@4 @152
-  GdipDisposeImage@4 @153
-  GdipDisposeImageAttributes@4 @154
-  GdipDrawArc@32 @155
-  GdipDrawArcI@32 @156
-  GdipDrawBezier@40 @157
-  GdipDrawBezierI@40 @158
-  GdipDrawBeziers@16 @159
-  GdipDrawBeziersI@16 @160
-  GdipDrawCachedBitmap@16 @161
-  GdipDrawClosedCurve2@20 @162
-  GdipDrawClosedCurve2I@20 @163
-  GdipDrawClosedCurve@16 @164
-  GdipDrawClosedCurveI@16 @165
-  GdipDrawCurve2@20 @166
-  GdipDrawCurve2I@20 @167
-  GdipDrawCurve@16 @170
-  GdipDrawCurveI@16 @171
-  GdipDrawEllipse@24 @173
-  GdipDrawEllipseI@24 @174
-  GdipDrawImage@16 @175
-  GdipDrawImageI@16 @177
-  GdipDrawImagePointsRect@48 @182
-  GdipDrawImagePointsRectI@48 @183
-  GdipDrawImageRect@24 @184
-  GdipDrawImageRectI@24 @185
-  GdipDrawImageRectRect@56 @186
-  GdipDrawImageRectRectI@56 @187
-  GdipDrawLine@24 @188
-  GdipDrawLineI@24 @189
-  GdipDrawLines@16 @190
-  GdipDrawLinesI@16 @191
-  GdipDrawPath@12 @192
-  GdipDrawPie@32 @193
-  GdipDrawPieI@32 @194
-  GdipDrawPolygon@16 @195
-  GdipDrawPolygonI@16 @196
-  GdipDrawRectangle@24 @197
-  GdipDrawRectangleI@24 @198
-  GdipDrawRectangles@16 @199
-  GdipDrawRectanglesI@16 @200
-  GdipDrawString@28 @201
-  GdipEndContainer@8 @203
-  GdipFillClosedCurve2@24 @216
-  GdipFillClosedCurve2I@24 @217
-  GdipFillEllipse@24 @220
-  GdipFillEllipseI@24 @221
-  GdipFillPath@12 @222
-  GdipFillPie@32 @223
-  GdipFillPieI@32 @224
-  GdipFillPolygon2@16 @225
-  GdipFillPolygon2I@16 @226
-  GdipFillPolygon@20 @227
-  GdipFillPolygonI@20 @228
-  GdipFillRectangle@24 @229
-  GdipFillRectangleI@24 @230
-  GdipFillRectangles@16 @231
-  GdipFillRectanglesI@16 @232
-  GdipFillRegion@12 @233
-  GdipFindFirstImageItem@8 @234
-  GdipFlattenPath@12 @236
-  GdipFlush@8 @237
-  GdipFree@4 @238
-  GdipGetAdjustableArrowCapFillState@8 @239
-  GdipGetAdjustableArrowCapHeight@8 @240
-  GdipGetAdjustableArrowCapMiddleInset@8 @241
-  GdipGetAdjustableArrowCapWidth@8 @242
-  GdipGetAllPropertyItems@16 @243
-  GdipGetBrushType@8 @244
-  GdipGetCellAscent@12 @245
-  GdipGetCellDescent@12 @246
-  GdipGetClip@8 @247
-  GdipGetClipBounds@8 @248
-  GdipGetClipBoundsI@8 @249
-  GdipGetCompositingMode@8 @250
-  GdipGetCompositingQuality@8 @251
-  GdipGetCustomLineCapBaseCap@8 @252
-  GdipGetCustomLineCapBaseInset@8 @253
-  GdipGetCustomLineCapStrokeJoin@8 @255
-  GdipGetCustomLineCapWidthScale@8 @257
-  GdipGetDC@8 @258
-  GdipGetDpiX@8 @259
-  GdipGetDpiY@8 @260
-  GdipGetEmHeight@12 @263
-  GdipGetFamily@8 @266
-  GdipGetFamilyName@12 @267
-  GdipGetFontCollectionFamilyCount@8 @268
-  GdipGetFontCollectionFamilyList@16 @269
-  GdipGetFontHeight@12 @270
-  GdipGetFontHeightGivenDPI@12 @271
-  GdipGetFontSize@8 @272
-  GdipGetFontStyle@8 @273
-  GdipGetFontUnit@8 @274
-  GdipGetGenericFontFamilyMonospace@4 @275
-  GdipGetGenericFontFamilySansSerif@4 @276
-  GdipGetGenericFontFamilySerif@4 @277
-  GdipGetHatchBackgroundColor@8 @278
-  GdipGetHatchForegroundColor@8 @279
-  GdipGetHatchStyle@8 @280
-  GdipGetImageBounds@12 @283
-  GdipGetImageDecoders@12 @284
-  GdipGetImageDecodersSize@8 @285
-  GdipGetImageDimension@12 @286
-  GdipGetImageEncoders@12 @287
-  GdipGetImageEncodersSize@8 @288
-  GdipGetImageFlags@8 @289
-  GdipGetImageGraphicsContext@8 @290
-  GdipGetImageHeight@8 @291
-  GdipGetImageHorizontalResolution@8 @292
-  GdipGetImagePaletteSize@8 @295
-  GdipGetImagePixelFormat@8 @296
-  GdipGetImageRawFormat@8 @297
-  GdipGetImageType@8 @299
-  GdipGetImageVerticalResolution@8 @300
-  GdipGetImageWidth@8 @301
-  GdipGetInterpolationMode@8 @302
-  GdipGetLineColors@8 @305
-  GdipGetLineGammaCorrection@8 @306
-  GdipGetLineRect@8 @309
-  GdipGetLineRectI@8 @310
-  GdipGetLineSpacing@12 @311
-  GdipGetLineWrapMode@8 @313
-  GdipGetLogFontA@12 @314
-  GdipGetLogFontW@12 @315
-  GdipGetMatrixElements@8 @316
-  GdipGetMetafileHeaderFromMetafile@8 @320
-  GdipGetNearestColor@8 @323
-  GdipGetPageScale@8 @324
-  GdipGetPageUnit@8 @325
-  GdipGetPathData@8 @326
-  GdipGetPathFillMode@8 @327
-  GdipGetPathGradientBlend@16 @328
-  GdipGetPathGradientBlendCount@8 @329
-  GdipGetPathGradientCenterPoint@8 @331
-  GdipGetPathGradientCenterPointI@8 @332
-  GdipGetPathGradientFocusScales@12 @333
-  GdipGetPathGradientGammaCorrection@8 @334
-  GdipGetPathGradientPointCount@8 @336
-  GdipGetPathGradientRect@8 @339
-  GdipGetPathGradientRectI@8 @340
-  GdipGetPathGradientSurroundColorsWithCount@12 @342
-  GdipGetPathGradientWrapMode@8 @344
-  GdipGetPathLastPoint@8 @345
-  GdipGetPathPoints@12 @346
-  GdipGetPathPointsI@12 @347
-  GdipGetPathTypes@12 @348
-  GdipGetPathWorldBounds@16 @349
-  GdipGetPathWorldBoundsI@16 @350
-  GdipGetPenBrushFill@8 @351
-  GdipGetPenColor@8 @352
-  GdipGetPenCustomEndCap@8 @355
-  GdipGetPenCustomStartCap@8 @356
-  GdipGetPenDashArray@12 @357
-  GdipGetPenDashCap197819@8 @358
-  GdipGetPenDashCount@8 @359
-  GdipGetPenDashOffset@8 @360
-  GdipGetPenDashStyle@8 @361
-  GdipGetPenEndCap@8 @362
-  GdipGetPenFillType@8 @363
-  GdipGetPenLineJoin@8 @364
-  GdipGetPenMiterLimit@8 @365
-  GdipGetPenMode@8 @366
-  GdipGetPenStartCap@8 @367
-  GdipGetPenUnit@8 @369
-  GdipGetPenWidth@8 @370
-  GdipGetPixelOffsetMode@8 @371
-  GdipGetPointCount@8 @372
-  GdipGetPropertyCount@8 @373
-  GdipGetPropertyIdList@12 @374
-  GdipGetPropertyItem@16 @375
-  GdipGetPropertyItemSize@12 @376
-  GdipGetPropertySize@12 @377
-  GdipGetRegionBounds@12 @378
-  GdipGetRegionBoundsI@12 @379
-  GdipGetRegionData@16 @380
-  GdipGetRegionDataSize@8 @381
-  GdipGetRegionHRgn@12 @382
-  GdipGetSmoothingMode@8 @387
-  GdipGetSolidFillColor@8 @388
-  GdipGetStringFormatAlign@8 @389
-  GdipGetStringFormatDigitSubstitution@12 @390
-  GdipGetStringFormatFlags@8 @391
-  GdipGetStringFormatHotkeyPrefix@8 @392
-  GdipGetStringFormatLineAlign@8 @393
-  GdipGetStringFormatMeasurableCharacterRangeCount@8 @394
-  GdipGetStringFormatTabStopCount@8 @395
-  GdipGetStringFormatTabStops@16 @396
-  GdipGetStringFormatTrimming@8 @397
-  GdipGetTextContrast@8 @398
-  GdipGetTextRenderingHint@8 @399
-  GdipGetTextureTransform@8 @401
-  GdipGetTextureWrapMode@8 @402
-  GdipGetWorldTransform@8 @405
-  GdipGraphicsClear@8 @406
-  GdipImageForceValidation@4 @408
-  GdipImageGetFrameCount@12 @409
-  GdipImageGetFrameDimensionsCount@8 @410
-  GdipImageGetFrameDimensionsList@12 @411
-  GdipImageSelectActiveFrame@12 @413
-  GdipInvertMatrix@4 @416
-  GdipIsClipEmpty@8 @417
-  GdipIsEmptyRegion@12 @418
-  GdipIsEqualRegion@16 @419
-  GdipIsInfiniteRegion@12 @420
-  GdipIsMatrixEqual@12 @421
-  GdipIsMatrixIdentity@8 @422
-  GdipIsMatrixInvertible@8 @423
-  GdipIsOutlineVisiblePathPoint@24 @424
-  GdipIsOutlineVisiblePathPointI@24 @425
-  GdipIsStyleAvailable@12 @426
-  GdipIsVisiblePathPoint@20 @428
-  GdipIsVisiblePathPointI@20 @429
-  GdipIsVisiblePoint@16 @430
-  GdipIsVisiblePointI@16 @431
-  GdipLoadImageFromFile@8 @438
-  GdipLoadImageFromFileICM@8 @439
-  GdipLoadImageFromStream@8 @440
-  GdipLoadImageFromStreamICM@8 @441
-  GdipMeasureCharacterRanges@32 @442
-  GdipMeasureString@36 @444
-  GdipMultiplyMatrix@12 @446
-  GdipMultiplyTextureTransform@12 @449
-  GdipMultiplyWorldTransform@12 @450
-  GdipNewInstalledFontCollection@4 @451
-  GdipNewPrivateFontCollection@4 @452
-  GdipPathIterCopyData@24 @453
-  GdipPathIterEnumerate@20 @454
-  GdipPathIterGetCount@8 @455
-  GdipPathIterGetSubpathCount@8 @456
-  GdipPathIterHasCurve@8 @457
-  GdipPathIterIsValid@8 @458
-  GdipPathIterNextMarker@16 @459
-  GdipPathIterNextMarkerPath@12 @460
-  GdipPathIterNextPathType@20 @461
-  GdipPathIterNextSubpath@20 @462
-  GdipPathIterNextSubpathPath@16 @463
-  GdipPathIterRewind@4 @464
-  GdipPrivateAddFontFile@8 @467
-  GdipPrivateAddMemoryFont@12 @468
-  GdipRecordMetafileFileName@28 @470
-  GdipRecordMetafileFileNameI@28 @471
-  GdipReleaseDC@8 @475
-  GdipRemovePropertyItem@8 @476
-  GdipResetClip@4 @477
-  GdipResetPath@4 @481
-  GdipResetPenTransform@4 @483
-  GdipResetTextureTransform@4 @484
-  GdipResetWorldTransform@4 @485
-  GdipRestoreGraphics@8 @486
-  GdipReversePath@4 @487
-  GdipRotateLineTransform@12 @488
-  GdipRotateMatrix@12 @489
-  GdipRotateTextureTransform@12 @492
-  GdipRotateWorldTransform@12 @493
-  GdipSaveGraphics@8 @496
-  GdipSaveImageToFile@16 @497
-  GdipSaveImageToStream@16 @498
-  GdipScaleMatrix@16 @500
-  GdipScalePenTransform@16 @502
-  GdipScaleTextureTransform@16 @503
-  GdipScaleWorldTransform@16 @504
-  GdipSetAdjustableArrowCapFillState@8 @505
-  GdipSetAdjustableArrowCapHeight@8 @506
-  GdipSetAdjustableArrowCapMiddleInset@8 @507
-  GdipSetAdjustableArrowCapWidth@8 @508
-  GdipSetClipGraphics@12 @509
-  GdipSetClipHrgn@12 @510
-  GdipSetClipPath@12 @511
-  GdipSetClipRect@24 @512
-  GdipSetClipRectI@24 @513
-  GdipSetClipRegion@12 @514
-  GdipSetCompositingMode@8 @515
-  GdipSetCompositingQuality@8 @516
-  GdipSetCustomLineCapBaseCap@8 @517
-  GdipSetCustomLineCapBaseInset@8 @518
-  GdipSetCustomLineCapStrokeCaps@12 @519
-  GdipSetCustomLineCapStrokeJoin@8 @520
-  GdipSetCustomLineCapWidthScale@8 @521
-  GdipSetEffectParameters@12 @522
-  GdipSetEmpty@4 @523
-  GdipSetImageAttributesCachedBackground@8 @524
-  GdipSetImageAttributesColorKeys@20 @525
-  GdipSetImageAttributesColorMatrix@24 @526
-  GdipSetImageAttributesGamma@16 @527
-  GdipSetImageAttributesNoOp@12 @528
-  GdipSetImageAttributesOutputChannel@16 @529
-  GdipSetImageAttributesOutputChannelColorProfile@16 @530
-  GdipSetImageAttributesRemapTable@20 @531
-  GdipSetImageAttributesThreshold@16 @532
-  GdipSetImageAttributesToIdentity@8 @533
-  GdipSetImageAttributesWrapMode@16 @534
-  GdipSetImagePalette@8 @535
-  GdipSetInfinite@4 @536
-  GdipSetInterpolationMode@8 @537
-  GdipSetLineBlend@16 @538
-  GdipSetLineColors@12 @539
-  GdipSetLineGammaCorrection@8 @540
-  GdipSetLineLinearBlend@12 @541
-  GdipSetLinePresetBlend@16 @542
-  GdipSetLineSigmaBlend@12 @543
-  GdipSetLineTransform@8 @544
-  GdipSetLineWrapMode@8 @545
-  GdipSetMatrixElements@28 @546
-  GdipSetMetafileDownLevelRasterizationLimit@8 @547
-  GdipSetPageScale@8 @548
-  GdipSetPageUnit@8 @549
-  GdipSetPathFillMode@8 @550
-  GdipSetPathGradientBlend@16 @551
-  GdipSetPathGradientCenterColor@8 @552
-  GdipSetPathGradientCenterPoint@8 @553
-  GdipSetPathGradientCenterPointI@8 @554
-  GdipSetPathGradientFocusScales@12 @555
-  GdipSetPathGradientGammaCorrection@8 @556
-  GdipSetPathGradientSigmaBlend@12 @560
-  GdipSetPathGradientSurroundColorsWithCount@12 @561
-  GdipSetPathGradientWrapMode@8 @563
-  GdipSetPathMarker@4 @564
-  GdipSetPenBrushFill@8 @565
-  GdipSetPenColor@8 @566
-  GdipSetPenCompoundArray@12 @567
-  GdipSetPenCustomEndCap@8 @568
-  GdipSetPenCustomStartCap@8 @569
-  GdipSetPenDashArray@12 @570
-  GdipSetPenDashCap197819@8 @571
-  GdipSetPenDashOffset@8 @572
-  GdipSetPenDashStyle@8 @573
-  GdipSetPenEndCap@8 @574
-  GdipSetPenLineCap197819@16 @575
-  GdipSetPenLineJoin@8 @576
-  GdipSetPenMiterLimit@8 @577
-  GdipSetPenMode@8 @578
-  GdipSetPenStartCap@8 @579
-  GdipSetPenWidth@8 @582
-  GdipSetPixelOffsetMode@8 @583
-  GdipSetPropertyItem@8 @584
-  GdipSetSmoothingMode@8 @586
-  GdipSetSolidFillColor@8 @587
-  GdipSetStringFormatAlign@8 @588
-  GdipSetStringFormatDigitSubstitution@12 @589
-  GdipSetStringFormatFlags@8 @590
-  GdipSetStringFormatHotkeyPrefix@8 @591
-  GdipSetStringFormatLineAlign@8 @592
-  GdipSetStringFormatMeasurableCharacterRanges@12 @593
-  GdipSetStringFormatTabStops@16 @594
-  GdipSetStringFormatTrimming@8 @595
-  GdipSetTextContrast@8 @596
-  GdipSetTextRenderingHint@8 @597
-  GdipSetTextureTransform@8 @598
-  GdipSetTextureWrapMode@8 @599
-  GdipSetWorldTransform@8 @600
-  GdipShearMatrix@16 @601
-  GdipStartPathFigure@4 @602
-  GdipStringFormatGetGenericDefault@4 @603
-  GdipStringFormatGetGenericTypographic@4 @604
-  GdipTestControl@8 @605
-  GdipTransformMatrixPoints@12 @606
-  GdipTransformMatrixPointsI@12 @607
-  GdipTransformPath@8 @608
-  GdipTransformPoints@20 @609
-  GdipTransformPointsI@20 @610
-  GdipTransformRegion@8 @611
-  GdipTranslateClip@12 @612
-  GdipTranslateClipI@12 @613
-  GdipTranslateLineTransform@16 @614
-  GdipTranslateMatrix@16 @615
-  GdipTranslateRegion@12 @618
-  GdipTranslateRegionI@12 @619
-  GdipTranslateTextureTransform@16 @620
-  GdipTranslateWorldTransform@16 @621
-  GdipVectorTransformMatrixPoints@12 @622
-  GdipVectorTransformMatrixPointsI@12 @623
-  GdiplusNotificationHook@4 @627
-  GdiplusNotificationUnhook@4 @628
-  GdiplusShutdown@4 @629
-  GdiplusStartup@12 @630
diff --git a/external/wine/lib/msi.def b/external/wine/lib/msi.def
deleted file mode 100644
index 8dcfd36..0000000
--- a/external/wine/lib/msi.def
+++ /dev/null
@@ -1,234 +0,0 @@
-; File generated automatically from ./msi.spec; do not edit!
-
-LIBRARY msi.dll
-
-EXPORTS
-  MsiAdvertiseProductA@16 @5
-  MsiAdvertiseProductW@16 @6
-  MsiCloseAllHandles@0 @7
-  MsiCloseHandle@4 @8
-  MsiCollectUserInfoA@4 @9
-  MsiCollectUserInfoW@4 @10
-  MsiConfigureFeatureA@12 @11
-  MsiConfigureFeatureW@12 @14
-  MsiConfigureProductA@12 @15
-  MsiConfigureProductW@12 @16
-  MsiCreateRecord@4 @17
-  MsiDatabaseApplyTransformA@12 @18
-  MsiDatabaseApplyTransformW@12 @19
-  MsiDatabaseCommit@4 @20
-  MsiDatabaseExportA@16 @21
-  MsiDatabaseExportW@16 @22
-  MsiDatabaseGenerateTransformA@20 @23
-  MsiDatabaseGenerateTransformW@20 @24
-  MsiDatabaseGetPrimaryKeysA@12 @25
-  MsiDatabaseGetPrimaryKeysW@12 @26
-  MsiDatabaseImportA@12 @27
-  MsiDatabaseImportW@12 @28
-  MsiDatabaseMergeA@12 @29
-  MsiDatabaseMergeW@12 @30
-  MsiDatabaseOpenViewA@12 @31
-  MsiDatabaseOpenViewW@12 @32
-  MsiDoActionA@8 @33
-  MsiDoActionW@8 @34
-  MsiEnableUIPreview@8 @35
-  MsiEnumClientsA@12 @36
-  MsiEnumClientsW@12 @37
-  MsiEnumComponentQualifiersA@24 @38
-  MsiEnumComponentQualifiersW@24 @39
-  MsiEnumComponentsA@8 @40
-  MsiEnumComponentsW@8 @41
-  MsiEnumFeaturesA@16 @42
-  MsiEnumFeaturesW@16 @43
-  MsiEnumProductsA@8 @44
-  MsiEnumProductsW@8 @45
-  MsiEvaluateConditionA@8 @46
-  MsiEvaluateConditionW@8 @47
-  MsiGetLastErrorRecord@0 @48
-  MsiGetActiveDatabase@4 @49
-  MsiGetComponentStateA@16 @50
-  MsiGetComponentStateW@16 @51
-  MsiGetDatabaseState@4 @52
-  MsiGetFeatureCostA@20 @53
-  MsiGetFeatureCostW@20 @54
-  MsiGetFeatureStateA@16 @57
-  MsiGetFeatureStateW@16 @58
-  MsiGetFeatureUsageA@16 @59
-  MsiGetFeatureUsageW@16 @60
-  MsiGetFeatureValidStatesA@12 @61
-  MsiGetFeatureValidStatesW@12 @62
-  MsiGetLanguage@4 @63
-  MsiGetMode@8 @64
-  MsiGetProductCodeA@8 @65
-  MsiGetProductCodeW@8 @66
-  MsiGetProductInfoA@16 @67
-  MsiGetProductInfoW@16 @70
-  MsiGetProductPropertyA@16 @71
-  MsiGetProductPropertyW@16 @72
-  MsiGetPropertyA@16 @73
-  MsiGetPropertyW@16 @74
-  MsiGetSourcePathA@16 @75
-  MsiGetSourcePathW@16 @76
-  MsiGetSummaryInformationA@16 @77
-  MsiGetSummaryInformationW@16 @78
-  MsiGetTargetPathA@16 @79
-  MsiGetTargetPathW@16 @80
-  MsiGetUserInfoA@28 @81
-  MsiGetUserInfoW@28 @82
-  MsiInstallMissingComponentW@12 @84
-  MsiInstallProductA@8 @87
-  MsiInstallProductW@8 @88
-  MsiLocateComponentA@12 @89
-  MsiLocateComponentW@12 @90
-  MsiOpenDatabaseA@12 @91
-  MsiOpenDatabaseW@12 @92
-  MsiOpenPackageA@8 @93
-  MsiOpenPackageW@8 @94
-  MsiOpenProductA@8 @95
-  MsiOpenProductW@8 @96
-  MsiPreviewBillboardA@12 @97
-  MsiPreviewBillboardW@12 @98
-  MsiPreviewDialogA@8 @99
-  MsiPreviewDialogW@8 @100
-  MsiProcessMessage@12 @103
-  MsiProvideComponentFromDescriptorA@16 @105
-  MsiProvideComponentFromDescriptorW@16 @106
-  MsiProvideQualifiedComponentA@20 @108
-  MsiProvideQualifiedComponentW@20 @109
-  MsiQueryFeatureStateA@8 @110
-  MsiQueryFeatureStateW@8 @111
-  MsiQueryProductStateA@4 @112
-  MsiQueryProductStateW@4 @113
-  MsiRecordDataSize@8 @114
-  MsiRecordGetFieldCount@4 @115
-  MsiRecordGetInteger@8 @116
-  MsiRecordGetStringA@16 @117
-  MsiRecordGetStringW@16 @118
-  MsiRecordIsNull@8 @119
-  MsiRecordReadStream@16 @120
-  MsiRecordSetInteger@12 @121
-  MsiRecordSetStreamA@12 @122
-  MsiRecordSetStreamW@12 @123
-  MsiRecordSetStringA@12 @124
-  MsiRecordSetStringW@12 @125
-  MsiReinstallFeatureA@12 @126
-  MsiReinstallFeatureW@12 @129
-  MsiReinstallProductA@8 @130
-  MsiReinstallProductW@8 @131
-  MsiSequenceA@12 @132
-  MsiSequenceW@12 @133
-  MsiSetComponentStateA@12 @134
-  MsiSetComponentStateW@12 @135
-  MsiSetExternalUIA@12 @136
-  MsiSetExternalUIW@12 @137
-  MsiSetFeatureStateA@12 @138
-  MsiSetFeatureStateW@12 @139
-  MsiSetInstallLevel@8 @140
-  MsiSetInternalUI@8 @141
-  MsiSetMode@12 @143
-  MsiSetPropertyA@12 @144
-  MsiSetPropertyW@12 @145
-  MsiSetTargetPathA@12 @146
-  MsiSetTargetPathW@12 @147
-  MsiSummaryInfoGetPropertyA@28 @148
-  MsiSummaryInfoGetPropertyCount@8 @149
-  MsiSummaryInfoGetPropertyW@28 @150
-  MsiSummaryInfoPersist@4 @151
-  MsiSummaryInfoSetPropertyA@24 @152
-  MsiSummaryInfoSetPropertyW@24 @153
-  MsiUseFeatureA@8 @154
-  MsiUseFeatureW@8 @155
-  MsiVerifyPackageA@4 @156
-  MsiVerifyPackageW@4 @157
-  MsiViewClose@4 @158
-  MsiViewExecute@8 @159
-  MsiViewFetch@8 @160
-  MsiViewGetErrorA@12 @161
-  MsiViewGetErrorW@12 @162
-  MsiViewModify@12 @163
-  MsiDatabaseIsTablePersistentA@8 @164
-  MsiDatabaseIsTablePersistentW@8 @165
-  MsiViewGetColumnInfo@12 @166
-  MsiRecordClearData@4 @167
-  MsiEnableLogA@12 @168
-  MsiEnableLogW@12 @169
-  MsiFormatRecordA@16 @170
-  MsiFormatRecordW@16 @171
-  MsiGetComponentPathA@16 @172
-  MsiGetComponentPathW@16 @173
-  MsiApplyPatchA@16 @174
-  MsiApplyPatchW@16 @175
-  MsiAdvertiseScriptA@16 @176
-  MsiAdvertiseScriptW@16 @177
-  MsiGetPatchInfoA@16 @178
-  MsiGetPatchInfoW@16 @179
-  MsiEnumPatchesA@20 @180
-  MsiEnumPatchesW@20 @181
-  DllGetVersion@4 @182 PRIVATE
-  MsiConfigureProductExA@16 @189
-  MsiConfigureProductExW@16 @190
-  MsiUseFeatureExA@16 @192
-  MsiUseFeatureExW@16 @193
-  MsiGetFileVersionA@20 @194
-  MsiGetFileVersionW@20 @195
-  MsiLoadStringA@20 @196
-  MsiLoadStringW@20 @197
-  MsiMessageBoxA@24 @198
-  MsiMessageBoxW@24 @199
-  MsiDecomposeDescriptorA@20 @200
-  MsiDecomposeDescriptorW@20 @201
-  MsiProvideQualifiedComponentExA@32 @202
-  MsiProvideQualifiedComponentExW@32 @203
-  MsiEnumRelatedProductsA@16 @204
-  MsiEnumRelatedProductsW@16 @205
-  MsiSourceListClearAllA@12 @208
-  MsiSourceListClearAllW@12 @209
-  MsiSourceListAddSourceA@16 @210
-  MsiSourceListAddSourceW@16 @211
-  MsiIsProductElevatedA@8 @214
-  MsiIsProductElevatedW@8 @215
-  MsiGetShortcutTargetA@16 @216
-  MsiGetShortcutTargetW@16 @217
-  MsiGetFileHashA@12 @218
-  MsiGetFileHashW@12 @219
-  MsiEnumComponentCostsW@32 @221
-  MsiCreateAndVerifyInstallerDirectory@4 @222
-  MsiGetFileSignatureInformationA@20 @223
-  MsiGetFileSignatureInformationW@20 @224
-  MsiProvideAssemblyA@24 @225
-  MsiProvideAssemblyW@24 @226
-  MsiAdvertiseProductExA@24 @227
-  MsiAdvertiseProductExW@24 @228
-  MsiOpenPackageExA@12 @231
-  MsiOpenPackageExW@12 @232
-  MsiGetPatchInfoExA@28 @243
-  MsiGetPatchInfoExW@28 @244
-  MsiEnumProductsExA@32 @245
-  MsiEnumProductsExW@32 @246
-  MsiGetProductInfoExA@24 @247
-  MsiGetProductInfoExW@24 @248
-  MsiQueryComponentStateA@20 @249
-  MsiQueryComponentStateW@20 @250
-  MsiSourceListAddSourceExA@24 @255
-  MsiSourceListAddSourceExW@24 @256
-  MsiSourceListClearSourceA@20 @257
-  MsiSourceListClearSourceW@20 @258
-  MsiSourceListEnumSourcesA@28 @263
-  MsiSourceListEnumSourcesW@28 @264
-  MsiSourceListGetInfoA@28 @265
-  MsiSourceListGetInfoW@28 @266
-  MsiSourceListSetInfoA@24 @267
-  MsiSourceListSetInfoW@24 @268
-  MsiEnumPatchesExA@40 @269
-  MsiEnumPatchesExW@40 @270
-  MsiSourceListEnumMediaDisksA@40 @271
-  MsiSourceListEnumMediaDisksW@40 @272
-  MsiSourceListAddMediaDiskA@28 @273
-  MsiSourceListAddMediaDiskW@28 @274
-  MsiDetermineApplicablePatchesA@12 @277
-  MsiDetermineApplicablePatchesW@12 @278
-  MsiSetExternalUIRecord@16 @281
-  DllCanUnloadNow@0 @282 PRIVATE
-  DllGetClassObject@12 @283 PRIVATE
-  DllRegisterServer@0 @284 PRIVATE
-  DllUnregisterServer@0 @285 PRIVATE
diff --git a/external/wine/lib/urlmon.def b/external/wine/lib/urlmon.def
deleted file mode 100644
index 0349859..0000000
--- a/external/wine/lib/urlmon.def
+++ /dev/null
@@ -1,56 +0,0 @@
-; File generated automatically from ./urlmon.spec; do not edit!
-
-LIBRARY urlmon.dll
-
-EXPORTS
-  BindAsyncMoniker@20 @5
-  CoGetClassObjectFromURL@40 @6
-  CoInternetCombineUrl@28 @8
-  CoInternetCompareUrl@12 @9
-  CoInternetCreateSecurityManager@12 @10
-  CoInternetCreateZoneManager@12 @11
-  CoInternetGetSession@12 @14
-  CoInternetParseUrl@28 @15
-  CoInternetQueryInfo@28 @16
-  CoInternetSetFeatureEnabled@12 @17
-  CopyStgMedium@8 @20
-  CreateAsyncBindCtx@16 @21
-  CreateAsyncBindCtxEx@24 @22
-  CreateFormatEnumerator@12 @23
-  CreateURLMoniker@12 @24
-  CreateURLMonikerEx@16 @25
-  DllCanUnloadNow@0 @26 PRIVATE
-  DllGetClassObject@12 @27 PRIVATE
-  DllInstall@8 @28 PRIVATE
-  DllRegisterServer@0 @29 PRIVATE
-  DllRegisterServerEx@0 @30 PRIVATE
-  DllUnregisterServer@0 @31 PRIVATE
-  Extract@8 @32
-  FaultInIEFeature@16 @33
-  FindMimeFromData@32 @36
-  GetClassFileOrMime@28 @37
-  GetSoftwareUpdateInfo@8 @41
-  HlinkNavigateString@8 @45
-  HlinkSimpleNavigateToMoniker@32 @46
-  HlinkSimpleNavigateToString@32 @47
-  IsAsyncMoniker@4 @48
-  IsLoggingEnabledA@4 @49
-  IsLoggingEnabledW@4 @50
-  IsValidURL@12 @51
-  MkParseDisplayNameEx@16 @52
-  ObtainUserAgentString@12 @53
-  RegisterBindStatusCallback@16 @55
-  RegisterFormatEnumerator@12 @56
-  ReleaseBindInfo@4 @59
-  RevokeBindStatusCallback@8 @60
-  RevokeFormatEnumerator@8 @61
-  URLDownloadToCacheFileA@24 @64
-  URLDownloadToCacheFileW@24 @65
-  URLDownloadToFileA@20 @66
-  URLDownloadToFileW@20 @67
-  URLOpenBlockingStreamA@20 @69
-  URLOpenBlockingStreamW@20 @70
-  URLOpenStreamA@16 @73
-  URLOpenStreamW@16 @74
-  UrlMkGetSessionOption@20 @76
-  UrlMkSetSessionOption@16 @77
diff --git a/external/wine/makefile.mk b/external/wine/makefile.mk
deleted file mode 100644
index 21399e5..0000000
--- a/external/wine/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is Novell, Inc.
-#
-# Portions created by the Initial Developer are Copyright (C) 2011 Novell, 
-# Inc. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PRJ=..
-PRJNAME=external
-TARGET=gdiplus
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-
-ALL:
-    -$(MKDIRHIER) $(OUT)/inc/wine
-    cp include/* $(OUT)/inc/wine
-    for L in gdiplus msi urlmon; do $(DLLTOOL) --input-def lib/$$L.def --dllname=$$L.dll --output-lib=$(OUT)/lib/lib$$L.dll.a; done
-.ENDIF
-
-.INCLUDE :  target.mk
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
deleted file mode 100755
index 8b3d5b1..0000000
--- a/hsqldb/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=hsqldb
-TARGET=so_hsqldb
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build$/build.xml
-
-.INCLUDE : antsettings.mk
-
-.INCLUDE :  version.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0
-
-TARFILE_ROOTDIR=hsqldb
-
-CONVERTFILES=build$/build.xml \
-            src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java \
-            src$/org$/hsqldb$/Library.java
-
-PATCH_FILES=patches$/i96823.patch \
-            patches$/i97032.patch \
-            patches$/i103528.patch \
-            patches$/i104901.patch
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
-.ELSE
-.IF "$(debug)"!=""
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f $(ANT_BUILDFILE) jar
-.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
-.ENDIF
-.ENDIF
-
-.ENDIF # $(SOLAR_JAVA)!= ""
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/hsqldb/patches/i103528.patch b/hsqldb/patches/i103528.patch
deleted file mode 100644
index 3cc7d2f..0000000
--- a/hsqldb/patches/i103528.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/hsqldb/src/org/hsqldb/Library.java
-+++ misc/build/hsqldb/src/org/hsqldb/Library.java
-@@ -1957,7 +1957,7 @@
-         functionMap.put("bitand", bitand);
-         functionMap.put("bitlength", bitLength);
-         functionMap.put("bitor", bitor);
--        functionMap.put("bitxor", bitor);
-+        functionMap.put("bitxor", bitxor);
-         functionMap.put("character", character);
-         functionMap.put("concat", concat);
-         functionMap.put("cot", cot);
diff --git a/hsqldb/patches/i104901.patch b/hsqldb/patches/i104901.patch
deleted file mode 100644
index a38773f..0000000
--- a/hsqldb/patches/i104901.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- misc/hsqldb/src/org/hsqldb/Table.java	2007-10-19 23:59:07.000000000 +0200
-+++ misc/build/hsqldb/src/org/hsqldb/Table.java	2009-09-11 13:45:42.939231519 +0200
-@@ -149,10 +149,10 @@
-     Constraint[]      constraintList;                 // constrainst for the table
-     HsqlArrayList[]   triggerLists;                   // array of trigger lists
-     private int[]     colTypes;                       // fredt - types of columns
--    private int[]     colSizes;                       // fredt - copy of SIZE values for columns
-+    int[]     	      colSizes;                       // fredt - copy of SIZE values for columns
-     private int[]     colScales;                      // fredt - copy of SCALE values for columns
-     private boolean[] colNullable;                    // fredt - modified copy of isNullable() values
--    private Expression[] colDefaults;                 // fredt - expressions of DEFAULT values
-+    Expression[] 	  colDefaults;                 // fredt - expressions of DEFAULT values
-     private int[]        defaultColumnMap;            // fred - holding 0,1,2,3,...
-     private boolean      hasDefaultValues;            //fredt - shortcut for above
-     boolean              sqlEnforceSize;              // inherited from the database -
---- misc/hsqldb/src/org/hsqldb/TableWorks.java	2007-01-14 06:48:16.000000000 +0100
-+++ misc/build/hsqldb/src/org/hsqldb/TableWorks.java	2009-09-11 13:47:50.328667463 +0200
-@@ -670,7 +670,8 @@
-             // default expressions can change
-             oldCol.setType(newCol);
-             oldCol.setDefaultExpression(newCol.getDefaultExpression());
--            table.setColumnTypeVars(colIndex);
-+			table.colSizes[colIndex]    = oldCol.getSize();
-+            table.colDefaults[colIndex] = oldCol.getDefaultExpression();
-             table.resetDefaultsFlag();
- 
-             return;
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
deleted file mode 100644
index bea4a2b..0000000
--- a/hsqldb/patches/i96823.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- misc/hsqldb/src/org/hsqldb/Expression.java	2008-05-27 17:15:05.000000000 +0200
-+++ misc/build/hsqldb/src/org/hsqldb/Expression.java	2009-01-27 11:42:16.890625000 +0100
-@@ -803,61 +803,62 @@
- 
-             case EXISTS :
-                 buf.append(' ').append(Token.T_EXISTS).append(' ');
--                break;
-+
-+                return buf.toString();
- 
-             case COUNT :
-                 buf.append(' ').append(Token.T_COUNT).append('(');
--                break;
-+                if ( "(*)".equals(left))buf.append('*');else   buf.append(left);   buf.append(')');   return buf.toString();
- 
-             case SUM :
-                 buf.append(' ').append(Token.T_SUM).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case MIN :
-                 buf.append(' ').append(Token.T_MIN).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case MAX :
-                 buf.append(' ').append(Token.T_MAX).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case AVG :
-                 buf.append(' ').append(Token.T_AVG).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case EVERY :
-                 buf.append(' ').append(Token.T_EVERY).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case SOME :
-                 buf.append(' ').append(Token.T_SOME).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case STDDEV_POP :
-                 buf.append(' ').append(Token.T_STDDEV_POP).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case STDDEV_SAMP :
-                 buf.append(' ').append(Token.T_STDDEV_SAMP).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case VAR_POP :
-                 buf.append(' ').append(Token.T_VAR_POP).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
- 
-             case VAR_SAMP :
-                 buf.append(' ').append(Token.T_VAR_SAMP).append('(');
-                 buf.append(left).append(')');
--                break;
-+                return buf.toString();
-         }
- 
-         throw Trace.error(Trace.EXPRESSION_NOT_SUPPORTED);
-@@ -1522,6 +1523,16 @@
-         if (exprType == COLUMN) {
-             return columnName;
-         }
-+        if ( isAggregate(exprType) )
-+        {
-+            try
-+            {
-+                return getDDL();
-+            }
-+            catch(Exception e)
-+            {
-+            }
-+        }
- 
-         return "";
-     }
diff --git a/hsqldb/patches/i97032.patch b/hsqldb/patches/i97032.patch
deleted file mode 100644
index 9703b89..0000000
--- a/hsqldb/patches/i97032.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java	2008-03-17 17:05:41.000000000 +0100
-+++ misc/build/hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java	2009-01-21 13:09:24.493470142 +0100
-@@ -429,6 +429,7 @@
-             setProperty(hsqldb_log_size, 10);
-             setProperty(sql_enforce_strict_size, true);
-             setProperty(hsqldb_nio_data_file, false);
-+			setProperty(hsqldb_lock_file, true);
-         }
- 
-         // OOo end
diff --git a/hsqldb/prj/build.lst b/hsqldb/prj/build.lst
deleted file mode 100644
index a7c0623..0000000
--- a/hsqldb/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-hs	hsqldb	:	solenv NULL
-hs	hsqldb			nmake	-	all	hs_mkout NULL
diff --git a/hsqldb/prj/d.lst b/hsqldb/prj/d.lst
deleted file mode 100644
index d432e98..0000000
--- a/hsqldb/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\misc\build\hsqldb\lib\hsqldb.jar %_DEST%\bin\hsqldb.jar
diff --git a/hsqldb/version.mk b/hsqldb/version.mk
deleted file mode 100755
index 36ab376..0000000
--- a/hsqldb/version.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# when you want to change the HSQLDB version, you must update the d.lst
-# in the HSQLDB_thon project accordingly !!!
-HSQLDB_MAJOR=1
-HSQLDB_MINOR=8
-HSQLDB_MICRO=0
-HSQLDB_VERSION=$(HSQLDB_MAJOR)_$(HSQLDB_MINOR)_$(HSQLDB_MICRO)
diff --git a/hyphen/hyphen-2.7.1-read-charset.patch b/hyphen/hyphen-2.7.1-read-charset.patch
deleted file mode 100644
index e846955..0000000
--- a/hyphen/hyphen-2.7.1-read-charset.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/hyphen-2.7.1/hyphen.c	2010-12-01 01:47:22.000000000 +0100
-+++ misc/build/hyphen-2.7.1/hyphen.c	2011-01-18 16:26:50.953125000 +0100
-@@ -291,13 +291,10 @@
-   /* read in character set info */
-   if (k == 0) {
-     for (i=0;i<MAX_NAME;i++) dict[k]->cset[i]= 0;
--    if (fgets(dict[k]->cset,  sizeof(dict[k]->cset),f) != NULL) {
--      for (i=0;i<MAX_NAME;i++)
--        if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
--          dict[k]->cset[i] = 0;
--    } else {
--      dict[k]->cset[0] = 0;
--    }
-+    fgets(dict[k]->cset,  sizeof(dict[k]->cset),f);
-+    for (i=0;i<MAX_NAME;i++)
-+      if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
-+        dict[k]->cset[i] = 0;
-     dict[k]->utf8 = (strcmp(dict[k]->cset, "UTF-8") == 0);
-   } else {
-     strcpy(dict[k]->cset, dict[0]->cset);
diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch
deleted file mode 100644
index f444955..0000000
--- a/hyphen/hyphen-2.7.1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- misc/hyphen-2.7.1/config.sub
-+++ misc/build/hyphen-2.7.1/config.sub
-@@ -1272,7 +1272,7 @@
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
---- misc/hyphen-2.7.1/Makefile.am	2010-07-19 11:23:17.000000000 +0200
-+++ misc/build/hyphen-2.7.1/Makefile.am	2010-12-02 10:15:44.390625000 +0100
-@@ -25,14 +25,13 @@
- 
- hyphen.us3:
- 	cp -f $(srcdir)/hyphen.tex hyphen.us
--	patch < $(srcdir)/hyphen.patch
-+	$(GNUPATCH) < $(srcdir)/hyphen.patch
- 	$(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
- 	cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
- 	cat $(srcdir)/ligpatch.txt >>hyphen.us3
- 
--hyph_en_US.dic: hyphen.us3
--	perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null
--	cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
-+hyph_en_US.dic:
-+	@echo "hyph_en_US.txt distributed with Hyphen library"
- 
- clean-local:
- 	rm -rf hyphen.us* hyph_en_US.dic
---- misc/hyphen-2.7.1/Makefile.in	2010-12-01 02:31:29.000000000 +0100
-+++ misc/build/hyphen-2.7.1/Makefile.in	2010-12-02 10:17:16.546875000 +0100
-@@ -940,14 +940,13 @@
- 
- hyphen.us3:
- 	cp -f $(srcdir)/hyphen.tex hyphen.us
--	patch < $(srcdir)/hyphen.patch
-+	$(GNUPATCH) < $(srcdir)/hyphen.patch
- 	$(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
- 	cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
- 	cat $(srcdir)/ligpatch.txt >>hyphen.us3
- 
--hyph_en_US.dic: hyphen.us3
--	perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null
--	cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
-+hyph_en_US.dic:
-+	@echo "hyph_en_US.txt distributed with Hyphen library"
- 
- clean-local:
- 	rm -rf hyphen.us* hyph_en_US.dic
---- misc/hyphen-2.7.1/makefile.mk	2010-12-02 10:35:40.265625000 +0100
-+++ misc/build/hyphen-2.7.1/makefile.mk	2010-12-02 10:25:45.750000000 +0100
-@@ -1 +1,28 @@
--dummy
-+PRJ = ..$/..$/..$/..
-+
-+PRJNAME = hyphen
-+TARGET  = hyphen
-+CFLAGSCALL=gsd
-+
-+USE_DEFFILE=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+# !! not to be compiled because those belong to a stand alone programs: !!
-+#        $(SLO)$/createfp.obj\
-+#        $(SLO)$/testtextcat.obj
-+
-+SLOFILES=   \
-+        $(SLO)$/hyphen.obj\
-+        $(SLO)$/hnjalloc.obj
-+
-+# --- Targets ------------------------------------------------------
-+
-+ALL: ALLTAR
-+
-+.INCLUDE : target.mk
-+
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
deleted file mode 100644
index 80f5bbd..0000000
--- a/hyphen/makefile.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=hyphen
-TARGET=hyphen
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=hyphen-2.7.1
-TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
-
-ADDITIONAL_FILES += makefile.mk
-
-PATCH_FILES= \
-    hyphen-2.7.1.patch \
-    hyphen-2.7.1-read-charset.patch
-
-.IF "$(GUI)"=="UNX"
-CONFIGURE_DIR=$(BUILD_DIR)
-
-#relative to CONFIGURE_DIR
-# still needed also in system-hyphen case as it creates the makefile
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS=--disable-shared
-
-.IF "$(OS)"!="IOS"
-CONFIGURE_FLAGS+= --with-pic
-.ENDIF
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-LCL_CONFIGURE_CFLAGS+=-m64
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-.IF "$(EXTRA_CFLAGS)"!=""
-LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
-CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
-CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
-.ENDIF
-
-.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
-.ENDIF
-
-.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
-BUILD_ACTION=make hyph_en_US.dic
-.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
-@all:
-    echo "Nothing to do here."
-.ELSE
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
-OUT2INC += hyphen.h 
-.ENDIF
-
-.ENDIF # "$(GUI)"=="UNX"
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
-
-BUILD_ACTION=make
-
-.ELSE
-BUILD_ACTION=dmake
-.ENDIF # "$(COM)"=="GCC"
-OUT2INC += hyphen.h
-.ENDIF # "$(GUI)"=="WNT"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst
deleted file mode 100644
index c953a57..0000000
--- a/hyphen/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-hyp     hyphen  :       soltools solenv NULL
-hyp     hyphen              usr1    -       all hyp_mkout NULL
-hyp     hyphen              nmake   -       all hyp_hyphen NULL
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
deleted file mode 100644
index 4758ed7..0000000
--- a/hyphen/prj/d.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-..\%__SRC%\slb\hyphen.lib     %_DEST%\lib\hyphen.lib
-
-..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h
-..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib\libhyphen.a
-..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic
diff --git a/icc/README b/icc/README
deleted file mode 100644
index 672371d..0000000
--- a/icc/README
+++ /dev/null
@@ -1,39 +0,0 @@
-Date: 2008-01-11
-
-This project is used to generate the ICC color
-profile needed in module vcl in order to export
-to PDF/A-1a.
-It's composed of a small application, which lurks in:
-
-icc/source/create_sRGB_profile
-
-That application links to a support library
-(icc/download/SampleICC-1.3.2), build at OOo
-build time.
-Finally, the application is run at OOo build time to
-generate the only file delivered to solver:
-sRGB-IEC61966-2.1.hxx.
-
-If you need to change the data into the ICC profile,
-please change the create_sRGB_profile.
-
-The library was downloaded from:
-http://sampleicc.sourceforge.net
-on 2007-08-23.
-
-For information on ICC profiles, you may want to visit:
-http://www.color.org
-
-Notes for porters
-=================
-the endianess and other platform specific configuration
-are in:
-
-<build>/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h
-
-The patchs:
-SampleICC-1.3.2.patch tweaks the build to use the endianness
-detected in sal.
-
-beppec56@openoffice.org
-
diff --git a/icc/SampleICC-1.3.2-fmtargs.patch b/icc/SampleICC-1.3.2-fmtargs.patch
deleted file mode 100644
index a7549a8..0000000
--- a/icc/SampleICC-1.3.2-fmtargs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp  2009-01-20 11:48:36.000000000 -0500
-+++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp     2009-01-19 14:41:23.000000000 -0500
-@@ -1155,7 +1155,7 @@
-
-   CIccInfo Info;
-   icChar buf[128];
--  sprintf(buf, Info.GetSigName(m_Header.deviceClass));
-+  sprintf(buf, "%s", Info.GetSigName(m_Header.deviceClass));
-   if (m_Header.deviceClass!=icSigInputClass && m_Header.deviceClass!=icSigDisplayClass) {
-     if (GetTag(icSigGrayTRCTag) || GetTag(icSigRedTRCTag) || GetTag(icSigGreenTRCTag) ||
-        GetTag(icSigBlueTRCTag) || GetTag(icSigRedColorantTag) || GetTag(icSigGreenColorantTag) ||
-@@ -1230,7 +1230,7 @@
-   for (i=m_Tags->begin(); i!=m_Tags->end(); i++) {
-     tagsig = i->TagInfo.sig;
-     typesig = i->pTag->GetType();
--    sprintf(buf, Info.GetSigName(tagsig));
-+    sprintf(buf, "%s", Info.GetSigName(tagsig));
-     if (!IsTypeValid(tagsig, typesig)) {
-       sReport += icValidateNonCompliantMsg;
-       sReport += buf;
diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
deleted file mode 100644
index 3371520..0000000
--- a/icc/SampleICC-1.3.2.patch
+++ /dev/null
@@ -1,5158 +0,0 @@
-*** misc/SampleICC-1.3.2/configure	Mon Aug 20 22:10:59 2007
---- misc/build/SampleICC-1.3.2/configure	Fri Jan 25 14:23:09 2008
-***************
-*** 19991,19997 ****
-  
-  
-  
-!                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile IccProfLib/Makefile Tools/Makefile Tools/CmdLine/Makefile Tools/CmdLine/IccApplyNamedCmm/Makefile Tools/CmdLine/IccApplyProfiles/Makefile Tools/CmdLine/IccDumpProfile/Makefile Tools/CmdLine/IccProfLibTest/Makefile Tools/CmdLine/IccStripUnknownTags/Makefile Tools/CmdLine/IccV4ToMPE/Makefile Contrib/Makefile Contrib/CmdLine/Makefile Contrib/CmdLine/create_CLUT_profile/Makefile Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile Contrib/CmdLine/create_display_profile/Makefile Contrib/ICC_utils/Makefile Contrib/Mac_OS_X/Makefile Contrib/Mac_OS_X/create_probe/Makefile Contrib/Mac_OS_X/extract_probe_data/Makefile Contrib/examples/Makefile Contrib/examples/RSR/Makefile Contrib/tests/Makefile Contrib/tests/flatten_AToB_tag/Makefile Contrib/tests/generate_device_codes/Makefile Contrib/tests/reconstruct_measurements/Makefile Contrib/tests/round_trip_PCS_LAB/Makefile"
-  cat >confcache <<\_ACEOF
-  # This file is a shell script that caches the results of configure
-  # tests run on this system so they can be shared between configure
---- 19991,19997 ----
-  
-  
-  
-!                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile IccProfLib/Makefile Tools/Makefile Tools/CmdLine/Makefile Tools/CmdLine/IccDumpProfile/Makefile Tools/CmdLine/IccProfLibTest/Makefile Tools/CmdLine/IccStripUnknownTags/Makefile Tools/CmdLine/IccV4ToMPE/Makefile Contrib/Makefile Contrib/CmdLine/Makefile Contrib/ICC_utils/Makefile Contrib/CmdLine/create_sRGB_profile/Makefile"
-  cat >confcache <<\_ACEOF
-  # This file is a shell script that caches the results of configure
-  # tests run on this system so they can be shared between configure
-***************
-*** 20571,20578 ****
-    "IccProfLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES IccProfLib/Makefile" ;;
-    "Tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/Makefile" ;;
-    "Tools/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/Makefile" ;;
--   "Tools/CmdLine/IccApplyNamedCmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyNamedCmm/Makefile" ;;
--   "Tools/CmdLine/IccApplyProfiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccApplyProfiles/Makefile" ;;
-    "Tools/CmdLine/IccDumpProfile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccDumpProfile/Makefile" ;;
-    "Tools/CmdLine/IccProfLibTest/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccProfLibTest/Makefile" ;;
-    "Tools/CmdLine/IccStripUnknownTags/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccStripUnknownTags/Makefile" ;;
---- 20571,20576 ----
-***************
-*** 20579,20598 ****
-    "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;;
-    "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;;
-    "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;;
-!   "Contrib/CmdLine/create_CLUT_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile/Makefile" ;;
-!   "Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_CLUT_profile_from_probe/Makefile" ;;
-!   "Contrib/CmdLine/create_display_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_display_profile/Makefile" ;;
-    "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;;
--   "Contrib/Mac_OS_X/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/Makefile" ;;
--   "Contrib/Mac_OS_X/create_probe/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/create_probe/Makefile" ;;
--   "Contrib/Mac_OS_X/extract_probe_data/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Mac_OS_X/extract_probe_data/Makefile" ;;
--   "Contrib/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/Makefile" ;;
--   "Contrib/examples/RSR/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/examples/RSR/Makefile" ;;
--   "Contrib/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/Makefile" ;;
--   "Contrib/tests/flatten_AToB_tag/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/flatten_AToB_tag/Makefile" ;;
--   "Contrib/tests/generate_device_codes/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/generate_device_codes/Makefile" ;;
--   "Contrib/tests/reconstruct_measurements/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/reconstruct_measurements/Makefile" ;;
--   "Contrib/tests/round_trip_PCS_LAB/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/tests/round_trip_PCS_LAB/Makefile" ;;
-    "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
---- 20577,20584 ----
-    "Tools/CmdLine/IccV4ToMPE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Tools/CmdLine/IccV4ToMPE/Makefile" ;;
-    "Contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/Makefile" ;;
-    "Contrib/CmdLine/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/Makefile" ;;
-!   "Contrib/CmdLine/create_sRGB_profile/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/CmdLine/create_sRGB_profile/Makefile" ;;
-    "Contrib/ICC_utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES Contrib/ICC_utils/Makefile" ;;
-    "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-*** misc/SampleICC-1.3.2/Contrib/Makefile.in	Mon Aug 20 22:10:37 2007
---- misc/build/SampleICC-1.3.2/Contrib/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 103,120 ****
-  
-  SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine \
-! 	examples \
-! 	Mac_OS_X \
-! 	tests
-  
-  
-  DIST_SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine \
-! 	examples \
-! 	Mac_OS_X \
-! 	tests
-  
-  subdir = Contrib
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 103,114 ----
-  
-  SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine
-  
-  
-  DIST_SUBDIRS = \
-  	ICC_utils \
-! 	CmdLine
-  
-  subdir = Contrib
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-*** misc/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Mon Aug 20 22:10:34 2007
---- misc/build/SampleICC-1.3.2/Contrib/CmdLine/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 102,116 ****
-  install_sh = @install_sh@
-  
-  SUBDIRS = \
-! 	create_CLUT_profile \
-! 	create_CLUT_profile_from_probe \
-! 	create_display_profile
-  
-  
-  DIST_SUBDIRS = \
-! 	create_CLUT_profile \
-! 	create_CLUT_profile_from_probe \
-! 	create_display_profile
-  
-  subdir = Contrib/CmdLine
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 102,112 ----
-  install_sh = @install_sh@
-  
-  SUBDIRS = \
-! 	create_sRGB_profile
-  
-  
-  DIST_SUBDIRS = \
-! 	create_sRGB_profile
-  
-  subdir = Contrib/CmdLine
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Mon Aug 20 22:10:35 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 133,139 ****
-  CONFIG_CLEAN_FILES =
-  LTLIBRARIES = $(lib_LTLIBRARIES)
-  
-! libICC_utils_la_LIBADD =
-  am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \
-  	ICC_tool_exception.lo Vetters.lo
-  libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
---- 133,139 ----
-  CONFIG_CLEAN_FILES =
-  LTLIBRARIES = $(lib_LTLIBRARIES)
-  
-! libICC_utils_la_LIBADD = $(LDADD)
-  am_libICC_utils_la_OBJECTS = Stubs.lo CAT.lo CLUT.lo CLUT_stuffer.lo \
-  	ICC_tool_exception.lo Vetters.lo
-  libICC_utils_la_OBJECTS = $(am_libICC_utils_la_OBJECTS)
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Mon Aug 20 22:04:53 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Stubs.h	Fri Jan 25 14:23:09 2008
-***************
-*** 130,136 ****
-  
-    // use one of these to force desired sort order in assoc. containers of DPX
-    bool
-!   DPX::operator<(const DPX& p) const
-    {
-      return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
-    }
---- 130,136 ----
-  
-    // use one of these to force desired sort order in assoc. containers of DPX
-    bool
-!   operator<(const DPX& p) const
-    {
-      return (r_ != p.r_) ? (r_ < p.r_) : ((g_ != p.g_) ? (g_ < p.g_) : (b_ < p.b_));
-    }
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Mon Aug 20 22:04:54 2007
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.cpp	Fri Jan 25 14:57:06 2008
-***************
-*** 1,322 ****
-! /*
-!  File:       Vetters.cpp
-!  
-!  Contains:   Utility functions to handle common argument-checking tasks, in a 
-!              way that hides platform-specific details from higher-level code.
-!  
-!  Version:    V1
-!  
-!  Copyright:  © see below
-!  */
-! 
-! /*
-!  * The ICC Software License, Version 0.1
-!  *
-!  *
-!  * Copyright (c) 2003-2006 The International Color Consortium. All rights 
-!  * reserved.
-!  *
-!  * Redistribution and use in source and binary forms, with or without
-!  * modification, are permitted provided that the following conditions
-!  * are met:
-!  *
-!  * 1. Redistributions of source code must retain the above copyright
-!  *    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
-!  *    the documentation and/or other materials provided with the
-!  *    distribution.
-!  *
-!  * 3. The end-user documentation included with the redistribution,
-!  *    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,
-!  *    if and wherever such third-party acknowledgments normally appear.
-!  *
-!  * 4. The names "ICC" and "The International Color Consortium" must
-!  *    not be used to imply that the ICC organization endorses or
-!  *    promotes products derived from this software without prior
-!  *    written permission. For written permission, please see
-!  *    <http://www.color.org/>.
-!  *
-!  *
-!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-!  * DISCLAIMED.  IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR
-!  * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-!  * SUCH DAMAGE.
-!  * ====================================================================
-!  *
-!  * This software consists of voluntary contributions made by many
-!  * individuals on behalf of the The International Color Consortium. 
-!  *
-!  *
-!  * Membership in the ICC is encouraged when this software is used for
-!  * commercial purposes. 
-!  *
-!  *  
-!  * For more information on The International Color Consortium, please
-!  * see <http://www.color.org/>.
-!  *  
-!  * 
-!  */
-! 
-! ////////////////////////////////////////////////////////////////////// 
-! // HISTORY:
-! //
-! // -Initial implementation by Joseph Goldstone sumer 2007
-! //
-! //////////////////////////////////////////////////////////////////////
-! 
-! #include "Vetters.h"
-! 
-! #include <sstream>
-! using namespace std;
-! 
-! #ifndef WIN32
-! #include <sys/errno.h>
-! #else
-! #include <string.h>
-! int strerror_r(int errnum, char *str, int strsize)
-! {
-!   const char *errstr = strerror(errnum);
-! 
-!   if (errstr) {
-!     strncpy(str, errstr, strsize);
-!     return 0;
-!   }
-! 
-!   return -1;
-! }
-! #define stat _stat
-! #endif
-! 
-! #include "ICC_tool_exception.h"
-! 
-! const char*
-! path_tail(const char* const s)
-! {
-!   const char* tail = strdup(s);
-!   const char* last_slash = strrchr(tail, '/');
-!   if (last_slash != NULL)
-!     tail = last_slash + 1;
-!   return tail;
-! }
-!     
-! void
-! vet_as_int(const char* const s, const string& name,
-!            const string& description)
-! {
-!   istringstream ss(s);
-!   int i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " an integer.  It should be an integer representing "
-!       << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_as_float(const char* const s, const string& name,
-!              const string& description)
-! {
-!   istringstream ss(s);
-!   float i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " a floating-point number.  It should be a floating-point number"
-!       << " representing " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! #define STRERROR_BUF_SIZE 256
-! off_t
-! get_size(const char* const s)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return sb.st_size;
-! }
-! 
-! bool
-! check_mode(const char* const s, mode_t mode)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return (sb.st_mode & mode) != 0;
-! }
-! 
-! bool
-! is_existent_file_pathname(const char* const s)
-! {
-!   struct stat sb;
-!   return stat(s, &sb) == 0;
-! }
-! 
-! bool
-! is_plain_file_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IFREG);
-! }
-! 
-! bool
-! is_directory(const char* const s)
-! {
-!   return check_mode(s, S_IFDIR);
-! }
-! 
-! const char* const
-! containing_directory(const char* const s)
-! {
-!   if (strlen(s) == 0)
-!     throw ICC_tool_exception("name of directory passed to containing_directory"
-!                              " function was zero-length.");
-!   char* tmp = strdup(s);
-!   // lop off any trailing seperator
-!   if (tmp[strlen(tmp) - 1] == '/')
-!     tmp[strlen(tmp) - 1] = 0;
-!   if (strlen(tmp) == 0)
-!     throw ICC_tool_exception("root directory (which has no containing"
-!                              " directory) passed to containing_directory"
-!                              " function");
-!   char* idx = strrchr(tmp, '/');
-!   if (idx != NULL)
-!   {
-!     *idx = 0;
-!     return tmp;
-!   }
-!   char* current_directory = getenv("PWD");
-!   if (current_directory == NULL)
-!     throw ICC_tool_exception("pathname passed to containing_directory has no"
-!                              " embedded seperator, and there is no value for"
-!                              " PWD defined in the environment");
-!   return strdup(current_directory);
-! }
-! 
-! bool
-! is_readable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IRUSR)
-!   || check_mode(s, S_IRGRP)
-!   || check_mode(s, S_IROTH);
-! }
-! 
-! bool
-! is_writable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IWUSR)
-!   || check_mode(s, S_IWGRP)
-!   || check_mode(s, S_IWOTH);
-! }
-! 
-! bool
-! is_pathname_of_empty_file(const char* const s)
-! {
-!   return get_size(s) > 0;
-! }
-! 
-! void
-! vet_input_file_pathname(const char* const s, const string& name,
-!                         const string& description)
-! {
-!   if (! is_plain_file_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a plain file (i.e. it is the pathname of a directory, or of a"
-!       << " symbolic link, or of some other sort of special file.)  It should be"
-!       << " " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_readable_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a readable file (i.e. you do not have permission to read that"
-!       << " file, or you do not have permission to read some directory"
-!       << " containing that file.";
-!       throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_pathname_of_empty_file(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of an existing readable file, but that file is of zero length."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_output_file_pathname(const char* const s, const string& name,
-!                          const string& description,
-!                          bool silent_overwrite_OK)
-! {
-!   const char* const container = containing_directory(s);
-!   if (! is_writable_pathname(container))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', has a directory"
-!       << " component which is not writable."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (is_existent_file_pathname(s))
-!   {
-!     if (is_plain_file_pathname(s))
-!       if (is_writable_pathname(s))
-!       {
-!         if (! silent_overwrite_OK)
-!         {
-!           ostringstream oss;
-!           oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!             << " file."
-!             << " The argument should be " << description << ".";
-!           throw ICC_tool_exception(oss.str());
-!         }
-!       } else {
-!         ostringstream oss;
-!         oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!           << " file which is not writable."
-!           << " The argument should be " << description << ".";
-!         throw ICC_tool_exception(oss.str());
-!       }
-!   }
-! }
---- 1,325 ----
-! /*
-!  File:       Vetters.cpp
-!  
-!  Contains:   Utility functions to handle common argument-checking tasks, in a 
-!              way that hides platform-specific details from higher-level code.
-!  
-!  Version:    V1
-!  
-!  Copyright:  © see below
-!  */
-! 
-! /*
-!  * The ICC Software License, Version 0.1
-!  *
-!  *
-!  * Copyright (c) 2003-2006 The International Color Consortium. All rights 
-!  * reserved.
-!  *
-!  * Redistribution and use in source and binary forms, with or without
-!  * modification, are permitted provided that the following conditions
-!  * are met:
-!  *
-!  * 1. Redistributions of source code must retain the above copyright
-!  *    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
-!  *    the documentation and/or other materials provided with the
-!  *    distribution.
-!  *
-!  * 3. The end-user documentation included with the redistribution,
-!  *    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,
-!  *    if and wherever such third-party acknowledgments normally appear.
-!  *
-!  * 4. The names "ICC" and "The International Color Consortium" must
-!  *    not be used to imply that the ICC organization endorses or
-!  *    promotes products derived from this software without prior
-!  *    written permission. For written permission, please see
-!  *    <http://www.color.org/>.
-!  *
-!  *
-!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-!  * DISCLAIMED.  IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR
-!  * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-!  * SUCH DAMAGE.
-!  * ====================================================================
-!  *
-!  * This software consists of voluntary contributions made by many
-!  * individuals on behalf of the The International Color Consortium. 
-!  *
-!  *
-!  * Membership in the ICC is encouraged when this software is used for
-!  * commercial purposes. 
-!  *
-!  *  
-!  * For more information on The International Color Consortium, please
-!  * see <http://www.color.org/>.
-!  *  
-!  * 
-!  */
-! 
-! ////////////////////////////////////////////////////////////////////// 
-! // HISTORY:
-! //
-! // -Initial implementation by Joseph Goldstone sumer 2007
-! //
-! //////////////////////////////////////////////////////////////////////
-! 
-! #include "Vetters.h"
-! 
-! #include <sstream>
-! using namespace std;
-! 
-! #ifndef WIN32
-! #include <errno.h>
-! #else
-! #include <string.h>
-! #define stat _stat
-! #endif
-! 
-! #if defined WIN32 || defined sun
-! int strerror_r(int errnum, char *str, int strsize)
-! {
-!   const char *errstr = strerror(errnum);
-! 
-!   if (errstr) {
-!     strncpy(str, errstr, strsize);
-!     return 0;
-!   }
-! 
-!   return -1;
-! }
-! #endif
-! 
-! #include "ICC_tool_exception.h"
-! 
-! const char*
-! path_tail(const char* const s)
-! {
-!   const char* tail = strdup(s);
-!   const char* last_slash = strrchr(tail, '/');
-!   if (last_slash != NULL)
-!     tail = last_slash + 1;
-!   return tail;
-! }
-!     
-! void
-! vet_as_int(const char* const s, const string& name,
-!            const string& description)
-! {
-!   istringstream ss(s);
-!   int i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " an integer.  It should be an integer representing "
-!       << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_as_float(const char* const s, const string& name,
-!              const string& description)
-! {
-!   istringstream ss(s);
-!   float i;
-!   ss >> i;
-!   if (ss.fail())
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', cannot be parsed as"
-!       << " a floating-point number.  It should be a floating-point number"
-!       << " representing " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! #define STRERROR_BUF_SIZE 256
-! off_t
-! get_size(const char* const s)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return sb.st_size;
-! }
-! 
-! bool
-! check_mode(const char* const s, mode_t mode)
-! { 
-!   struct stat sb;
-!   int stat_returned = stat(s, &sb);
-!   if (stat_returned < 0)
-!   {
-!     int stat_errno = errno;
-!     char strerror_buf[STRERROR_BUF_SIZE];
-!     strerror_r(stat_errno, strerror_buf, STRERROR_BUF_SIZE);
-!     ostringstream oss;
-!     oss << "Could not access information for file `" << s << "': "
-!       << strerror_buf;
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   return (sb.st_mode & mode) != 0;
-! }
-! 
-! bool
-! is_existent_file_pathname(const char* const s)
-! {
-!   struct stat sb;
-!   return stat(s, &sb) == 0;
-! }
-! 
-! bool
-! is_plain_file_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IFREG);
-! }
-! 
-! bool
-! is_directory(const char* const s)
-! {
-!   return check_mode(s, S_IFDIR);
-! }
-! 
-! const char* const
-! containing_directory(const char* const s)
-! {
-!   if (strlen(s) == 0)
-!     throw ICC_tool_exception("name of directory passed to containing_directory"
-!                              " function was zero-length.");
-!   char* tmp = strdup(s);
-!   // lop off any trailing seperator
-!   if (tmp[strlen(tmp) - 1] == '/')
-!     tmp[strlen(tmp) - 1] = 0;
-!   if (strlen(tmp) == 0)
-!     throw ICC_tool_exception("root directory (which has no containing"
-!                              " directory) passed to containing_directory"
-!                              " function");
-!   char* idx = strrchr(tmp, '/');
-!   if (idx != NULL)
-!   {
-!     *idx = 0;
-!     return tmp;
-!   }
-!   char* current_directory = getenv("PWD");
-!   if (current_directory == NULL)
-!     throw ICC_tool_exception("pathname passed to containing_directory has no"
-!                              " embedded seperator, and there is no value for"
-!                              " PWD defined in the environment");
-!   return strdup(current_directory);
-! }
-! 
-! bool
-! is_readable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IRUSR)
-!   || check_mode(s, S_IRGRP)
-!   || check_mode(s, S_IROTH);
-! }
-! 
-! bool
-! is_writable_pathname(const char* const s)
-! {
-!   return check_mode(s, S_IWUSR)
-!   || check_mode(s, S_IWGRP)
-!   || check_mode(s, S_IWOTH);
-! }
-! 
-! bool
-! is_pathname_of_empty_file(const char* const s)
-! {
-!   return get_size(s) > 0;
-! }
-! 
-! void
-! vet_input_file_pathname(const char* const s, const string& name,
-!                         const string& description)
-! {
-!   if (! is_plain_file_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a plain file (i.e. it is the pathname of a directory, or of a"
-!       << " symbolic link, or of some other sort of special file.)  It should be"
-!       << " " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_readable_pathname(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of a readable file (i.e. you do not have permission to read that"
-!       << " file, or you do not have permission to read some directory"
-!       << " containing that file.";
-!       throw ICC_tool_exception(oss.str());
-!   }
-!   if (! is_pathname_of_empty_file(s))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', is not the pathname"
-!       << " of an existing readable file, but that file is of zero length."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-! }
-! 
-! void
-! vet_output_file_pathname(const char* const s, const string& name,
-!                          const string& description,
-!                          bool silent_overwrite_OK)
-! {
-!   const char* const container = containing_directory(s);
-!   if (! is_writable_pathname(container))
-!   {
-!     ostringstream oss;
-!     oss << "The " << name << " argument given, `" << s << "', has a directory"
-!       << " component which is not writable."
-!       << " The argument should be " << description << ".";
-!     throw ICC_tool_exception(oss.str());
-!   }
-!   if (is_existent_file_pathname(s))
-!   {
-!     if (is_plain_file_pathname(s))
-!       if (is_writable_pathname(s))
-!       {
-!         if (! silent_overwrite_OK)
-!         {
-!           ostringstream oss;
-!           oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!             << " file."
-!             << " The argument should be " << description << ".";
-!           throw ICC_tool_exception(oss.str());
-!         }
-!       } else {
-!         ostringstream oss;
-!         oss << "The " << name << " argument given, `" << s << "' is of an existing"
-!           << " file which is not writable."
-!           << " The argument should be " << description << ".";
-!         throw ICC_tool_exception(oss.str());
-!       }
-!   }
-! }
-*** misc/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 78,84 ****
-  #include "IccIO.h"
-  #include "IccUtil.h"
-  #include <stdlib.h>
-! #include <memory.h>
-  #include <string.h>
-  
-  #ifndef __max
---- 78,84 ----
-  #include "IccIO.h"
-  #include "IccUtil.h"
-  #include <stdlib.h>
-! #include <memory>
-  #include <string.h>
-  
-  #ifndef __max
-*** misc/SampleICC-1.3.2/IccProfLib/IccIO.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccIO.h	Fri Jan 25 14:23:09 2008
-***************
-*** 79,84 ****
---- 79,85 ----
-  #define _ICCIO_H
-  
-  #include "IccDefs.h"
-+ #include "memory"
-  #include "stdio.h"
-  
-  #ifdef USESAMPLEICCNAMESPACE
-*** misc/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeACS.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 136,152 ****
-    icChar sigBuf[30];
-  
-    if (GetBAcsSig())
-!     sDescription += "ELEM_bACS\r\n";
-    else
-!     sDescription += "ELEM_eACS\r\n";
-  
-    icGetSig(sigBuf, m_signature);
-    sDescription += "  Signature = ";
-    sDescription += sigBuf;
-!   sDescription += "\r\n";
-  
-    if (m_pData) {
-!     sDescription += "\r\nData Follows:\r\n";
-  
-      icMemDump(sDescription, m_pData, m_nDataSize);
-    }
---- 136,152 ----
-    icChar sigBuf[30];
-  
-    if (GetBAcsSig())
-!     sDescription += "ELEM_bACS\n";
-    else
-!     sDescription += "ELEM_eACS\n";
-  
-    icGetSig(sigBuf, m_signature);
-    sDescription += "  Signature = ";
-    sDescription += sigBuf;
-!   sDescription += "\n";
-  
-    if (m_pData) {
-!     sDescription += "\nData Follows:\n";
-  
-      icMemDump(sDescription, m_pData, m_nDataSize);
-    }
-*** misc/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccMpeBasic.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 218,249 ****
-    sprintf(buf, "%.8f", m_endPoint);
-    sDescription += buf;
-    }
-!   sprintf(buf, "]\r\nFunctionType: %04Xh\r\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-    case 0x0000:
-      if (m_params[1]==0.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f\r\n\r\n", m_params[3]);
-      else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-!       sprintf(buf, "Y = X\r\n\r\n");
-      else if (m_params[0]==1.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f * X + %.8f\r\n\r\n", 
-                m_params[1], m_params[3]);
-      else
-!       sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\r\n\r\n", 
-                m_params[1], m_params[2], m_params[0], m_params[3]);
-      sDescription += buf;
-      return;
-  
-    case 0x0001:
-!     sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f)  + %.8f) + %.8f\r\n\r\n",
-              m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
-  
-    case 0x0002:
-!     sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\r\n\r\n",
-              m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
---- 218,249 ----
-    sprintf(buf, "%.8f", m_endPoint);
-    sDescription += buf;
-    }
-!   sprintf(buf, "]\nFunctionType: %04Xh\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-    case 0x0000:
-      if (m_params[1]==0.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f\n\n", m_params[3]);
-      else if (m_params[0]==1.0 && m_params[1]==1.0 && m_params[2]==0.0 && m_params[3]==0.0)
-!       sprintf(buf, "Y = X\n\n");
-      else if (m_params[0]==1.0 && m_params[2]==0.0)
-!       sprintf(buf, "Y = %.8f * X + %.8f\n\n", 
-                m_params[1], m_params[3]);
-      else
-!       sprintf(buf, "Y = (%.8f * X + %.8f)^%.4f + %.8f\n\n", 
-                m_params[1], m_params[2], m_params[0], m_params[3]);
-      sDescription += buf;
-      return;
-  
-    case 0x0001:
-!     sprintf(buf, "Y = %.8f * log (%.8f * (X ^ %.8f)  + %.8f) + %.8f\n\n",
-              m_params[1], m_params[2], m_params[0], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
-  
-    case 0x0002:
-!     sprintf(buf, "Y = %.8f * (%.8f ^ (%.8f * X + %.8f)) + %.8f\n\n",
-              m_params[0], m_params[1], m_params[2], m_params[3], m_params[4]);
-      sDescription += buf;
-      return;
-***************
-*** 250,260 ****
-  
-    default:
-      int i;
-!     sprintf(buf, "Unknown Function with %d parameters:\r\n\r\n", m_nParameters);
-      sDescription += buf;
-  
-      for (i=0; i<m_nParameters; i++) {
-!       sprintf(buf, "Param[%d] = %.8lf\r\n\r\n", i, m_params[i]);
-        sDescription += buf;
-      }
-    }
---- 250,260 ----
-  
-    default:
-      int i;
-!     sprintf(buf, "Unknown Function with %d parameters:\n\n", m_nParameters);
-      sDescription += buf;
-  
-      for (i=0; i<m_nParameters; i++) {
-!       sprintf(buf, "Param[%d] = %.8lf\n\n", i, m_params[i]);
-        sDescription += buf;
-      }
-    }
-***************
-*** 496,502 ****
-    if (m_nReserved || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " formula curve has non zero reserved data.\r\n";
-      rv = icValidateWarning;
-    }
-  
---- 496,502 ----
-    if (m_nReserved || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " formula curve has non zero reserved data.\n";
-      rv = icValidateWarning;
-    }
-  
-***************
-*** 505,517 ****
-      if (!m_params || m_nParameters<4) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 4) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
-        rv = icValidateWarning;
-      }
-      break;
---- 505,517 ----
-      if (!m_params || m_nParameters<4) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 4) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\n";
-        rv = icValidateWarning;
-      }
-      break;
-***************
-*** 520,532 ****
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
-        rv = icValidateWarning;
-      }
-      break;
---- 520,532 ----
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\n";
-        rv = icValidateWarning;
-      }
-      break;
-***************
-*** 535,547 ****
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\r\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\r\n";
-        rv = icValidateWarning;
-      }
-      break;
---- 535,547 ----
-      if (!m_params || m_nParameters<5) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has Invalid formulaCurveSegment parameters.\n";
-        rv = icValidateCriticalError;
-      }
-      else if (m_nParameters > 5) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " formula curve has too many formulaCurveSegment parameters.\n";
-        rv = icValidateWarning;
-      }
-      break;
-***************
-*** 551,557 ****
-        icChar buf[128];
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\r\n", m_nFunctionType);
-        sReport += buf;
-        rv = icValidateCriticalError;
-      }
---- 551,557 ----
-        icChar buf[128];
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sprintf(buf, " formula curve uses unknown formulaCurveSegment function type %d\n", m_nFunctionType);
-        sReport += buf;
-        rv = icValidateCriticalError;
-      }
-***************
-*** 727,733 ****
-      sDescription += buf;
-      }
-  
-!     sprintf(buf, "]\r\n");
-      sDescription += buf;
-    }
-    else {
---- 727,733 ----
-      sDescription += buf;
-      }
-  
-!     sprintf(buf, "]\n");
-      sDescription += buf;
-    }
-    else {
-***************
-*** 744,752 ****
-      sprintf(buf, "%.8f", m_endPoint);
-      sDescription += buf;
-      }
-!     sprintf(buf, "]\r\n");
-      sDescription += buf;
-!     sDescription += "IN  OUT\r\n";
-  
-      icUInt32Number i;
-  
---- 744,752 ----
-      sprintf(buf, "%.8f", m_endPoint);
-      sDescription += buf;
-      }
-!     sprintf(buf, "]\n");
-      sDescription += buf;
-!     sDescription += "IN  OUT\n";
-  
-      icUInt32Number i;
-  
-***************
-*** 754,764 ****
-      icFloatNumber last = (icFloatNumber)(m_nCount-1);
-  
-      for (i=0; i<m_nCount; i++) {
-!       sprintf(buf, "%.8f %.8f\r\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\r\n";
-  }
-  
-  /**
---- 754,764 ----
-      icFloatNumber last = (icFloatNumber)(m_nCount-1);
-  
-      for (i=0; i<m_nCount; i++) {
-!       sprintf(buf, "%.8f %.8f\n", m_startPoint + (icFloatNumber)i*range/last, m_pSamples[i]);
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\n";
-  }
-  
-  /**
-***************
-*** 910,916 ****
-    if (m_nReserved) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has non zero reserved data.\r\n";
-      rv = icValidateWarning;
-    }
-  
---- 910,916 ----
-    if (m_nReserved) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has non zero reserved data.\n";
-      rv = icValidateWarning;
-    }
-  
-***************
-*** 917,929 ****
-    if (m_nCount<2) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has too few sample points.\r\n";
-      rv = icValidateCriticalError;
-    }
-    else if (m_endPoint-m_startPoint == 0.0) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has a range of zero.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 917,929 ----
-    if (m_nCount<2) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has too few sample points.\n";
-      rv = icValidateCriticalError;
-    }
-    else if (m_endPoint-m_startPoint == 0.0) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " sampled curve has a range of zero.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 1054,1060 ****
-  {
-    CIccCurveSegmentList::iterator i;
-  
-!   sDescription += "BEGIN_CURVE\r\n";
-    for (i=m_list->begin(); i!=m_list->end(); i++) {
-      (*i)->Describe(sDescription);
-    }
---- 1054,1060 ----
-  {
-    CIccCurveSegmentList::iterator i;
-  
-!   sDescription += "BEGIN_CURVE\n";
-    for (i=m_list->begin(); i!=m_list->end(); i++) {
-      (*i)->Describe(sDescription);
-    }
-***************
-*** 1342,1348 ****
-    if (m_nReserved1 || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " Segmented curve has non zero reserved data.\r\n";
-      rv = icValidateWarning;
-    }
-  
---- 1342,1348 ----
-    if (m_nReserved1 || m_nReserved2) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " Segmented curve has non zero reserved data.\n";
-      rv = icValidateWarning;
-    }
-  
-***************
-*** 1349,1355 ****
-    if (m_list->size()==0) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Has Empty CurveSegment!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1349,1355 ----
-    if (m_list->size()==0) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Has Empty CurveSegment!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 1599,1609 ****
-      icChar buf[81];
-      int i;
-  
-!     sprintf(buf, "BEGIN_CURVE_SET %d\r\n", m_nInputChannels);
-      sDescription += buf;
-  
-      for (i=0; i<m_nInputChannels; i++) {
-!       sprintf(buf, "Curve %d of %d\r\n", i+1, m_nInputChannels);
-        sDescription += buf;
-        if (m_curve[i]) {
-          m_curve[i]->Describe(sDescription);
---- 1599,1609 ----
-      icChar buf[81];
-      int i;
-  
-!     sprintf(buf, "BEGIN_CURVE_SET %d\n", m_nInputChannels);
-      sDescription += buf;
-  
-      for (i=0; i<m_nInputChannels; i++) {
-!       sprintf(buf, "Curve %d of %d\n", i+1, m_nInputChannels);
-        sDescription += buf;
-        if (m_curve[i]) {
-          m_curve[i]->Describe(sDescription);
-***************
-*** 1877,1883 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Curve Element(s)!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1877,1883 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Curve Element(s)!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 2042,2048 ****
-    int i, j;
-    icFloatNumber *data = m_pMatrix;
-  
-!   sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\r\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-  
-    for (j=0; j<m_nOutputChannels; j++) {
---- 2042,2048 ----
-    int i, j;
-    icFloatNumber *data = m_pMatrix;
-  
-!   sprintf(buf, "BEGIN_ELEM_MATRIX %d %d\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-  
-    for (j=0; j<m_nOutputChannels; j++) {
-***************
-*** 2052,2058 ****
-        sprintf(buf, "%12.8lf", data[i]);
-        sDescription += buf;
-      }
-!     sprintf(buf, "  +  %12.8lf\r\n", m_pConstants[j]);
-      sDescription += buf;
-      data += i;
-    }
---- 2052,2058 ----
-        sprintf(buf, "%12.8lf", data[i]);
-        sDescription += buf;
-      }
-!     sprintf(buf, "  +  %12.8lf\n", m_pConstants[j]);
-      sDescription += buf;
-      data += i;
-    }
-***************
-*** 2273,2279 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Matrix data!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 2273,2279 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has Empty Matrix data!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 2620,2626 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has No CLUT!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 2620,2626 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " Has No CLUT!\n";
-      return icValidateCriticalError;
-    }
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Fri Jan 25 14:23:09 2008
-***************
-*** 87,93 ****
-  #endif
-  
-  //PC, visual C++
-! #if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)
-  
-    //Define how 64 bit integers are represented
-    #define ICCUINT64 unsigned __int64
---- 87,93 ----
-  #endif
-  
-  //PC, visual C++
-! #if defined(_MSC_VER) && !defined(__MWERKS__)
-  
-    //Define how 64 bit integers are represented
-    #define ICCUINT64 unsigned __int64
-*** 107,126 ****
-  
-  #else // non-PC, perhaps Mac or Linux
-  
-!   #define ICCUINT64 unsigned long long
-!   #define ICCINT64  long long
-!   #define ICUINT64TYPE unsigned long long
-!   #define ICINT64TYPE long long
-! 
-!   #if defined(__APPLE__)
-!     #if  defined(__LITTLE_ENDIAN__)
-!       #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-!     #else
-!       #define ICC_BYTE_ORDER_BIG_ENDIAN
-!     #endif
-!   #else
-!     #define ICC_BYTE_ORDER_LITTLE_ENDIAN
-!   #endif
-  
-    #define ICCPROFLIB_API
-    #define ICCPROFLIB_EXTERN
---- 107,129 ----
-  
-  #else // non-PC, perhaps Mac or Linux
-  
-! #include <sal/types.h>
-! #include <osl/endian.h>
-! 
-!   #define ICCUINT64 sal_uInt64
-!   #define ICCINT64 sal_Int64
-!   #define ICUINT64TYPE sal_uInt64
-!   #define ICINT64TYPE sal_Int64
-!   #define ICINT32TYPE sal_Int32
-!   #define ICUINT32TYPE sal_uInt32
-! 
-! #if defined(_LITTLE_ENDIAN)
-! #    define ICC_BYTE_ORDER_LITTLE_ENDIAN
-! #elif defined(_BIG_ENDIAN)
-! #    define ICC_BYTE_ORDER_BIG_ENDIAN
-! #else
-! #    error "ENDIAN unknown"
-! #endif
-  
-    #define ICCPROFLIB_API
-    #define ICCPROFLIB_EXTERN
-*** misc/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccProfile.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 567,573 ****
-  
-    if (!ReadBasic(pIO)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += " - Unable to read profile!**\r\n\tProfile has invalid structure!\r\n";
-      Cleanup();
-  
-      return icValidateCriticalError;
---- 567,573 ----
-  
-    if (!ReadBasic(pIO)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += " - Unable to read profile!**\n\tProfile has invalid structure!\n";
-      Cleanup();
-  
-      return icValidateCriticalError;
-***************
-*** 576,582 ****
-    // Check profile header
-    if (!CheckFileSize(pIO)) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += "Bad Header File Size\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 576,582 ----
-    // Check profile header
-    if (!CheckFileSize(pIO)) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += "Bad Header File Size\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 588,594 ****
-      CalcProfileID(pIO, &profileID);
-      if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
-        sReport += icValidateNonCompliantMsg;
-!       sReport += "Bad Profile ID\r\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 588,594 ----
-      CalcProfileID(pIO, &profileID);
-      if (strncmp((char*)profileID.ID8, (char*)m_Header.profileID.ID8, 16) != 0) {
-        sReport += icValidateNonCompliantMsg;
-!       sReport += "Bad Profile ID\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 601,607 ****
-        sReport += icValidateCriticalErrorMsg;
-        sReport += " - ";
-        sReport += Info.GetTagSigName(i->TagInfo.sig);
-!       sReport += " - Tag has invalid structure!\r\n";
-  
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
---- 601,607 ----
-        sReport += icValidateCriticalErrorMsg;
-        sReport += " - ";
-        sReport += Info.GetTagSigName(i->TagInfo.sig);
-!       sReport += " - Tag has invalid structure!\n";
-  
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-***************
-*** 1026,1032 ****
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown profile class!\r\n", Info.GetProfileClassSigName(m_Header.deviceClass));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
---- 1026,1032 ----
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown profile class!\n", Info.GetProfileClassSigName(m_Header.deviceClass));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-***************
-*** 1033,1039 ****
-  
-    if (!Info.IsValidSpace(m_Header.colorSpace)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown color space!\r\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
---- 1033,1039 ----
-  
-    if (!Info.IsValidSpace(m_Header.colorSpace)) {
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown color space!\n", Info.GetColorSpaceSigName(m_Header.colorSpace));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-***************
-*** 1041,1047 ****
-    if (m_Header.deviceClass==icSigLinkClass) {
-      if (!Info.IsValidSpace(m_Header.pcs)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Unknown pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
---- 1041,1047 ----
-    if (m_Header.deviceClass==icSigLinkClass) {
-      if (!Info.IsValidSpace(m_Header.pcs)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Unknown pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-***************
-*** 1049,1055 ****
-    else {
-      if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Invalid pcs color space!\r\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
---- 1049,1055 ----
-    else {
-      if (m_Header.pcs!=icSigXYZData && m_Header.pcs!=icSigLabData) {
-        sReport += icValidateCriticalErrorMsg;
-!       sprintf(buf, " - %s: Invalid pcs color space!\n", Info.GetColorSpaceSigName(m_Header.pcs));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-***************
-*** 1068,1074 ****
-    
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unknown platform signature.\r\n", Info.GetPlatformSigName(m_Header.platform));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1068,1074 ----
-    
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unknown platform signature.\n", Info.GetPlatformSigName(m_Header.platform));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1095,1101 ****
-  
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unregisterd CMM signature.\r\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1095,1101 ----
-  
-    default:
-      sReport += icValidateWarningMsg;
-!     sprintf(buf, " - %s: Unregistered CMM signature.\n", Info.GetCmmSigName((icCmmSignature)m_Header.cmmId));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1109,1115 ****
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown rendering intent!\r\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
---- 1109,1115 ----
-  
-    default:
-      sReport += icValidateCriticalErrorMsg;
-!     sprintf(buf, " - %s: Unknown rendering intent!\n", Info.GetRenderingIntentName((icRenderingIntent)m_Header.renderingIntent));
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-***************
-*** 1120,1126 ****
-    icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
-    if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Non D50 Illuminant XYZ values.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 1120,1126 ----
-    icFloatNumber Z = icFtoD(m_Header.illuminant.Z);
-    if (X<0.9640 || X>0.9644 || Y!=1.0 || Z<0.8247 || Z>0.8251) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Non D50 Illuminant XYZ values.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 1130,1136 ****
-    }
-    if (sum) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Reserved value must be zero.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 1130,1136 ----
-    }
-    if (sum) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - Reserved value must be zero.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 1163,1169 ****
-      {
-        sReport += icValidateWarningMsg;
-        sReport += buf;
-!       sReport += " - Tag exclusion test failed.\r\n";
-        rv = false;
-      }
-    }
---- 1163,1169 ----
-      {
-        sReport += icValidateWarningMsg;
-        sReport += buf;
-!       sReport += " - Tag exclusion test failed.\n";
-        rv = false;
-      }
-    }
-***************
-*** 1177,1183 ****
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\r\n";
-          rv = false;
-        }
-        break;
---- 1177,1183 ----
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\n";
-          rv = false;
-        }
-        break;
-***************
-*** 1192,1198 ****
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\r\n";
-          rv = false;
-        }
-        break;
---- 1192,1198 ----
-        {
-          sReport += icValidateWarningMsg;
-          sReport += buf;
-!         sReport += " - Tag exclusion test failed.\n";
-          rv = false;
-        }
-        break;
-***************
-*** 1234,1240 ****
-      if (!IsTypeValid(tagsig, typesig)) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += buf;
-!       sprintf(buf," - %s: Invalid tag type (Might be critical!).\r\n", Info.GetTagTypeSigName(typesig));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 1234,1240 ----
-      if (!IsTypeValid(tagsig, typesig)) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += buf;
-!       sprintf(buf," - %s: Invalid tag type (Might be critical!).\n", Info.GetTagTypeSigName(typesig));
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 1477,1483 ****
-  {
-    if (m_Tags->size() <= 0) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += "No tags present.\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1477,1483 ----
-  {
-    if (m_Tags->size() <= 0) {
-      sReport += icValidateCriticalErrorMsg;
-!     sReport += "No tags present.\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 1486,1492 ****
-    if (!GetTag(icSigProfileDescriptionTag) ||
-       !GetTag(icSigCopyrightTag)) {
-         sReport += icValidateNonCompliantMsg;
-!        sReport += "Required tags missing.\r\n";
-         rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-    
---- 1486,1492 ----
-    if (!GetTag(icSigProfileDescriptionTag) ||
-       !GetTag(icSigCopyrightTag)) {
-         sReport += icValidateNonCompliantMsg;
-!        sReport += "Required tags missing.\n";
-         rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-    
-***************
-*** 1495,1501 ****
-    if (sig != icSigLinkClass) {
-      if (!GetTag(icSigMediaWhitePointTag)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Media white point tag missing.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-    }
---- 1495,1501 ----
-    if (sig != icSigLinkClass) {
-      if (!GetTag(icSigMediaWhitePointTag)) {
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Media white point tag missing.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-    }
-***************
-*** 1505,1511 ****
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
---- 1505,1511 ----
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
-***************
-*** 1515,1521 ****
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\r\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
---- 1515,1521 ----
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
-***************
-*** 1526,1532 ****
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
---- 1526,1532 ----
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
-***************
-*** 1536,1542 ****
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\r\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
---- 1536,1542 ----
-               !GetTag(icSigBlueMatrixColumnTag) || !GetTag(icSigRedTRCTag) ||
-               !GetTag(icSigGreenTRCTag) || !GetTag(icSigBlueTRCTag)) {
-                 sReport += icValidateCriticalErrorMsg;
-!                sReport += "Critical tag(s) missing.\n";
-                 rv = icMaxStatus(rv, icValidateCriticalError);
-               }
-          }
-***************
-*** 1547,1553 ****
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
---- 1547,1553 ----
-        if (m_Header.colorSpace == icSigGrayData) {
-          if (!GetTag(icSigGrayTRCTag)) {
-            sReport += icValidateCriticalErrorMsg;
-!           sReport += "Gray TRC tag missing.\n";
-            rv = icMaxStatus(rv, icValidateCriticalError);
-          }
-        }
-***************
-*** 1556,1568 ****
-             !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
-             !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
-               sReport += icValidateCriticalErrorMsg;
-!              sReport += "Critical tag(s) missing.\r\n";
-               rv = icMaxStatus(rv, icValidateCriticalError);
-             }
-  
-          if (!GetTag(icSigGamutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Gamut tag missing.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-  
---- 1556,1568 ----
-             !GetTag(icSigAToB1Tag) || !GetTag(icSigBToA1Tag) ||
-             !GetTag(icSigAToB2Tag) || !GetTag(icSigBToA2Tag)) {
-               sReport += icValidateCriticalErrorMsg;
-!              sReport += "Critical tag(s) missing.\n";
-               rv = icMaxStatus(rv, icValidateCriticalError);
-             }
-  
-          if (!GetTag(icSigGamutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Gamut tag missing.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-  
-***************
-*** 1585,1591 ****
-              case icSig16colorData:
-                if (!GetTag(icSigColorantTableTag)) {
-                  sReport += icValidateNonCompliantMsg;
-!                 sReport += "xCLR output profile is missing colorantTableTag\r\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-  
---- 1585,1591 ----
-              case icSig16colorData:
-                if (!GetTag(icSigColorantTableTag)) {
-                  sReport += icValidateNonCompliantMsg;
-!                 sReport += "xCLR output profile is missing colorantTableTag\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-  
-***************
-*** 1599,1605 ****
-      case icSigLinkClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 1599,1605 ----
-      case icSigLinkClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigProfileSequenceDescTag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 1606,1612 ****
-        if (icIsSpaceCLR(m_Header.colorSpace)) {
-          if (!GetTag(icSigColorantTableTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
---- 1606,1612 ----
-        if (icIsSpaceCLR(m_Header.colorSpace)) {
-          if (!GetTag(icSigColorantTableTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
-***************
-*** 1614,1620 ****
-        if (icIsSpaceCLR(m_Header.pcs)) {
-          if (!GetTag(icSigColorantTableOutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
---- 1614,1620 ----
-        if (icIsSpaceCLR(m_Header.pcs)) {
-          if (!GetTag(icSigColorantTableOutTag)) {
-            sReport += icValidateNonCompliantMsg;
-!           sReport += "Required tag(s) missing.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-        }
-***************
-*** 1623,1629 ****
-      case icSigColorSpaceClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
---- 1623,1629 ----
-      case icSigColorSpaceClass:
-        if (!GetTag(icSigAToB0Tag) || !GetTag(icSigBToA0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
-***************
-*** 1631,1637 ****
-      case icSigAbstractClass:
-        if (!GetTag(icSigAToB0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
---- 1631,1637 ----
-      case icSigAbstractClass:
-        if (!GetTag(icSigAToB0Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-        break;
-***************
-*** 1639,1645 ****
-      case icSigNamedColorClass:
-        if (!GetTag(icSigNamedColor2Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 1639,1645 ----
-      case icSigNamedColorClass:
-        if (!GetTag(icSigNamedColor2Tag)) {
-          sReport += icValidateCriticalErrorMsg;
-!         sReport += "Critical tag(s) missing.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 1647,1653 ****
-  
-      default:
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Unknown Profile Class.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-        break;
-    }
---- 1647,1653 ----
-  
-      default:
-        sReport += icValidateCriticalErrorMsg;
-!       sReport += "Unknown Profile Class.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-        break;
-    }
-***************
-*** 1724,1730 ****
-    // Check for duplicate tags
-    if (!AreTagsUnique()) {
-      sReport += icValidateWarning;
-!     sReport += " - There are duplicate tags.\r\n";
-      rv =icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 1724,1730 ----
-    // Check for duplicate tags
-    if (!AreTagsUnique()) {
-      sReport += icValidateWarning;
-!     sReport += " - There are duplicate tags.\n";
-      rv =icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 1979,1985 ****
-      sReport = icValidateCriticalErrorMsg;
-      sReport += " - ";
-      sReport += szFilename;
-!     sReport += "- Invalid Filename\r\n";
-      delete pFileIO;
-      return NULL;
-    }
---- 1979,1985 ----
-      sReport = icValidateCriticalErrorMsg;
-      sReport += " - ";
-      sReport += szFilename;
-!     sReport += "- Invalid Filename\n";
-      delete pFileIO;
-      return NULL;
-    }
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagBasic.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 166,172 ****
-      CIccInfo Info;
-      sReport += icValidateNonCompliantMsg;
-      sReport += Info.GetSigName(sig);
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icValidateNonCompliant;
-    }
---- 166,172 ----
-      CIccInfo Info;
-      sReport += icValidateNonCompliantMsg;
-      sReport += Info.GetSigName(sig);
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icValidateNonCompliant;
-    }
-***************
-*** 340,346 ****
-    sprintf(buf, "%u Bytes.", m_nSize-4);
-    sDescription += buf;
-  
-!   sDescription += "\r\n\r\nData Follows:\r\n";
-  
-    icMemDump(sDescription, m_pData+4, m_nSize-4);
-  }
---- 340,346 ----
-    sprintf(buf, "%u Bytes.", m_nSize-4);
-    sDescription += buf;
-  
-!   sDescription += "\n\nData Follows:\n";
-  
-    icMemDump(sDescription, m_pData+4, m_nSize-4);
-  }
-***************
-*** 511,517 ****
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\r\n";
-  }
-  
-  
---- 511,517 ----
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\n";
-  }
-  
-  
-***************
-*** 629,635 ****
-        if (m_nBufSize<7) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Tag must have at least seven text characters.\r\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-        break;
---- 629,635 ----
-        if (m_nBufSize<7) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Tag must have at least seven text characters.\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-        break;
-***************
-*** 636,642 ****
-      default:
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Unknown Tag.\r\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-      int i;
---- 636,642 ----
-      default:
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Unknown Tag.\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-      int i;
-***************
-*** 644,650 ****
-        if (m_szText[i]&0x80) {
-          sReport += icValidateWarning;
-          sReport += sSigName;
-!         sReport += " - Text do not contain 7bit data.\r\n";
-        }
-      }
-    }
---- 644,650 ----
-        if (m_szText[i]&0x80) {
-          sReport += icValidateWarning;
-          sReport += sSigName;
-!         sReport += " - Text do not contain 7bit data.\n";
-        }
-      }
-    }
-***************
-*** 651,657 ****
-    else {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 651,657 ----
-    else {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 941,947 ****
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\r\n";
-  }
-  
-  
---- 941,947 ----
-    if (m_szText && *m_szText)
-      sDescription += m_szText;
-  
-!   sDescription += "\"\n";
-  }
-  
-  
-***************
-*** 1101,1107 ****
-    if (m_nScriptSize>67) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - ScriptCode count must not be greater than 67.\r\n";
-  
-      rv =icMaxStatus(rv, icValidateNonCompliant);
-    }
---- 1101,1107 ----
-    if (m_nScriptSize>67) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - ScriptCode count must not be greater than 67.\n";
-  
-      rv =icMaxStatus(rv, icValidateNonCompliant);
-    }
-***************
-*** 1260,1266 ****
-    CIccInfo Fmt;
-  
-    sDescription += Fmt.GetSigName(m_nSig);
-!   sDescription += "\r\n";
-  }
-  
-  
---- 1260,1266 ----
-    CIccInfo Fmt;
-  
-    sDescription += Fmt.GetSigName(m_nSig);
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 1320,1326 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 1320,1326 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 1336,1342 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Reference Medium Gamut.\r\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 1336,1342 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Reference Medium Gamut.\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 1355,1361 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\r\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 1355,1361 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Colorimetric Intent Image State.\n", Info.GetSigName(m_nSig));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 1686,1692 ****
-  
-    sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-!   sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\r\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
-    sDescription += buf;
-  
-    for (i=0; i<m_nSize; i++) {
---- 1686,1692 ----
-  
-    sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-!   sprintf(buf, "BEGIN_NAMED_COLORS flags=%08x %u %u\n", m_nVendorFlags, m_nSize, m_nDeviceCoords);
-    sDescription += buf;
-  
-    for (i=0; i<m_nSize; i++) {
-***************
-*** 1717,1723 ****
-          sDescription += buf;
-        }
-      }
-!     sDescription += "\r\n";
-  
-      pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
-    }
---- 1717,1723 ----
-          sDescription += buf;
-        }
-      }
-!     sDescription += "\n";
-  
-      pNamedColor = (SIccNamedColorEntry*)((icChar*)pNamedColor + m_nColorEntrySize);
-    }
-***************
-*** 2082,2088 ****
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 2082,2088 ----
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 2092,2098 ****
-        if (m_nDeviceCoords != nCoords) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of device co-ordinates.\r\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-      }
---- 2092,2098 ----
-        if (m_nDeviceCoords != nCoords) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of device co-ordinates.\n";
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-      }
-***************
-*** 2099,2105 ****
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
---- 2099,2105 ----
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
-***************
-*** 2285,2291 ****
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
-      sDescription += buf;
-    }
-    else {
---- 2285,2291 ----
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "X=%.4lf, Y=%.4lf, Z=%.4lf\n", icFtoD(m_XYZ[0].X), icFtoD(m_XYZ[0].Y), icFtoD(m_XYZ[0].Z));
-      sDescription += buf;
-    }
-    else {
-***************
-*** 2293,2299 ****
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z));
-        sDescription += buf;
-      }
-    }
---- 2293,2299 ----
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "value[%u]: X=%.4lf, Y=%.4lf, Z=%.4lf\n", i, icFtoD(m_XYZ[i].X), icFtoD(m_XYZ[i].Y), icFtoD(m_XYZ[i].Z));
-        sDescription += buf;
-      }
-    }
-***************
-*** 2347,2353 ****
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag.\r\n";
-  
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
---- 2347,2353 ----
-    if (!m_nSize) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag.\n";
-  
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-***************
-*** 2553,2566 ****
-  
-    icUInt32Number i;
-    //sDescription.reserve(sDescription.size() + m_nChannels*79);
-!   sprintf(buf, "Number of Channels : %u\r\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Colorant Encoding : %s\r\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
-    sDescription += buf;
-  
-    for (i=0; i<m_nChannels; i++) {
-!     sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\r\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
-      sDescription += buf;
-    }
-  
---- 2553,2566 ----
-  
-    icUInt32Number i;
-    //sDescription.reserve(sDescription.size() + m_nChannels*79);
-!   sprintf(buf, "Number of Channels : %u\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Colorant Encoding : %s\n", Fmt.GetColorantEncoding((icColorantEncoding)m_nColorantType));
-    sDescription += buf;
-  
-    for (i=0; i<m_nChannels; i++) {
-!     sprintf(buf, "value[%u]: x=%.3lf, y=%.3lf\n", i, icUFtoD(m_xy[i].x), icUFtoD(m_xy[i].y));
-      sDescription += buf;
-    }
-  
-***************
-*** 2617,2623 ****
-      if (m_nChannels!=3) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - Number of device channels must be three.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-  
---- 2617,2623 ----
-      if (m_nChannels!=3) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - Number of device channels must be three.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);
-      }
-  
-***************
-*** 2629,2635 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
-                  sReport += icValidateNonCompliantMsg;
-                  sReport += sSigName;
-!                 sReport += " - Chromaticity data does not match specification.\r\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-            break;
---- 2629,2635 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.150)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.060)) ) {
-                  sReport += icValidateNonCompliantMsg;
-                  sReport += sSigName;
-!                 sReport += " - Chromaticity data does not match specification.\n";
-                  rv = icMaxStatus(rv, icValidateNonCompliant);
-                }
-            break;
-***************
-*** 2642,2648 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\r\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
---- 2642,2648 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
-***************
-*** 2655,2661 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\r\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
---- 2655,2661 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.15)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.06)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
-***************
-*** 2668,2674 ****
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\r\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
---- 2668,2674 ----
-                 (m_xy[2].x != icDtoUF((icFloatNumber)0.155)) || (m_xy[2].y != icDtoUF((icFloatNumber)0.070)) ) {
-                sReport += icValidateNonCompliantMsg;
-                sReport += sSigName;
-!               sReport += " - Chromaticity data does not match specification.\n";
-                rv = icMaxStatus(rv, icValidateNonCompliant);
-              }
-              break;
-***************
-*** 2678,2684 ****
-          {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - Invalid colorant type encoding.\r\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-      }
---- 2678,2684 ----
-          {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - Invalid colorant type encoding.\n";
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-      }
-***************
-*** 2884,2892 ****
-  
-    if (m_nSize == 1 ) {
-      if (Tsig==icSigS15Fixed16ArrayType) 
-!       sprintf(buf, "Value = %.4lf\r\n", icFtoD(m_Num[0]));
-      else
-!       sprintf(buf, "Value = %.4lf\r\n", icUFtoD(m_Num[0]));
-      sDescription += buf;
-    }
-    else {
---- 2884,2892 ----
-  
-    if (m_nSize == 1 ) {
-      if (Tsig==icSigS15Fixed16ArrayType) 
-!       sprintf(buf, "Value = %.4lf\n", icFtoD(m_Num[0]));
-      else
-!       sprintf(buf, "Value = %.4lf\n", icUFtoD(m_Num[0]));
-      sDescription += buf;
-    }
-    else {
-***************
-*** 2893,2910 ****
-      icUInt32Number i;
-  
-      if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-!       sDescription += "Matrix Form:\r\n";
-        icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
-  
-!       sDescription += "\r\nArrayForm:\r\n";
-      }
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-        if (Tsig==icSigS15Fixed16ArrayType) 
-!         sprintf(buf, "Value[%u] = %.4lf\r\n", i, icFtoD(m_Num[i]));
-        else
-!         sprintf(buf, "Value[%u] = %.4lf\r\n", i, icUFtoD(m_Num[i]));
-        sDescription += buf;
-      }
-    }
---- 2893,2910 ----
-      icUInt32Number i;
-  
-      if (Tsig==icSigS15Fixed16ArrayType && m_nSize==9) {
-!       sDescription += "Matrix Form:\n";
-        icMatrixDump(sDescription, (icS15Fixed16Number*)m_Num);
-  
-!       sDescription += "\nArrayForm:\n";
-      }
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-        if (Tsig==icSigS15Fixed16ArrayType) 
-!         sprintf(buf, "Value[%u] = %.4lf\n", i, icFtoD(m_Num[i]));
-        else
-!         sprintf(buf, "Value[%u] = %.4lf\n", i, icUFtoD(m_Num[i]));
-        sDescription += buf;
-      }
-    }
-***************
-*** 3172,3178 ****
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "Value = %u (0x%x)\r\n", m_Num[0], m_Num[0]);
-      sDescription += buf;
-    }
-    else {
---- 3172,3178 ----
-    icChar buf[128];
-  
-    if (m_nSize == 1 ) {
-!     sprintf(buf, "Value = %u (0x%x)\n", m_Num[0], m_Num[0]);
-      sDescription += buf;
-    }
-    else {
-***************
-*** 3180,3186 ****
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "Value[%u] = %u (0x%x)\r\n", i, m_Num[i], m_Num[i]);
-        sDescription += buf;
-      }
-    }
---- 3180,3186 ----
-      sDescription.reserve(sDescription.size() + m_nSize*79);
-  
-      for (i=0; i<m_nSize; i++) {
-!       sprintf(buf, "Value[%u] = %u (0x%x)\n", i, m_Num[i], m_Num[i]);
-        sDescription += buf;
-      }
-    }
-***************
-*** 3374,3388 ****
-    CIccInfo Fmt;
-    icChar buf[128];
-  
-!    sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\r\n";
-!    sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\r\n",
-             icFtoD(m_Data.backing.X),
-             icFtoD(m_Data.backing.Y),
-             icFtoD(m_Data.backing.Z)); 
-     sDescription += buf;
-!    sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\r\n";
-!    sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\r\n";
-!    sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\r\n";
-  }
-  
-  
---- 3374,3388 ----
-    CIccInfo Fmt;
-    icChar buf[128];
-  
-!    sDescription += Fmt.GetStandardObserverName(m_Data.stdObserver); sDescription += "\n";
-!    sprintf(buf, "Backing measurement: X=%.4lf, Y=%.4lf, Z=%.4lf\n",
-             icFtoD(m_Data.backing.X),
-             icFtoD(m_Data.backing.Y),
-             icFtoD(m_Data.backing.Z)); 
-     sDescription += buf;
-!    sDescription += Fmt.GetMeasurementGeometryName(m_Data.geometry); sDescription += "\n";
-!    sDescription += Fmt.GetMeasurementFlareName(m_Data.flare); sDescription += "\n";
-!    sDescription += Fmt.GetIlluminantName(m_Data.illuminant); sDescription += "\n";
-  }
-  
-  
-***************
-*** 3416,3422 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard observer encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 3416,3422 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard observer encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 3429,3435 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid measurement geometry encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 3429,3435 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid measurement geometry encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 3448,3454 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard illuminant encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 3448,3454 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid standard illuminant encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 3902,3910 ****
-  
-    for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
-      if (i!=m_Strings->begin())
-!       sDescription += "\r\n";
-  
-!     sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\r\n",
-        i->m_nLanguageCode>>8, i->m_nLanguageCode,
-        i->m_nCountryCode>>8, i->m_nCountryCode);
-      
---- 3902,3910 ----
-  
-    for (i=m_Strings->begin(); i!=m_Strings->end(); i++) {
-      if (i!=m_Strings->begin())
-!       sDescription += "\n";
-  
-!     sprintf(szBuf, "Language = '%c%c', Region = '%c%c'\n",
-        i->m_nLanguageCode>>8, i->m_nLanguageCode,
-        i->m_nCountryCode>>8, i->m_nCountryCode);
-      
-***************
-*** 3919,3925 ****
-      i->GetAnsi(szBuf, nSize);
-      sDescription += "\"";
-      sDescription += szBuf;
-!     sDescription += "\"\r\n";
-    }
-  }
-  
---- 3919,3925 ----
-      i->GetAnsi(szBuf, nSize);
-      sDescription += "\"";
-      sDescription += szBuf;
-!     sDescription += "\"\n";
-    }
-  }
-  
-***************
-*** 3948,3954 ****
-    if (!m_Strings->size()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
---- 3948,3954 ----
-    if (!m_Strings->size()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty tag!\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-  
-***************
-*** 4246,4260 ****
-  {
-    icChar buf[128];
-  
-!   sDescription = "\r\nData:\r\n";
-  
-    if (IsTypeAscii()) {
-!       sprintf(buf, "%s\r\n", (icChar*)m_pData);
-        sDescription += buf;
-    }
-    else
-      for (int i = 0; i<(int)m_nSize; i++) {
-!       sprintf(buf, "%d\r\n", m_pData[i]);
-        sDescription += buf;
-      }
-  
---- 4246,4260 ----
-  {
-    icChar buf[128];
-  
-!   sDescription = "\nData:\n";
-  
-    if (IsTypeAscii()) {
-!       sprintf(buf, "%s\n", (icChar*)m_pData);
-        sDescription += buf;
-    }
-    else
-      for (int i = 0; i<(int)m_nSize; i++) {
-!       sprintf(buf, "%d\n", m_pData[i]);
-        sDescription += buf;
-      }
-  
-***************
-*** 4312,4318 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid data flag encoding.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 4312,4318 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Invalid data flag encoding.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 4477,4487 ****
-    icChar buf[128];
-  
-    sDescription = "Date = ";
-!   sprintf(buf, "%u-%u-%u\r\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
-    sDescription += buf;
-    
-    sDescription += "Time = ";
-!   sprintf(buf, "%u:%u:%u\r\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
-    sDescription += buf;
-  }
-  
---- 4477,4487 ----
-    icChar buf[128];
-  
-    sDescription = "Date = ";
-!   sprintf(buf, "%u-%u-%u\n", m_DateTime.month, m_DateTime.day, m_DateTime.year);
-    sDescription += buf;
-    
-    sDescription += "Time = ";
-!   sprintf(buf, "%u:%u:%u\n", m_DateTime.hours, m_DateTime.minutes, m_DateTime.seconds);
-    sDescription += buf;
-  }
-  
-***************
-*** 4697,4708 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "Colorant Count : %u\r\n", m_nCount);
-    sDescription += buf;
-!   sDescription += "Order of Colorants:\r\n";
-    
-    for (int i=0; i<(int)m_nCount; i++) {
-!     sprintf(buf, "%u\r\n", m_pData[i]);
-      sDescription += buf;
-    }
-  }
---- 4697,4708 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "Colorant Count : %u\n", m_nCount);
-    sDescription += buf;
-!   sDescription += "Order of Colorants:\n";
-    
-    for (int i=0; i<(int)m_nCount; i++) {
-!     sprintf(buf, "%u\n", m_pData[i]);
-      sDescription += buf;
-    }
-  }
-***************
-*** 4757,4763 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 4757,4763 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 4765,4771 ****
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 4765,4771 ----
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 4977,4983 ****
-    icUInt32Number i, nLen, nMaxLen=0;
-    icFloatNumber Lab[3];
-  
-!   sprintf(buf, "BEGIN_COLORANTS %u\r\n", m_nCount);
-    sDescription += buf;
-  
-    for (i=0; i<m_nCount; i++) {
---- 4977,4983 ----
-    icUInt32Number i, nLen, nMaxLen=0;
-    icFloatNumber Lab[3];
-  
-!   sprintf(buf, "BEGIN_COLORANTS %u\n", m_nCount);
-    sDescription += buf;
-  
-    for (i=0; i<m_nCount; i++) {
-***************
-*** 4988,4998 ****
-    sDescription += "# NAME ";
-  
-    if (m_PCS == icSigXYZData) {
-!     sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\r\n");
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "Lab_L Lab_a Lab_b\r\n");
-      sDescription += buf;
-    }
-    for (i=0; i<m_nCount; i++) {
---- 4988,4998 ----
-    sDescription += "# NAME ";
-  
-    if (m_PCS == icSigXYZData) {
-!     sprintf(buf, "XYZ_X XYZ_Y XYZ_Z\n");
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "Lab_L Lab_a Lab_b\n");
-      sDescription += buf;
-    }
-    for (i=0; i<m_nCount; i++) {
-***************
-*** 5003,5009 ****
-      sDescription += buf;
-  
-      if (m_PCS == icSigXYZData) {
-!       sprintf(buf, "%7.4lf %7.4lf %7.4lf\r\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2]));
-        sDescription += buf;
-      }
-      else {
---- 5003,5009 ----
-      sDescription += buf;
-  
-      if (m_PCS == icSigXYZData) {
-!       sprintf(buf, "%7.4lf %7.4lf %7.4lf\n", icUSFtoD(m_pData[i].data[0]), icUSFtoD(m_pData[i].data[1]), icUSFtoD(m_pData[i].data[2]));
-        sDescription += buf;
-      }
-      else {
-***************
-*** 5011,5017 ****
-        Lab[1] = icU16toF(m_pData[i].data[1]);
-        Lab[2] = icU16toF(m_pData[i].data[2]);
-        icLabFromPcs(Lab);
-!       sprintf(buf, "%7.4lf %8.4lf %8.4lf\r\n", Lab[0], Lab[1], Lab[2]);
-        sDescription += buf;
-      }
-    }
---- 5011,5017 ----
-        Lab[1] = icU16toF(m_pData[i].data[1]);
-        Lab[2] = icU16toF(m_pData[i].data[2]);
-        icLabFromPcs(Lab);
-!       sprintf(buf, "%7.4lf %8.4lf %8.4lf\n", Lab[0], Lab[1], Lab[2]);
-        sDescription += buf;
-      }
-    }
-***************
-*** 5066,5072 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 5066,5072 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 5076,5082 ****
-      if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-!       sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\r\n";
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-    }
---- 5076,5082 ----
-      if (pProfile->m_Header.deviceClass!=icSigLinkClass) {
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-!       sReport += " - Use of this tag is allowed only in DeviceLink Profiles.\n";
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-    }
-***************
-*** 5084,5090 ****
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 5084,5090 ----
-    if (m_nCount != icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of colorants.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 5261,5273 ****
-    icChar buf[128];
-    CIccInfo Fmt;
-  
-!   sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n", 
-                 icFtoD(m_XYZIllum.X), 
-                 icFtoD(m_XYZIllum.Y),
-                 icFtoD(m_XYZIllum.Z));
-    sDescription += buf;
-  
-!   sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\r\n",
-                 icFtoD(m_XYZSurround.X),
-                 icFtoD(m_XYZSurround.Y),
-                 icFtoD(m_XYZSurround.Z));
---- 5261,5273 ----
-    icChar buf[128];
-    CIccInfo Fmt;
-  
-!   sprintf(buf, "Illuminant Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n", 
-                 icFtoD(m_XYZIllum.X), 
-                 icFtoD(m_XYZIllum.Y),
-                 icFtoD(m_XYZIllum.Z));
-    sDescription += buf;
-  
-!   sprintf(buf, "Surround Tristimulus values: X = %.4lf, Y = %.4lf, Z = %.4lf\n",
-                 icFtoD(m_XYZSurround.X),
-                 icFtoD(m_XYZSurround.Y),
-                 icFtoD(m_XYZSurround.Z));
-***************
-*** 5276,5282 ****
-    sDescription += "Illuminant Type: ";
-  
-    sDescription += Fmt.GetIlluminantName(m_illumType);
-!   sDescription += "\r\n";
-  
-  }
-  
---- 5276,5282 ----
-    sDescription += "Illuminant Type: ";
-  
-    sDescription += Fmt.GetIlluminantName(m_illumType);
-!   sDescription += "\n";
-  
-  }
-  
-***************
-*** 5800,5831 ****
-    icChar buf[128], buf2[28];
-    icUInt32Number count=0;
-  
-!   sprintf(buf, "Number of Profile Description Structures: %u\r\n", m_Descriptions->size());
-    sDescription += buf;
-  
-    for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-!     sDescription += "\r\n";
-  
-!     sprintf(buf, "Profile Description Structure Number [%u] follows:\r\n", count+1);
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Manufacturer Signature: %s\r\n", icGetSig(buf2, i->m_deviceMfg, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Model Signature: %s\r\n", icGetSig(buf2, i->m_deviceModel, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Attributes: %08x%08x\r\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Technology Signature: %s\r\n", icGetSig(buf2, i->m_technology, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Description of device manufacturer: \r\n");
-      sDescription += buf;
-      i->m_deviceMfgDesc.Describe(sDescription);
-  
-!     sprintf(buf, "Description of device model: \r\n");
-      sDescription += buf;
-      i->m_deviceModelDesc.Describe(sDescription);
-    }
---- 5800,5831 ----
-    icChar buf[128], buf2[28];
-    icUInt32Number count=0;
-  
-!   sprintf(buf, "Number of Profile Description Structures: %u\n", m_Descriptions->size());
-    sDescription += buf;
-  
-    for (i=m_Descriptions->begin(); i!=m_Descriptions->end(); i++, count++) {
-!     sDescription += "\n";
-  
-!     sprintf(buf, "Profile Description Structure Number [%u] follows:\n", count+1);
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Manufacturer Signature: %s\n", icGetSig(buf2, i->m_deviceMfg, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Model Signature: %s\n", icGetSig(buf2, i->m_deviceModel, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Attributes: %08x%08x\n", (icUInt32Number)(i->m_attributes >> 32), (icUInt32Number)(i->m_attributes));
-      sDescription += buf;
-  
-!     sprintf(buf, "Device Technology Signature: %s\n", icGetSig(buf2, i->m_technology, false));
-      sDescription += buf;
-  
-!     sprintf(buf, "Description of device manufacturer: \n");
-      sDescription += buf;
-      i->m_deviceMfgDesc.Describe(sDescription);
-  
-!     sprintf(buf, "Description of device model: \n");
-      sDescription += buf;
-      i->m_deviceModelDesc.Describe(sDescription);
-    }
-***************
-*** 5886,5892 ****
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\r\n", Info.GetSigName(i->m_technology));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
---- 5886,5892 ----
-        {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sprintf(buf, " - %s: Unknown Technology.\n", Info.GetSigName(i->m_technology));
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateNonCompliant);
-        }
-***************
-*** 5896,5902 ****
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceMfgDesc text tag information\r\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 5896,5902 ----
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceMfgDesc text tag information\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 5905,5911 ****
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceModelDesc text tag information\r\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
---- 5905,5911 ----
-        sReport += icValidateNonCompliantMsg;
-        sReport += sSigName;
-  
-!       sReport += " Contains non-aligned deviceModelDesc text tag information\n";
-  
-        rv = icMaxStatus(rv, icValidateNonCompliant);
-      }
-***************
-*** 6174,6198 ****
-    CIccResponse16List::iterator j;
-  
-    sDescription += "Measurement Unit: ";
-!   sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\r\n";
-  
-    
-    for (int i=0; i<m_nChannels; i++) {
-      nResponseList = m_Response16ListArray[i];
-  
-!     sDescription += "\r\n";
-!     sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\r\n", i+1, 
-        icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
-      sDescription += buf;
-  
-!     sprintf(buf, "Number of Measurements for Channel-%u : %u\r\n", i+1, nResponseList.size());
-      sDescription += buf;
-  
-!     sprintf(buf, "Measurement Data for Channel-%u follows:\r\n", i+1);
-      sDescription += buf;
-  
-      for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-!       sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\r\n", j->deviceCode, icFtoD(j->measurementValue));
-        sDescription += buf;
-      }
-    }
---- 6174,6198 ----
-    CIccResponse16List::iterator j;
-  
-    sDescription += "Measurement Unit: ";
-!   sDescription += Fmt.GetMeasurementUnit((icSignature)GetMeasurementType()); sDescription += "\n";
-  
-    
-    for (int i=0; i<m_nChannels; i++) {
-      nResponseList = m_Response16ListArray[i];
-  
-!     sDescription += "\n";
-!     sprintf(buf, "Maximum Colorant XYZ Measurement for Channel-%u : X=%.4lf, Y=%.4lf, Z=%.4lf\n", i+1, 
-        icFtoD(m_maxColorantXYZ[i].X), icFtoD(m_maxColorantXYZ[i].Y), icFtoD(m_maxColorantXYZ[i].Z));
-      sDescription += buf;
-  
-!     sprintf(buf, "Number of Measurements for Channel-%u : %u\n", i+1, nResponseList.size());
-      sDescription += buf;
-  
-!     sprintf(buf, "Measurement Data for Channel-%u follows:\n", i+1);
-      sDescription += buf;
-  
-      for (j=nResponseList.begin(); j!=nResponseList.end(); j++) {
-!       sprintf(buf, "Device Value= %u : Measurement Value= %.4lf\n", j->deviceCode, icFtoD(j->measurementValue));
-        sDescription += buf;
-      }
-    }
-***************
-*** 6234,6240 ****
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Unknown measurement unit signature.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 6234,6240 ----
-    default:
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Unknown measurement unit signature.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 6241,6247 ****
-    if (!m_nChannels) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-      return rv;
-    }
---- 6241,6247 ----
-    if (!m_nChannels) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-      return rv;
-    }
-***************
-*** 6479,6495 ****
-    CIccResponseCurveSet::iterator i;
-    icChar buf[128];
-  
-!   sprintf(buf, "Number of Channels: %u\r\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Number of Measurement Types used: %u\r\n", m_ResponseCurves->size());
-    sDescription += buf;
-  
-    int count = 0;
-    for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-!      sDescription += "\r\n";
-  
-!     sprintf(buf, "Response Curve for measurement type [%u] follows:\r\n", count+1);
-      sDescription += buf;
-  
-      i->Describe(sDescription);
---- 6479,6495 ----
-    CIccResponseCurveSet::iterator i;
-    icChar buf[128];
-  
-!   sprintf(buf, "Number of Channels: %u\n", m_nChannels);
-    sDescription += buf;
-  
-!   sprintf(buf, "Number of Measurement Types used: %u\n", m_ResponseCurves->size());
-    sDescription += buf;
-  
-    int count = 0;
-    for (i=m_ResponseCurves->begin(); i!=m_ResponseCurves->end(); i++, count++) {
-!      sDescription += "\n";
-  
-!     sprintf(buf, "Response Curve for measurement type [%u] follows:\n", count+1);
-      sDescription += buf;
-  
-      i->Describe(sDescription);
-***************
-*** 6658,6664 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 6658,6664 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 6666,6678 ****
-    if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\r\n";
-    }
-  
-    if (!GetNumResponseCurveTypes()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag!.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-    else {
---- 6666,6678 ----
-    if (m_nChannels!=icGetSpaceSamples(pProfile->m_Header.colorSpace)) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Incorrect number of channels.\n";
-    }
-  
-    if (!GetNumResponseCurveTypes()) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Empty Tag!.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-    else {
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagLut.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 323,345 ****
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE In_Out\r\n");
-      sDescription += buf;
-!     sDescription += "Y = X\r\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE In_Out\r\n");
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT In_Out 1 1\r\n");
-      sDescription += buf;
-!     sDescription += "IN OUT\r\n";
-  
-      for (i=0; i<(int)m_nSize; i++) {
-        ptr = buf;
---- 323,345 ----
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE In_Out\n");
-      sDescription += buf;
-!     sDescription += "Y = X\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE In_Out\n");
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT In_Out 1 1\n");
-      sDescription += buf;
-!     sDescription += "IN OUT\n";
-  
-      for (i=0; i<(int)m_nSize; i++) {
-        ptr = buf;
-***************
-*** 354,365 ****
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\r\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\r\n";
-  }
-  
-  
---- 354,365 ----
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 383,405 ****
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
-      sDescription += buf;
-!     sDescription += "Y = X\r\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\r\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT %s 1 1\r\n", szName);
-      sDescription += buf;
-!     sDescription += "IN OUT\r\n";
-  
-      sDescription.reserve(sDescription.size() + m_nSize * 20);
-  
---- 383,405 ----
-    icChar buf[128], *ptr;
-  
-    if (!m_nSize) {
-!     sprintf(buf, "BEGIN_CURVE %s\n", szName);
-      sDescription += buf;
-!     sDescription += "Y = X\n";
-    }
-    else if (m_nSize==1) {
-      icFloatNumber dGamma = (icFloatNumber)(m_Curve[0] * 256.0);
-!     sprintf(buf, "BEGIN_CURVE %s\n", szName);
-      sDescription += buf;
-!     sprintf(buf, "Y = X ^ %.4lf\n", dGamma);
-      sDescription += buf;
-    }
-    else {
-      int i;
-  
-!     sprintf(buf, "BEGIN_LUT %s 1 1\n", szName);
-      sDescription += buf;
-!     sDescription += "IN OUT\n";
-  
-      sDescription.reserve(sDescription.size() + m_nSize * 20);
-  
-***************
-*** 416,427 ****
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\r\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\r\n";
-  }
-  
-  
---- 416,427 ----
-  
-        ptr += strlen(ptr);
-  
-!       strcpy(ptr, "\n");
-  
-        sDescription += buf;
-      }
-    }
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 614,620 ****
-          if (m_Curve[0]>0.0 || m_Curve[m_nSize-1]<1.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Curve cannot be accurately inverted.\r\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
---- 614,620 ----
-          if (m_Curve[0]>0.0 || m_Curve[m_nSize-1]<1.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Curve cannot be accurately inverted.\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
-***************
-*** 822,877 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "FunctionType: %04Xh\r\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-  case 0x0000:
-!   sprintf(buf, "Y = X ^ %.4lf\r\n", icFtoD(m_Param[0]));
-    sDescription += buf;
-    return;
-  
-  case 0x0001:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf / %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\r\n",
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0002:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf   when (X >= %.4lf / %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %.4lf   when (X < %.4lf / %.4lf)\r\n", icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0003:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X   when (X < %.4lf)\r\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
-  
-  case 0x0004:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf  when (X >= %.4lf)\r\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[5]), icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X + %.4lf  when (X < %.4lf)\r\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[6]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
---- 822,877 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "FunctionType: %04Xh\n", m_nFunctionType);
-    sDescription += buf;
-  
-    switch(m_nFunctionType) {
-  case 0x0000:
-!   sprintf(buf, "Y = X ^ %.4lf\n", icFtoD(m_Param[0]));
-    sDescription += buf;
-    return;
-  
-  case 0x0001:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf / %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = 0 when (X < %.4lf / %.4lf)\n",
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0002:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf   when (X >= %.4lf / %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %.4lf   when (X < %.4lf / %.4lf)\n", icFtoD(m_Param[3]),
-      -icFtoD(m_Param[2]), icFtoD(m_Param[1]));
-    sDescription += buf;
-    return;
-  
-  case 0x0003:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf   when (X >= %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X   when (X < %.4lf)\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
-  
-  case 0x0004:
-!   sprintf(buf, "Y = (%.4lf * X + %.4lf) ^ %.4lf + %.4lf  when (X >= %.4lf)\n",
-      icFtoD(m_Param[1]), icFtoD(m_Param[2]), icFtoD(m_Param[0]),
-      icFtoD(m_Param[5]), icFtoD(m_Param[4]));
-    sDescription += buf;
-  
-!   sprintf(buf, "Y = %lf * X + %.4lf  when (X < %.4lf)\n",
-      icFtoD(m_Param[3]), icFtoD(m_Param[6]), icFtoD(m_Param[4]));
-    sDescription += buf;
-    return;
-***************
-*** 878,888 ****
-  
-  default:
-    int i;
-!   sprintf(buf, "Unknown Function with %d parameters:\r\n");
-    sDescription += buf;
-  
-    for (i=0; i<m_nNumParam; i++) {
-!     sprintf(buf, "Param[%d] = %.4lf\r\n", i, icFtoD(m_Param[i]));
-      sDescription += buf;
-    }
-    }
---- 878,888 ----
-  
-  default:
-    int i;
-!   sprintf(buf, "Unknown Function with %d parameters:\n", m_nNumParam);
-    sDescription += buf;
-  
-    for (i=0; i<m_nNumParam; i++) {
-!     sprintf(buf, "Param[%d] = %.4lf\n", i, icFtoD(m_Param[i]));
-      sDescription += buf;
-    }
-    }
-***************
-*** 907,916 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_CURVE %s\r\n", szName);
-    sDescription += buf;
-    Describe(sDescription);
-!   sDescription += "\r\n";
-  }
-  
-  
---- 907,916 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_CURVE %s\n", szName);
-    sDescription += buf;
-    Describe(sDescription);
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 1106,1112 ****
-    if (m_nReserved2!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
---- 1106,1112 ----
-    if (m_nReserved2!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-***************
-*** 1116,1122 ****
-    if (m_nNumParam!=1) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1116,1122 ----
-    if (m_nNumParam!=1) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1125,1131 ****
-    if (m_nNumParam!=3) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1125,1131 ----
-    if (m_nNumParam!=3) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1134,1140 ****
-    if (m_nNumParam!=4) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1134,1140 ----
-    if (m_nNumParam!=4) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1143,1149 ****
-    if (m_nNumParam!=5) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1143,1149 ----
-    if (m_nNumParam!=5) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1152,1158 ****
-    if (m_nNumParam!=7) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
---- 1152,1158 ----
-    if (m_nNumParam!=7) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " - Number of parameters inconsistent with function type.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-    break;
-***************
-*** 1160,1166 ****
-  default:
-    sReport += icValidateCriticalErrorMsg;
-    sReport += sSigName;
-!   sReport += " - Unknown function type.\r\n";
-    rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-  
---- 1160,1166 ----
-  default:
-    sReport += icValidateCriticalErrorMsg;
-    sReport += sSigName;
-!   sReport += " - Unknown function type.\n";
-    rv = icMaxStatus(rv, icValidateCriticalError);
-    }
-  
-***************
-*** 1170,1176 ****
-      if (lval>0.0 || uval<1.0) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Curve cannot be accurately inverted.\r\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
---- 1170,1176 ----
-      if (lval>0.0 || uval<1.0) {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " - Curve cannot be accurately inverted.\n";
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-    }
-***************
-*** 1255,1286 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_MATRIX %s\r\n", szName);
-    sDescription += buf;
-  
-    if (!m_bUseConstants) {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
-        m_e[0], m_e[1], m_e[2]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
-        m_e[3], m_e[4], m_e[5]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n",
-        m_e[6], m_e[7], m_e[8]);
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
-        m_e[0], m_e[1], m_e[2], m_e[9]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
-        m_e[3], m_e[4], m_e[5], m_e[10]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\r\n",
-        m_e[6], m_e[7], m_e[8], m_e[11]);
-      sDescription += buf;
-    }
-!   sDescription += "\r\n";
-  }
-  
-  /**
---- 1255,1286 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN_MATRIX %s\n", szName);
-    sDescription += buf;
-  
-    if (!m_bUseConstants) {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
-        m_e[0], m_e[1], m_e[2]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
-        m_e[3], m_e[4], m_e[5]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf\n",
-        m_e[6], m_e[7], m_e[8]);
-      sDescription += buf;
-    }
-    else {
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
-        m_e[0], m_e[1], m_e[2], m_e[9]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
-        m_e[3], m_e[4], m_e[5], m_e[10]);
-      sDescription += buf;
-!     sprintf(buf, "%8.4lf %8.4lf %8.4lf  +  %8.4lf\n",
-        m_e[6], m_e[7], m_e[8], m_e[11]);
-      sDescription += buf;
-    }
-!   sDescription += "\n";
-  }
-  
-  /**
-***************
-*** 1377,1383 ****
-        if (m_e[0]!=1.0 || m_e[4]!=1.0 || m_e[9]!=1.0 || sum!=3.0) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Matrix must be identity.\r\n";
-          rv = icValidateNonCompliant;
-        }
-      }
---- 1377,1383 ----
-        if (m_e[0]!=1.0 || m_e[4]!=1.0 || m_e[9]!=1.0 || sum!=3.0) {
-          sReport += icValidateNonCompliantMsg;
-          sReport += sSigName;
-!         sReport += " - Matrix must be identity.\n";
-          rv = icValidateNonCompliant;
-        }
-      }
-***************
-*** 1754,1760 ****
-  
-        ptr += sprintf(ptr, " %s", m_pVal);
-      }
-!     strcpy(ptr, "\r\n");
-      sDescription += (const icChar*)m_pOutText;
-  
-    }
---- 1754,1760 ----
-  
-        ptr += sprintf(ptr, " %s", m_pVal);
-      }
-!     strcpy(ptr, "\n");
-      sDescription += (const icChar*)m_pOutText;
-  
-    }
-***************
-*** 1866,1872 ****
-    icChar szOutText[2048], szColor[40];
-    int i, len;
-  
-!   sprintf(szOutText, "BEGIN_LUT %s %d %d\r\n", szName, m_nInput, m_nOutput);
-    sDescription += szOutText;
-  
-    for (i=0; i<m_nInput; i++) {
---- 1866,1872 ----
-    icChar szOutText[2048], szColor[40];
-    int i, len;
-  
-!   sprintf(szOutText, "BEGIN_LUT %s %d %d\n", szName, m_nInput, m_nOutput);
-    sDescription += szOutText;
-  
-    for (i=0; i<m_nInput; i++) {
-***************
-*** 1883,1889 ****
-      sDescription += szOutText;
-    }
-  
-!   sDescription += "\r\n";
-  
-    len = 0;
-    for (i=0; i<m_nInput; i++) {
---- 1883,1889 ----
-      sDescription += szOutText;
-    }
-  
-!   sDescription += "\n";
-  
-    len = 0;
-    for (i=0; i<m_nInput; i++) {
-***************
-*** 1907,1913 ****
-  
-    Iterate(sDescription, 0, 0);
-    
-!   sDescription += "\r\n";
-  }
-  
-  
---- 1907,1913 ----
-  
-    Iterate(sDescription, 0, 0);
-    
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 2693,2699 ****
-    if (m_nReserved2[0]!=0 || m_nReserved2[1]!=0 || m_nReserved2[2]!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icValidateNonCompliant;
-    }
---- 2693,2699 ----
-    if (m_nReserved2[0]!=0 || m_nReserved2[1]!=0 || m_nReserved2[2]!=0) {
-      sReport += icValidateNonCompliantMsg;
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icValidateNonCompliant;
-    }
-***************
-*** 2704,2710 ****
-        if (m_GridPoints[i]<2) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\r\n",i );
-          sReport += temp;
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
---- 2704,2710 ----
-        if (m_GridPoints[i]<2) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sprintf(temp, " - CLUT: At least 2 grid points should be present in dimension %u.\n",i );
-          sReport += temp;
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-***************
-*** 3122,3128 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
---- 3122,3128 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateWarning);
-      return rv;
-    }
-***************
-*** 3138,3144 ****
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3138,3144 ----
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3146,3152 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3146,3152 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3160,3166 ****
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3160,3166 ----
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3168,3174 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3168,3174 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3180,3186 ****
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3180,3186 ----
-        if (m_nInput!=nInput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of input channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3188,3194 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3188,3194 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3206,3212 ****
-      if (!m_CLUT) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - CLUT must be present.\r\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);          
-      }
-    }
---- 3206,3212 ----
-      if (!m_CLUT) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " - CLUT must be present.\n";
-        rv = icMaxStatus(rv, icValidateCriticalError);          
-      }
-    }
-***************
-*** 3748,3754 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3748,3754 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3762,3768 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3762,3768 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3772,3778 ****
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\r\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
---- 3772,3778 ----
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-***************
-*** 3784,3790 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3784,3790 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3876,3882 ****
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\r\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-      return rv;
-    }
---- 3876,3882 ----
-    if (!pProfile) {
-      sReport += icValidateWarningMsg;
-      sReport += sSigName;
-!     sReport += " - Tag validation incomplete: Pointer to profile unavailable.\n";
-      rv = icMaxStatus(rv, icValidateCriticalError);
-      return rv;
-    }
-***************
-*** 3900,3906 ****
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\r\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
---- 3900,3906 ----
-        if (m_nOutput!=nOutput) {
-          sReport += icValidateCriticalErrorMsg;
-          sReport += sSigName;
-!         sReport += " - Incorrect number of output channels.\n";
-          rv = icMaxStatus(rv, icValidateCriticalError);
-        }
-  
-***************
-*** 3913,3919 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3913,3919 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3927,3933 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3927,3933 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of M-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 3937,3943 ****
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\r\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
---- 3937,3943 ----
-          if (!m_CLUT) {
-            sReport += icValidateNonCompliantMsg;
-            sReport += sSigName;
-!           sReport += " - CLUT must be present if using A-curves.\n";
-  
-            rv = icMaxStatus(rv, icValidateNonCompliant);
-          }
-***************
-*** 3949,3955 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 3949,3955 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4311,4317 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4311,4317 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4319,4325 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4319,4325 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4336,4342 ****
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\r\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
---- 4336,4342 ----
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
-***************
-*** 4351,4357 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4351,4357 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut8Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4359,4365 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4359,4365 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4721,4727 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4721,4727 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4729,4735 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4729,4735 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of B-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-***************
-*** 4746,4752 ****
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\r\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
---- 4746,4752 ----
-          if (m_XYZMatrix[0]!=1.0 || m_XYZMatrix[4]!=1.0 || m_XYZMatrix[9]!=1.0 || sum!=3.0) {
-            sReport += icValidateWarningMsg;
-            sReport += sSigName;
-!           sReport += " - Matrix must be identity.\n";
-            rv = icMaxStatus(rv, icValidateWarning);
-          }
-        }
-***************
-*** 4761,4767 ****
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\r\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
---- 4761,4767 ----
-                if (pTagCurve->GetSize()==1) {
-                  sReport += icValidateCriticalErrorMsg;
-                  sReport += sSigName;
-!                 sReport += " - lut16Tags do not support single entry gamma curves.\n";
-                  rv = icMaxStatus(rv, icValidateCriticalError);
-                }
-              }
-***************
-*** 4769,4775 ****
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\r\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
---- 4769,4775 ----
-            else {
-              sReport += icValidateCriticalErrorMsg;
-              sReport += sSigName;
-!             sReport += " - Incorrect number of A-curves.\n";
-              rv = icMaxStatus(rv, icValidateCriticalError);
-            }
-          }
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagMPE.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 218,224 ****
-            icGetSig(sigbuf, m_sig), m_nSize);
-    sDescription += buf;
-  
-!   sDescription += "\r\n\r\nData Follows:\r\n";
-  
-    icMemDump(sDescription, m_pData, m_nSize);
-  
---- 218,224 ----
-            icGetSig(sigbuf, m_sig), m_nSize);
-    sDescription += buf;
-  
-!   sDescription += "\n\nData Follows:\n";
-  
-    icMemDump(sDescription, m_pData, m_nSize);
-  
-***************
-*** 364,370 ****
-    sReport += " - Contains unknown processing element type (";
-    icGetSig(buf, m_sig, true);
-    sReport += buf;
-!   sReport += ").\r\n";
-  
-    return icValidateCriticalError;
-  }
---- 364,370 ----
-    sReport += " - Contains unknown processing element type (";
-    icGetSig(buf, m_sig, true);
-    sReport += buf;
-!   sReport += ").\n";
-  
-    return icValidateCriticalError;
-  }
-***************
-*** 392,398 ****
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\r\n";
-  
-      rv = icValidateNonCompliant;
-    }
---- 392,398 ----
-      sReport += " - Element ";
-      sSigName = Info.GetSigName(GetType());
-      sReport += sSigName;
-!     sReport += " - Reserved Value must be zero.\n";
-  
-      rv = icValidateNonCompliant;
-    }
-***************
-*** 738,755 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\r\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-!   sDescription += "\r\n";
-  
-    CIccMultiProcessElementList::iterator i;
-    int j;
-  
-    for (j=0, i=m_list->begin(); i!=m_list->end(); j++, i++) {
-!     sprintf(buf, "PROCESS_ELEMENT #%d\r\n", j+1);
-      sDescription += buf;
-      i->ptr->Describe(sDescription);
-!     sDescription += "\r\n";
-    }
-  }
-  
---- 738,755 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN MULTI_PROCESS_ELEMENT_TAG %d %d\n", m_nInputChannels, m_nOutputChannels);
-    sDescription += buf;
-!   sDescription += "\n";
-  
-    CIccMultiProcessElementList::iterator i;
-    int j;
-  
-    for (j=0, i=m_list->begin(); i!=m_list->end(); j++, i++) {
-!     sprintf(buf, "PROCESS_ELEMENT #%d\n", j+1);
-      sDescription += buf;
-      i->ptr->Describe(sDescription);
-!     sDescription += "\n";
-    }
-  }
-  
-***************
-*** 1207,1219 ****
-      if (m_nInputChannels != m_nOutputChannels) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements and input and output channels do not match!\r\n";
-        return icValidateCriticalError;
-      }
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements.\r\n";
-        return icValidateWarning;
-      }
-    }
---- 1207,1219 ----
-      if (m_nInputChannels != m_nOutputChannels) {
-        sReport += icValidateCriticalErrorMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements and input and output channels do not match!\n";
-        return icValidateCriticalError;
-      }
-      else {
-        sReport += icValidateWarningMsg;
-        sReport += sSigName;
-!       sReport += " No processing elements.\n";
-        return icValidateWarning;
-      }
-    }
-***************
-*** 1224,1230 ****
-    if (i->ptr->NumInputChannels() != m_nInputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of input channels!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1224,1230 ----
-    if (i->ptr->NumInputChannels() != m_nInputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of input channels!\n";
-      return icValidateCriticalError;
-    }
-  
-***************
-*** 1239,1245 ****
-          sReport += "->";
-          sReport += i->ptr->GetClassName();
-  
-!         sReport += " Mis-matching number of channels!\r\n";
-          return icValidateCriticalError;
-        }
-      }
---- 1239,1245 ----
-          sReport += "->";
-          sReport += i->ptr->GetClassName();
-  
-!         sReport += " Mis-matching number of channels!\n";
-          return icValidateCriticalError;
-        }
-      }
-***************
-*** 1251,1257 ****
-    if (last && last->NumOutputChannels() != m_nOutputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of output channels!\r\n";
-      return icValidateCriticalError;
-    }
-  
---- 1251,1257 ----
-    if (last && last->NumOutputChannels() != m_nOutputChannels) {
-      sReport += icValidateCriticalErrorMsg;
-      sReport += sSigName;
-!     sReport += " Mis-matching number of output channels!\n";
-      return icValidateCriticalError;
-    }
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 234,240 ****
-  {
-    std::string Dump;
-  
-!   sDescription += "ProfileID:\r\n";
-  
-    int i;
-    char buf[20];
---- 234,240 ----
-  {
-    std::string Dump;
-  
-!   sDescription += "ProfileID:\n";
-  
-    int i;
-    char buf[20];
-***************
-*** 244,255 ****
-      sprintf(buf, "%2x", m_profileID.ID8[i]);
-      sDescription += buf;
-    }
-!   sDescription += "\r\n";
-  
-!   sDescription += "Description:\r\n";
-    m_desc.Describe(sDescription);
-  
-!   sDescription += "\r\n";
-  }
-  
-  
---- 244,255 ----
-      sprintf(buf, "%2x", m_profileID.ID8[i]);
-      sDescription += buf;
-    }
-!   sDescription += "\n";
-  
-!   sDescription += "Description:\n";
-    m_desc.Describe(sDescription);
-  
-!   sDescription += "\n";
-  }
-  
-  
-***************
-*** 434,454 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN ProfileSequenceIdentification_TAG\r\n");
-    sDescription += buf;
-!   sDescription += "\r\n";
-  
-    int i;
-    CIccProfileIdDescList::iterator j;
-    for (i=0, j=m_list->begin(); j!=m_list->end(); i++, j++) {
-!     sprintf(buf, "ProfileDescription_%d:\r\n", i+1);
-      sDescription += buf;
-      j->Describe(sDescription);
-    }
-  
-!   sprintf(buf, "END ProfileSequenceIdentification_TAG\r\n");
-    sDescription += buf;
-!   sDescription += "\r\n";
-  }
-  
-  
---- 434,454 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "BEGIN ProfileSequenceIdentification_TAG\n");
-    sDescription += buf;
-!   sDescription += "\n";
-  
-    int i;
-    CIccProfileIdDescList::iterator j;
-    for (i=0, j=m_list->begin(); j!=m_list->end(); i++, j++) {
-!     sprintf(buf, "ProfileDescription_%d:\n", i+1);
-      sDescription += buf;
-      j->Describe(sDescription);
-    }
-  
-!   sprintf(buf, "END ProfileSequenceIdentification_TAG\n");
-    sDescription += buf;
-!   sDescription += "\n";
-  }
-  
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccTagProfSeqId.h	Fri Jan 25 14:23:09 2008
-***************
-*** 161,164 ****
-  }
-  #endif
-  
-! #endif //_ICCTAGPROFSEQID_H
---- 161,164 ----
-  }
-  #endif
-  
-! #endif //_ICCTAGPROFSEQID_H
-*** misc/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/IccUtil.cpp	Fri Jan 25 14:23:09 2008
-***************
-*** 79,85 ****
-  #include "IccUtil.h"
-  #include "IccTagFactory.h"
-  #include <stdlib.h>
-! #include <memory.h>
-  #include <ctype.h>
-  #include <math.h>
-  #include <string.h>
---- 79,85 ----
-  #include "IccUtil.h"
-  #include "IccTagFactory.h"
-  #include <stdlib.h>
-! #include <memory>
-  #include <ctype.h>
-  #include <math.h>
-  #include <string.h>
-***************
-*** 678,688 ****
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\r\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8]));
-    sDump += buf;
-  }
-  
---- 679,689 ----
-  {
-    icChar buf[128];
-  
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[0]), icFtoD(pMatrix[1]), icFtoD(pMatrix[2]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[3]), icFtoD(pMatrix[4]), icFtoD(pMatrix[5]));
-    sDump += buf;
-!   sprintf(buf, "%8.4lf %8.4lf %8.4lf\n", icFtoD(pMatrix[6]), icFtoD(pMatrix[7]), icFtoD(pMatrix[8]));
-    sDump += buf;
-  }
-  
-***************
-*** 1516,1534 ****
-  
-    if (XYZ.X < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative X value!\r\n";
-      rv = icValidateNonCompliant;
-    }
-  
-    if (XYZ.Y < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Y value!\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-    if (XYZ.Z < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Z value!\r\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
---- 1517,1535 ----
-  
-    if (XYZ.X < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative X value!\n";
-      rv = icValidateNonCompliant;
-    }
-  
-    if (XYZ.Y < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Y value!\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-    if (XYZ.Z < 0) {
-      sReport += icValidateNonCompliantMsg;
-!     sReport += " - XYZNumber: Negative Z value!\n";
-      rv = icMaxStatus(rv, icValidateNonCompliant);
-    }
-  
-***************
-*** 1548,1554 ****
-    icChar buf[128];
-    if (dateTime.year<1992) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
-      sReport += buf;
-      rv = icValidateWarning;
-    }
---- 1549,1555 ----
-    icChar buf[128];
-    if (dateTime.year<1992) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid year!\n",dateTime.year);
-      sReport += buf;
-      rv = icValidateWarning;
-    }
-***************
-*** 1557,1563 ****
-    if (newtime->tm_mon==11 && newtime->tm_mday==31) {
-      if (dateTime.year>(year+1)) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
---- 1558,1564 ----
-    if (newtime->tm_mon==11 && newtime->tm_mday==31) {
-      if (dateTime.year>(year+1)) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-***************
-*** 1565,1571 ****
-    else {
-      if (dateTime.year>year) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\r\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
---- 1566,1572 ----
-    else {
-      if (dateTime.year>year) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid year!\n",dateTime.year);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-***************
-*** 1573,1579 ****
-  
-    if (dateTime.month<1 || dateTime.month>12) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid month!\r\n",dateTime.month);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1574,1580 ----
-  
-    if (dateTime.month<1 || dateTime.month>12) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid month!\n",dateTime.month);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1580,1586 ****
-  
-    if (dateTime.day<1 || dateTime.day>31) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid day!\r\n",dateTime.day);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1581,1587 ----
-  
-    if (dateTime.day<1 || dateTime.day>31) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid day!\n",dateTime.day);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1588,1594 ****
-    if (dateTime.month==2) {
-      if (dateTime.day>29) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid day for February!\r\n",dateTime.day);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
---- 1589,1595 ----
-    if (dateTime.month==2) {
-      if (dateTime.day>29) {
-        sReport += icValidateWarningMsg;
-!       sprintf(buf," - %u: Invalid day for February!\n",dateTime.day);
-        sReport += buf;
-        rv = icMaxStatus(rv, icValidateWarning);
-      }
-***************
-*** 1596,1602 ****
-      if (dateTime.day==29) {
-        if ((dateTime.year%4)!=0) {
-          sReport += icValidateWarningMsg;
-!         sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\r\n",dateTime.day, dateTime.year);
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateWarning);
-        }
---- 1597,1603 ----
-      if (dateTime.day==29) {
-        if ((dateTime.year%4)!=0) {
-          sReport += icValidateWarningMsg;
-!         sprintf(buf," - %u: Invalid day for February, year is not a leap year(%u)!\n",dateTime.day, dateTime.year);
-          sReport += buf;
-          rv = icMaxStatus(rv, icValidateWarning);
-        }
-***************
-*** 1605,1611 ****
-  
-    if (dateTime.hours>23) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid hour!\r\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1606,1612 ----
-  
-    if (dateTime.hours>23) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid hour!\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1612,1618 ****
-  
-    if (dateTime.minutes>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid minutes!\r\n",dateTime.minutes);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1613,1619 ----
-  
-    if (dateTime.minutes>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid minutes!\n",dateTime.minutes);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-***************
-*** 1619,1625 ****
-  
-    if (dateTime.seconds>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid seconds!\r\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
---- 1620,1626 ----
-  
-    if (dateTime.seconds>59) {
-      sReport += icValidateWarningMsg;
-!     sprintf(buf," - %u: Invalid seconds!\n",dateTime.hours);
-      sReport += buf;
-      rv = icMaxStatus(rv, icValidateWarning);
-    }
-*** misc/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Mon Aug 20 22:05:00 2007
---- misc/build/SampleICC-1.3.2/IccProfLib/icProfileHeader.h	Fri Jan 25 14:23:09 2008
-***************
-*** 659,668 ****
-  typedef enum {
-      icFlare0                            = 0x00000000,  /* 0% flare */
-      icFlare100                          = 0x00000001,  /* 100% flare */
-  } icMeasurementFlare;
-  
-  /** Convenience Enum Definition - Not defined in ICC specification*/
-! #define icMaxEnumFlare ((icMeasurementFlare) 0xFFFFFFFF)
-  #define icMaxFlare     ((icMeasurementFlare) 0xFFFFFFFF) /* as defined by earlier versions */
-  
-  
---- 659,669 ----
-  typedef enum {
-      icFlare0                            = 0x00000000,  /* 0% flare */
-      icFlare100                          = 0x00000001,  /* 100% flare */
-+     icMaxEnumFlare                      = 0xFFFFFFFF
-  } icMeasurementFlare;
-  
-  /** Convenience Enum Definition - Not defined in ICC specification*/
-! /*#define icMaxEnumFlare ((icMeasurementFlare) 0xFFFFFFFF)*/
-  #define icMaxFlare     ((icMeasurementFlare) 0xFFFFFFFF) /* as defined by earlier versions */
-  
-  
-*** misc/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Mon Aug 20 22:10:42 2007
---- misc/build/SampleICC-1.3.2/Tools/CmdLine/Makefile.in	Fri Jan 25 14:23:09 2008
-***************
-*** 101,117 ****
-  am__quote = @am__quote@
-  install_sh = @install_sh@
-  
-! SUBDIRS = IccApplyNamedCmm \
-! 	@SICC_ICC_APPLY_PROFILES@ \
-! 	IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
-  
-  
-! DIST_SUBDIRS = IccApplyNamedCmm \
-! 	IccApplyProfiles \
-! 	IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
---- 101,113 ----
-  am__quote = @am__quote@
-  install_sh = @install_sh@
-  
-! SUBDIRS = IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
-  
-  
-! DIST_SUBDIRS = IccDumpProfile \
-  	IccProfLibTest \
-  	IccStripUnknownTags \
-  	IccV4ToMPE
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2007-08-20 22:04:53.000000000 +0200
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2008-01-31 13:53:16.000000000 +0100
-***************
-*** 77,82 ****
---- 77,84 ----
-  //
-  //////////////////////////////////////////////////////////////////////
-  
-+ #include <stdlib.h>
-+ #include <string.h>
-  #include <iostream>
-  #include <fstream>
-  #include <sstream>
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2007-08-20 22:04:54.000000000 +0200
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2008-01-31 13:54:51.000000000 +0100
-***************
-*** 83,88 ****
---- 83,89 ----
-  #ifndef __DEFINED_ICC_TOOL_EXCEPTION_H__
-  #define __DEFINED_ICC_TOOL_EXCEPTION_H__
-  
-+ #include <string.h>
-  #include <exception>
-  #include <string>
-  
-*** misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2007-08-20 22:05:00.000000000 +0200
---- misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2008-01-31 13:49:54.000000000 +0100
-***************
-*** 79,84 ****
---- 79,86 ----
-  #pragma warning( disable: 4786) //disable warning in <list.h>
-  #endif
-  
-+ #include <stdlib.h>
-+ #include <string.h>
-  #include "IccCmm.h"
-  #include "IccTag.h"
-  #include "IccIO.h"
-*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2007-08-20 22:04:53.000000000 +0200
---- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2008-01-31 14:05:58.000000000 +0100
-***************
-*** 83,88 ****
---- 83,89 ----
-  #include <string>
-  #include <sys/types.h>
-  #include <sys/stat.h>
-+ #include <stdlib.h>
-  
-  #ifdef WIN32
-  typedef unsigned short mode_t;
diff --git a/icc/makefile.mk b/icc/makefile.mk
deleted file mode 100644
index 779def4..0000000
--- a/icc/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=icc
-TARGET=icc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=SampleICC-1.3.2
-TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab
-PATCH_FILES= \
-    $(TARFILE_NAME).patch \
-    $(TARFILE_NAME)-fmtargs.patch
-
-CONVERTFILES= \
-    IccProfLib$/IccTagProfSeqId.h \
-    IccProfLib$/IccTagProfSeqId.cpp \
-    Contrib$/ICC_utils$/Stubs.h \
-    Contrib$/ICC_utils$/Vetters.cpp
-
-.IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
-BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
-.ELSE
-CONFIGURE_ACTION= 
-BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf -
-.ENDIF
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
diff --git a/icc/makefiles.zip b/icc/makefiles.zip
deleted file mode 100644
index db08c73..0000000
--- a/icc/makefiles.zip
+++ /dev/null
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
deleted file mode 100644
index e9bf65b..0000000
--- a/icc/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-ip     icc :	solenv external sal NULL
-ip	icc		usr1	-	all	ip_mkout NULL
-ip	icc		nmake	-	all	ip_icc	NULL
diff --git a/icc/prj/d.lst b/icc/prj/d.lst
deleted file mode 100644
index 553de38..0000000
--- a/icc/prj/d.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\icc
-mkdir: %_DEST%\inc\external\icc
-
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
-
diff --git a/icc/source/create_sRGB_profile/Makefile.am b/icc/source/create_sRGB_profile/Makefile.am
deleted file mode 100644
index a2d5888..0000000
--- a/icc/source/create_sRGB_profile/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = \
-	create_display_profile
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/IccProfLib \
-	-I$(top_srcdir)/Contrib/ICC_utils
-
-LDADD = -L$(top_builddir)/IccProfLib -lSampleICC \
-	-L$(top_builddir)/Contrib/ICC_utils -lICC_utils
-
-create_display_profile_SOURCES = \
-	create_display_profile.cpp
diff --git a/icc/source/create_sRGB_profile/Makefile.in b/icc/source/create_sRGB_profile/Makefile.in
deleted file mode 100644
index 5745b7a..0000000
--- a/icc/source/create_sRGB_profile/Makefile.in
+++ /dev/null
@@ -1,378 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-EGREP = @EGREP@
-F77 = @F77@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_VERSION = @LIBTOOL_VERSION@
-LN_S = @LN_S@
-MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-RC = @RC@
-SAMPLEICC_VERSION = @SAMPLEICC_VERSION@
-SICC_ICC_APPLY_PROFILES = @SICC_ICC_APPLY_PROFILES@
-STRIP = @STRIP@
-TIFF_CPPFLAGS = @TIFF_CPPFLAGS@
-TIFF_LDFLAGS = @TIFF_LDFLAGS@
-TIFF_LIBS = @TIFF_LIBS@
-VERSION = @VERSION@
-am__include = @am__include@
-am__quote = @am__quote@
-install_sh = @install_sh@
-
-bin_PROGRAMS = \
-	create_sRGB_profile
-
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/IccProfLib \
-	-I$(top_srcdir)/Contrib/ICC_utils
-
-
-LDADD = -L$(top_builddir)/IccProfLib -lSampleICC \
-	-L$(top_builddir)/Contrib/ICC_utils -lICC_utils
-
-
-create_sRGB_profile_SOURCES = \
-	create_sRGB_profile.cpp
-
-subdir = Contrib/CmdLine/create_sRGB_profile
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = create_sRGB_profile$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_create_sRGB_profile_OBJECTS = create_sRGB_profile.$(OBJEXT)
-create_sRGB_profile_OBJECTS = $(am_create_sRGB_profile_OBJECTS)
-create_sRGB_profile_LDADD = $(LDADD)
-create_sRGB_profile_DEPENDENCIES =
-create_sRGB_profile_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/create_sRGB_profile.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(create_sRGB_profile_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(create_sRGB_profile_SOURCES)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Contrib/CmdLine/create_sRGB_profile/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-create_sRGB_profile$(EXEEXT): $(create_sRGB_profile_OBJECTS) $(create_sRGB_profile_DEPENDENCIES) 
-	@rm -f create_sRGB_profile$(EXEEXT)
-	$(CXXLINK) $(create_sRGB_profile_LDFLAGS) $(create_sRGB_profile_OBJECTS) $(create_sRGB_profile_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create_sRGB_profile.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-
-.cpp.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
deleted file mode 100644
index 00454f6..0000000
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ /dev/null
@@ -1,551 +0,0 @@
-/*************************************************************************
- *
- *  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
-*/
-
-/*
- * The ICC Software License, Version 0.1
- *
- *
- * Copyright (c) 2003-2006 The International Color Consortium. All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    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
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    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,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "ICC" and "The International Color Consortium" must
- *    not be used to imply that the ICC organization endorses or
- *    promotes products derived from this software without prior
- *    written permission. For written permission, please see
- *    <http://www.color.org/>.
- *
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE INTERNATIONAL COLOR CONSORTIUM OR
- * ITS CONTRIBUTING MEMBERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the The International Color Consortium. 
- *
- *
- * Membership in the ICC is encouraged when this software is used for
- * commercial purposes. 
- *
- *  
- * For more information on The International Color Consortium, please
- * see <http://www.color.org/>.
- *  
- * 
- */
-
-#include <math.h>
-#include <iostream>
-#include <fstream>
-using namespace std;
-
-#include "IccUtil.h"
-#include "IccProfile.h"
-
-#include "Vetters.h"
-#include "CAT.h"
-#include "CLUT.h"
-
-const char * const icc_file_name = "sRGB-IEC61966-2.1.icc";
-const char * const hxx_file_name = "sRGB-IEC61966-2.1.hxx";
-const char * const this_file_name_and_location =" * icc/source/create_sRGB_profile/create_sRGB_profile.cpp";
-
-const char* const description = "sRGB IEC61966-2.1";
-//const char* const devicemanufact = "IEC http://www.iec.ch"; not used, device manufactured by OOo seems funny...
-const char* const devicemodel = "IEC 61966-2.1 Default RGB colour space - sRGB";
-const char* const copyright = "The Contents of this file are made available subject to the terms of GNU Lesser General Public License version 3";
-
-// the creation date is fixed, corresponds to the last time this file has been changed
-// NOTE: change this date values whenever the data inside the profile are changed.
-const int  data_last_changed_year =     2007;
-const int  data_last_changed_month =    12;
-const int  data_last_day =              12;
-const int  data_last_changed_hour =     18;
-const int  data_last_changed_minute =   32;
-
-// the following string array it's the standard OOo header format
-const char * const TheHeader1[] =
-{
-    "/*************************************************************************",
-    " *",
-    " *  OpenOffice.org - a multi-platform office productivity suite",
-    " *",
-    " *  sRGB-IEC61966-2.1.hxx",
-    " *",
-    " *  creator: create_sRGB_profile",
-    NULL
-};
-
-const char * const TheHeader2[] =
-{
-    " *",
-    " * This file is part of OpenOffice.org.",
-    " *",
-    " * OpenOffice.org is free software: you can redistribute it and/or modify",
-    " * it under the terms of the GNU Lesser General Public License version 3",
-    " * only, as published by the Free Software Foundation.",
-    " *",
-    " * OpenOffice.org is distributed in the hope that it will be useful,",
-    " * but WITHOUT ANY WARRANTY; without even the implied warranty of",
-    " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
-    " * GNU Lesser General Public License version 3 for more details",
-    " * (a copy is included in the LICENSE file that accompanied this code).",
-    " *",
-    " * You should have received a copy of the GNU Lesser General Public License",
-    " * version 3 along with OpenOffice.org.  If not, see",
-    " * <http://www.openoffice.org/license.html>",
-    " * for a copy of the LGPLv3 License.",
-    " *",
-    " ************************************************************************/",
-    "",
-    "#ifndef INCLUDED_ICC_SRGB_IEC61966_2_1_H",
-    "#define INCLUDED_ICC_SRGB_IEC61966_2_1_H",
-    "",
-    "/***********************************************************************",
-    " * NOTE:",
-    " * this file is automatically generated by running the program",
-    " * obtained building:",
-    this_file_name_and_location,
-    " * contained in module icc",
-    " * modify that program if you need to change something.",
-    " ***********************************************************************/",
-    NULL // last string, a null
-};
-
-const char * const TheTail[] =
-{
-    "#endif /* INCLUDED_ICC_SRGB_IEC61966_2_1_H */",
-    NULL
-};
-
-icFloatNumber computeIEC_RGBtoXYZ( icFloatNumber indata )
-{
-    double retval = 0.0;
-    if(indata < 0.04045)
-        retval = indata/12.92;
-    else // apply the other conversion
-        retval = pow( (indata + 0.055)/1.055 , 2.4);
-
-    return retval;
-}
-
-icFloatNumber computeIEC_XYZtoRGB( icFloatNumber indata )
-{
-    icFloatNumber retval = 0.0;
-    if(indata < 0.0031308)
-        retval = indata*12.92;
-    else // apply the other conversion
-        retval =  1.055*pow( indata , icFloatNumber(1.0/2.4)) - 0.055;
-
-    //  cout << retval << endl;
-    return retval;
-}
-
-void dumpTag(FILE *outfile, CIccProfile *pIcc, icTagSignature sig)
-{
-    CIccTag *pTag = pIcc->FindTag(sig);
-    char buf[64];
-    CIccInfo Fmt;
-
-    std::string contents;
-
-    if (pTag)
-    {
-        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()));
-        pTag->Describe(contents);
-        fwrite(contents.c_str(), contents.length(), 1, outfile);
-    }
-    else
-        fprintf(outfile, "Tag (%s) not found in profile\n", icGetSig(buf, sig));
-}
-
-void dumpProfile(FILE *outfile, const char * profileName)
-{
-    CIccProfile *pIcc;
-    std::string sReport;
-    icValidateStatus nStatus;
-
-    pIcc = OpenIccProfile(profileName);
-
-    if (!pIcc)
-        printf("Unable to open '%s'\n", profileName);
-    else
-    {
-        icHeader *pHdr = &pIcc->m_Header;
-        CIccInfo Fmt;
-        char buf[64];
-
-        fprintf(outfile,"Profile:          '%s'\n", profileName);
-        if(Fmt.IsProfileIDCalculated(&pHdr->profileID))
-            fprintf(outfile,"Profile ID:        %s\n", Fmt.GetProfileID(&pHdr->profileID));
-        else
-            fprintf(outfile,"Profile ID:       Profile ID not calculated.\n");
-        fprintf(outfile,"Size:             %ld(0x%lx) bytes\n", pHdr->size, pHdr->size);
-
-        fprintf(outfile,"\nHeader\n");
-        fprintf(outfile,"------\n");
-        fprintf(outfile,"Attributes:       %s\n", Fmt.GetDeviceAttrName(pHdr->attributes));
-        fprintf(outfile,"Cmm:              %s\n", Fmt.GetCmmSigName((icCmmSignature)(pHdr->cmmId)));
-        fprintf(outfile,"Creation Date:    %d/%d/%d  %02u:%02u:%02u\n",
-                pHdr->date.month, pHdr->date.day, pHdr->date.year,
-                pHdr->date.hours, pHdr->date.minutes, pHdr->date.seconds);
-        fprintf(outfile,"Creator:          %s\n", icGetSig(buf, pHdr->creator));
-        fprintf(outfile,"Data Color Space: %s\n", Fmt.GetColorSpaceSigName(pHdr->colorSpace));
-        fprintf(outfile,"Flags             %s\n", Fmt.GetProfileFlagsName(pHdr->flags));
-        fprintf(outfile,"PCS Color Space:  %s\n", Fmt.GetColorSpaceSigName(pHdr->pcs));
-        fprintf(outfile,"Platform:         %s\n", Fmt.GetPlatformSigName(pHdr->platform));
-        fprintf(outfile,"Rendering Intent: %s\n", Fmt.GetRenderingIntentName((icRenderingIntent)(pHdr->renderingIntent)));
-        fprintf(outfile,"Type:             %s\n", Fmt.GetProfileClassSigName(pHdr->deviceClass));
-        fprintf(outfile,"Version:          %s\n", Fmt.GetVersionName(pHdr->version));
-        fprintf(outfile,"Illuminant:       X=%.4lf, Y=%.4lf, Z=%.4lf\n",
-                icFtoD(pHdr->illuminant.X),
-                icFtoD(pHdr->illuminant.Y),
-                icFtoD(pHdr->illuminant.Z));
-
-        fprintf(outfile,"\nProfile Tags\n");
-        fprintf(outfile,"------------\n");
-
-        fprintf(outfile,"%25s    ID    %8s\t%8s\n", "Tag", "Offset", "Size");
-        fprintf(outfile,"%25s  ------  %8s\t%8s\n", "----", "------", "----");
-
-        int n;
-        TagEntryList::iterator i;
-
-        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), 
-                    i->TagInfo.offset, i->TagInfo.size);
-        }
-
-        for (n=0, i=pIcc->m_Tags->begin(); i!=pIcc->m_Tags->end(); ++i, ++n)
-            dumpTag(outfile, pIcc, i->TagInfo.sig);
-    }
-    delete pIcc;
-}
-
-int main(int argc, char* argv[])
-{
-    const char* myName = path_tail(argv[0]);
-
-    try
-    {
-        const char* const out_file_pathname = icc_file_name;
-
-        CIccProfile profile;
-        profile.InitHeader();
-
-        profile.m_Header.date.year = data_last_changed_year;
-        profile.m_Header.date.month = data_last_changed_month;
-        profile.m_Header.date.day = data_last_day;
-        profile.m_Header.date.hours = data_last_changed_hour;
-        profile.m_Header.date.minutes = data_last_changed_minute;
-        profile.m_Header.date.seconds = 0;
-
-        profile.m_Header.deviceClass = icSigDisplayClass;
-        profile.m_Header.colorSpace = icSigRgbData;
-        profile.m_Header.pcs = icSigXYZData;
-        profile.m_Header.platform = icSigUnkownPlatform;
-        profile.m_Header.attributes = static_cast<icUInt64Number>(icReflective);
-        profile.m_Header.renderingIntent = icPerceptual;
-
-        profile.m_Header.cmmId = 0x6E6F6E65; /* 'none' */
-        profile.m_Header.model = 0x73524742;//sRGB
-
-        profile.m_Header.version=icVersionNumberV2_1;
-
-        // 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
-        //   greenMatrixColumnTag
-        //   blueMatrixColumnTag
-        //   redTRCTag
-        //   greenTRCTag
-        //   blueTRCTag
-        //   mediaWhitePointTag
-
-        // the other tags:
-        //
-        // technologyTag
-        // deviceModelTag
-        // deviceMfgDescTag
-        // mediaBlackPointTag
-        // viewingCondDescTag
-        // viewingConditionsTag
-        // luminanceTag
-        // measurementTag
-        // 
-        // are optionals, added for completeness
-
-        // the element below are sorted in the same order as
-        // the list above, but the LUT table,
-        // embedded at the end of the profile
-
-        // copyrightTag
-        CIccTagText* copyrightTag = new CIccTagText;
-        copyrightTag->SetText(copyright);
-        profile.AttachTag(icSigCopyrightTag, copyrightTag);
-
-        // profileDescriptionTag
-        CIccTagTextDescription* descriptionTag = new CIccTagTextDescription;
-        descriptionTag->SetText(description);
-        profile.AttachTag(icSigProfileDescriptionTag, descriptionTag);
-
-        CIccTagXYZ* redMatrixColumnTag = new CIccTagXYZ;
-        //values from raccomandation of ICC for sRGB, D50 referenced characterisation data
-        //should be: 0.4361, 0.2225, 0.0139 according to application notes,
-        // the 'X' value below is the one commonly in use on a very
-        // diffused sRGB profile
-        (*redMatrixColumnTag)[0].X = icDtoF(0.4361);
-        (*redMatrixColumnTag)[0].Y = icDtoF(0.2225);
-        (*redMatrixColumnTag)[0].Z = icDtoF(0.0139);
-        profile.AttachTag(icSigRedMatrixColumnTag, redMatrixColumnTag);
-
-        CIccTagXYZ* greenMatrixColumnTag = new CIccTagXYZ;
-        //values from raccomandation of ICC for sRGB, D50 referenced characterisation data
-        (*greenMatrixColumnTag)[0].X = icDtoF(0.3851);
-        (*greenMatrixColumnTag)[0].Y = icDtoF(0.7169);
-        (*greenMatrixColumnTag)[0].Z = icDtoF(0.0971);
-        profile.AttachTag(icSigGreenMatrixColumnTag, greenMatrixColumnTag);
-
-        CIccTagXYZ* blueMatrixColumnTag = new CIccTagXYZ;
-        //values from raccomandation of ICC for sRGB, D50 referenced characterisation data
-        //should be: 0.1431, 0.0606, 0.7139 according to application notes,
-        // the 'Z' value below is the one commonly in use on a very
-        // diffused sRGB profile
-        (*blueMatrixColumnTag)[0].X = icDtoF(0.1431);
-        (*blueMatrixColumnTag)[0].Y = icDtoF(0.0606);
-        (*blueMatrixColumnTag)[0].Z = icDtoF(0.7141);
-        profile.AttachTag(icSigBlueMatrixColumnTag, blueMatrixColumnTag);
-
-        // mediaWhitePointTag
-        CIccTagXYZ* whitePointTag = new CIccTagXYZ;
-        (*whitePointTag)[0].X = icDtoF(0.9505);
-        (*whitePointTag)[0].Y = icDtoF(1.0);
-        (*whitePointTag)[0].Z = icDtoF(1.0891);
-        profile.AttachTag(icSigMediaWhitePointTag, whitePointTag);        
-
-        //device signature (technologytag)
-        CIccTagSignature* deviceSign = new CIccTagSignature;
-        deviceSign->SetValue( icSigCRTDisplay );
-        profile.AttachTag( icSigTechnologyTag, deviceSign );
-
-        //device model tag
-        CIccTagTextDescription* deviceModelTag = new CIccTagTextDescription;
-        deviceModelTag->SetText("IEC 61966-2.1 Default RGB colour space - sRGB");
-        profile.AttachTag( icSigDeviceModelDescTag, deviceModelTag);
-
-        // deviceMfgDescTag
-        CIccTagTextDescription* deviceMfgTag = new CIccTagTextDescription;
-        deviceMfgTag->SetText("IEC http://www.iec.ch");
-        profile.AttachTag( icSigDeviceMfgDescTag, deviceMfgTag);
-
-        // mediaBlackPointTag
-        CIccTagXYZ* blackPointTag = new CIccTagXYZ;
-        (*blackPointTag)[0].X =
-        (*blackPointTag)[0].Y =
-        (*blackPointTag)[0].Z = icDtoF(0.0);
-        profile.AttachTag(icSigMediaBlackPointTag, blackPointTag);
-
-        // viewingCondDescTag
-        CIccTagTextDescription* viewingCondDescTag = new CIccTagTextDescription;
-        viewingCondDescTag->SetText("Reference viewing condition according to IEC 61966-2.1");
-        profile.AttachTag( icSigViewingCondDescTag, viewingCondDescTag );
-
-        // viewingConditionsTag
-        CIccTagViewingConditions* viewingConditionsTag = new  CIccTagViewingConditions;
-        // 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        
-        (*viewingConditionsTag).m_XYZSurround.X = icDtoF(3.9289);
-        (*viewingConditionsTag).m_XYZSurround.Y = icDtoF(4.0744);
-        (*viewingConditionsTag).m_XYZSurround.Z = icDtoF(3.3618);
-        (*viewingConditionsTag).m_illumType = icIlluminantD50;
-        profile.AttachTag( icSigViewingConditionsType, viewingConditionsTag );
-
-        // luminanceTag
-        CIccTagXYZ* luminanceTag = new CIccTagXYZ;
-        (*luminanceTag)[0].X = icDtoF(76.0365);
-        (*luminanceTag)[0].Y = icDtoF(80.0);
-        (*luminanceTag)[0].Z = icDtoF(87.1246);
-        profile.AttachTag(icSigLuminanceTag, luminanceTag);
-
-        // measurementTag
-        CIccTagMeasurement* measurementTag = new  CIccTagMeasurement;
-        (*measurementTag).m_Data.stdObserver = icStdObs1931TwoDegrees;
-        (*measurementTag).m_Data.backing.X =
-        (*measurementTag).m_Data.backing.Y =
-        (*measurementTag).m_Data.backing.Z = icDtoF(0.0);
-        (*measurementTag).m_Data.geometry = icGeometryUnknown;
-        // the flare is 1%, but the library doesn't seem all right with this
-        // see specification ICC.1:1998-09, clause 6.5.8, table 55 fot the right
-        // format of the data value
-        (*measurementTag).m_Data.flare = static_cast< icMeasurementFlare > ( icDtoUF( 0.01 ) );//means 1%
-        (*measurementTag).m_Data.illuminant = icIlluminantD65;
-        profile.AttachTag(icSigMeasurementTag, measurementTag );
-
-        // 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            
-        CIccTagCurve* colorTRCTag = new CIccTagCurve(N);
-        // apply conversion from RGB to XYZ, stepping the RGB value linearly from 0 to 100%
-        // 1024 steps are computed            
-        for (int i = 0; i < N; ++i)
-            (*colorTRCTag)[i] = computeIEC_RGBtoXYZ( (icFloatNumber)i/(N-1));
-
-        profile.AttachTag(icSigRedTRCTag, colorTRCTag);
-        profile.AttachTag(icSigGreenTRCTag, colorTRCTag);
-        profile.AttachTag(icSigBlueTRCTag, colorTRCTag);
-
-        //Verify things
-        string validationReport;
-        icValidateStatus validationStatus = profile.Validate(validationReport);
-
-        switch (validationStatus)
-        {
-        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
-                 << validationReport;
-        }
-
-        // Out it goes
-        CIccFileIO out;
-        out.Open(out_file_pathname, "wb+");
-        profile.Write(&out);
-        out.Close();
-
-        FILE *headerfile = fopen(hxx_file_name,"w");
-
-        //print OpenOffice standard file header
-        const char *the_string;
-
-        int idx = 0;
-
-        while((the_string = TheHeader1[idx++]) != NULL )
-            fprintf(headerfile,"%s\n",the_string);
-// print the creation date (today)
-// print the date of sRGB ICC profile data
-        fprintf(headerfile," *  the date of last change to sRGB ICC profile data is:\n *  %4d/%02d/%02d - %02d:%02d\n",
-                data_last_changed_year, data_last_changed_month,
-                data_last_day, data_last_changed_hour,data_last_changed_minute );
-
-        idx = 0;
-
-        while((the_string = TheHeader2[idx++]) != NULL )
-            fprintf(headerfile,"%s\n",the_string);
-
-        {
-// spit out the data structure (an array of unsigned char)            
-            FILE *infile;
-
-            int achar, number = 1;
-
-            infile = fopen(out_file_pathname,"rb");
-
-            fseek(infile,0,SEEK_END);
-            long int thesize= ftell(infile);
-            fseek(infile,0,SEEK_SET);
-
-            fprintf(headerfile,"\nsal_uInt8 nsRGB_ICC_profile[%d]=\n{\n    ",thesize);
-
-            do
-            {
-                achar = fgetc(infile);
-                if(achar == EOF)
-                    break;
-                fprintf(headerfile,"0x%02x",achar);
-                if(number % 12 == 0)
-                    fprintf(headerfile,",\n    ");
-                else
-                    fprintf(headerfile,", ");
-                number++;
-            } while(achar != EOF );
-            fprintf(headerfile,"\n};\n\n");
-
-            fclose(infile);      
-        }
-        // append the file contents, in human readable form, as comment in the header
-        // get the functions from iccDump
-
-        fprintf(headerfile,"/*****************\n\n");
-
-        fprintf(headerfile,"This ICC profile contains the following data:\n\n");
-
-        dumpProfile(headerfile, out_file_pathname );
-
-        fprintf(headerfile,"\n*****************/\n");
-        //now append the tail      
-        idx = 0;
-        while((the_string = TheTail[idx++]) != NULL )
-            fprintf(headerfile,"%s\n",the_string);
-
-        fclose(headerfile);
-
-        return EXIT_SUCCESS;
-    }
-    catch (const std::exception& e)
-    {
-        cout << myName << ": error: " << e.what() << endl;
-        return EXIT_FAILURE;
-    }
-}
diff --git a/libtextcat/data/new_fingerprints/LICENSE b/libtextcat/data/new_fingerprints/LICENSE
deleted file mode 100644
index 6d88370..0000000
--- a/libtextcat/data/new_fingerprints/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2003, WiseGuys Internet B.V.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the WiseGuys Internet B.V. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libtextcat/data/new_fingerprints/fpdb.conf b/libtextcat/data/new_fingerprints/fpdb.conf
deleted file mode 100644
index 329184d..0000000
--- a/libtextcat/data/new_fingerprints/fpdb.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# A sample config file for the language models
-# provided with Gertjan van Noords language guesser
-# (http://odur.let.rug.nl/~vannoord/TextCat/)
-#
-# Notes:
-# - You may consider eliminating a couple of small languages from this
-# list because they cause false positives with big languages and are
-# bad for performance. (Do you really want to recognize Drents?)
-# - Putting the most probable languages at the top of the list
-# improves performance, because this will raise the threshold for
-# likely candidates more quickly.
-#
-
-# this file have been modified (to OOo by Jocelyn MERAND joc.mer@gmail.com) to include country and encoding
-# guess strings are made as following : language-country-encoding
-
-afrikaans.lm                         af--utf8
-albanian.lm                          sq--utf8
-amharic_utf.lm                       am--utf8
-arabic.lm                            ar--utf8
-basque.lm                            eu--utf8
-belarus.lm                           be--utf8
-bosnian.lm                           bs--utf8
-breton.lm                            br--utf8
-catalan.lm                           ca--utf8
-chinese_simplified.lm                zh-CN-utf8
-chinese_traditional.lm               zh-TW-utf8
-croatian.lm                          hr--utf8
-czech.lm                             cs--utf8
-danish.lm                            da--utf8
-dutch.lm                             nl--utf8
-english.lm                           en--utf8
-esperanto.lm                         eo--utf8
-estonian.lm                          et--utf8
-finnish.lm                           fi--utf8
-french.lm                            fr--utf8
-frisian.lm                           fy--utf8
-georgian.lm                          ka--utf8
-german.lm                            de--utf8
-greek.lm                             el--utf8
-hebrew.lm                            he--utf8
-hindi.lm                             hi--utf8
-hungarian.lm                         hu--utf8
-icelandic.lm                         is--utf8
-indonesian.lm                        id--utf8
-irish_gaelic.lm                      ga--utf8
-italian.lm                           it--utf8
-japanese.lm                          ja--utf8
-korean.lm                            ko--utf8
-latin.lm                             la--utf8
-latvian.lm                           lv--utf8
-lithuanian.lm                        lt--utf8
-luxembourgish.lm                     lb--utf8
-malay.lm                             ms--utf8
-manx_gaelic.lm                       gv--utf8
-marathi.lm                           mr--utf8
-mongolian_cyrillic.lm                mn--utf8
-nepali.lm                            ne--utf8
-norwegian.lm                         nb--utf8       # Norwegian (Bokmal)
-persian.lm                           fa--utf8       # Farsi
-polish.lm                            pl--utf8
-portuguese.lm                        pt-PT-utf8
-quechua.lm                           qu--utf8
-romanian.lm                          ro--utf8
-romansh.lm                           rm--utf8
-russian.lm                           ru--utf8
-sanskrit.lm                          sa--utf8
-scots.lm                             sco--utf8
-scots_gaelic.lm                      gd--utf8
-serbian.lm                           sr--utf-8
-serbian-latin.lm                     sh--utf-8
-slovak_ascii.lm                      sk-SK-utf8
-slovenian.lm                         sl--utf8
-spanish.lm                           es--utf8
-swahili.lm                           sw--utf8
-swedish.lm                           sv--utf8
-tagalog.lm                           tl--utf8
-tamil.lm                             ta--utf8
-thai.lm                              th--utf8
-turkish.lm                           tr--utf8
-ukrainian.lm                         uk--utf8
-vietnamese.lm                        vi--utf8
-welsh.lm                             cy--utf8
-yiddish_utf.lm                       yi--utf8
-zulu.lm                              zu--utf8
diff --git a/libtextcat/data/new_fingerprints/lm/afrikaans.lm b/libtextcat/data/new_fingerprints/lm/afrikaans.lm
deleted file mode 100644
index c110f15..0000000
--- a/libtextcat/data/new_fingerprints/lm/afrikaans.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 23602
-e	 8036
-a	 4087
-n	 3782
-i	 3726
-o	 3314
-r	 2951
-s	 2885
-t	 2749
-d	 2479
-e_	 2118
-l	 1854
-k	 1741
-ie	 1670
-g	 1601
-n_	 1447
-m	 1440
-_d	 1219
-t_	 1143
-er	 1124
-h	 1124
-u	 1110
-ie_	 1079
-y	 1048
-w	 986
-s_	 982
-_s	 969
-_h	 956
-di	 924
-an	 922
-r_	 912
-aa	 882
-v	 876
-en	 807
-_di	 807
-.	 790
-y_	 747
-_v	 709
-et	 706
-._	 694
-die	 691
-die_	 667
-_n	 666
-_die	 651
-p	 639
-_m	 634
-_die_	 633
-_w	 632
-ee	 607
-ge	 606
-_o	 598
-b	 586
-te	 568
-,	 560
-in	 555
-k_	 550
-_e	 550
-,_	 548
-oo	 516
-et_	 511
-de	 509
-el	 489
-_g	 486
-f	 461
-ar	 451
-ni	 450
-nd	 442
-an_	 440
-en_	 437
-_i	 426
-he	 423
-g_	 418
-_t	 412
-oe	 410
-at	 406
-er_	 400
-om	 381
-wa	 378
-_a	 378
-_b	 377
-_k	 371
-nie	 371
-_he	 370
-aar	 355
-_ge	 351
-es	 351
-_ni	 348
-da	 346
-m_	 342
-ou	 338
-it	 335
-_nie	 335
-d_	 332
-l_	 330
-_wa	 329
-or	 327
-le	 326
-we	 326
-ek	 324
-het	 321
-me	 319
-_het	 319
-is	 318
-j	 315
-at_	 311
-on	 309
-se	 308
-_en	 298
-ma	 294
-st	 291
-as	 280
-va	 277
-_en_	 270
-re	 270
-"	 269
-'	 265
-het_	 261
-_het_	 260
-om_	 254
-al	 252
-ar_	 250
-li	 248
-te_	 247
-aar_	 247
-_da	 245
-u_	 242
-nde	 241
-ou_	 237
-_l	 231
-be	 229
-_'	 226
-rd	 224
-_va	 224
-ig	 223
-ng	 222
-ns	 221
-ve	 220
-it_	 218
-_j	 216
-_me	 216
-sy	 215
-ke	 213
-_sy	 212
-aan	 212
-van	 212
-_in	 210
-is_	 210
-in_	 208
-sy_	 206
-_sy_	 206
-'n	 205
-ro	 205
-ko	 204
-_'n	 203
-ra	 203
-'n_	 203
-_'n_	 202
-so	 202
-D	 202
-ho	 201
-rs	 200
-eer	 200
-ik	 199
-la	 198
-_te	 196
-_van	 196
-_ma	 195
-as_	 194
-ui	 194
-ver	 192
-e.	 192
-der	 191
-to	 188
-op	 187
-van_	 184
-ag	 184
-_ve	 182
-and	 180
-_van_	 178
-ha	 178
-f_	 176
-ka	 176
-ne	 175
-_is	 175
-sk	 174
-e._	 174
-oor	 174
-_ver	 170
-ek_	 170
-_hy	 170
-hy	 170
-p_	 168
-_be	 168
-ri	 168
-ur	 167
-nie_	 165
-_so	 165
-_D	 164
-si	 164
-ll	 164
-no	 164
-_in_	 163
-_hy_	 162
-hy_	 162
-ed	 161
-ers	 160
-_r	 156
-ak	 156
-_ho	 155
-_nie_	 153
-eg	 153
-nt	 152
-de_	 152
-_p	 151
-_we	 148
-_is_	 148
-ei	 147
-es_	 142
-maa	 142
-wee	 142
-na	 141
-nder	 139
-a_	 138
-ing	 138
-ew	 138
-S	 135
-lle	 135
-_om	 135
-_te_	 134
-eu	 134
-ie.	 134
-wo	 132
-em	 132
-wat	 131
-_no	 130
-_"	 130
-vo	 130
-E	 129
-H	 128
-_wat	 127
-ti	 126
-mo	 126
-A	 126
-e,	 126
-_ha	 125
-vi	 125
-el_	 125
-ter	 125
-e,_	 124
-dat	 124
-eer_	 124
-wat_	 124
-le_	 124
-ta	 124
-Di	 123
-dat_	 123
-_wat_	 122
-ie._	 122
-was	 121
-ste	 121
-_H	 121
-_se	 121
-se_	 120
-ul	 120
-al_	 120
-_was	 120
-_om_	 119
-_st	 119
-lik	 118
-"_	 118
-_ko	 118
-_maa	 118
-lo	 117
-_to	 117
-ns_	 115
-aan_	 115
-nie.	 114
-_vi	 114
-met	 114
-_nie.	 111
-nk	 110
-_Di	 110
--	 110
-_op	 109
-_oo	 109
-_on	 108
-ir	 108
-ord	 108
-uit	 106
-ens	 105
-_was_	 105
-was_	 105
-een	 105
-_met	 105
-os	 105
-_S	 104
-nie._	 104
-ig_	 103
-_sk	 102
-op_	 101
-_ek	 101
-_wee	 101
-ir_	 101
-met_	 100
-_met_	 100
-rt	 100
-ik_	 99
-end	 99
-nd_	 99
-gt	 99
-ond	 98
-ot	 98
-_aa	 97
-og	 97
-vir_	 95
-vir	 95
-_ka	 94
-hu	 94
-_mo	 94
-_vir_	 94
-_vir	 94
-_dit	 93
-kr	 93
-am	 93
-ol	 93
-dit	 93
-_ek_	 93
-ki	 93
-sa	 93
-_aan	 92
-man	 92
-jy	 92
-ng_	 92
-aak	 92
-lle_	 91
-_hu	 91
-_na	 91
-_vo	 90
-ewe	 90
-of	 90
-jy_	 90
-_dit_	 90
-dit_	 90
-_jy	 89
-der_	 89
-jo	 89
-_f	 88
-_u	 88
-sie	 87
-_dat	 87
-_jy_	 87
-daa	 87
-do	 87
-vr	 87
-wi	 86
-ry	 86
-_dat_	 86
-eur	 86
-rs_	 85
-_jo	 85
-_wo	 84
-_ne	 84
-jie	 84
-ji	 84
-pe	 83
-moe	 83
-my	 82
-ull	 82
-Die	 81
-maar	 81
-_hom	 81
-ulle	 81
-_maar	 81
-hom	 81
-_uit	 80
-_ui	 80
-ges	 80
-raa	 80
-or_	 80
-ies	 80
-jou	 79
-_la	 79
-maar_	 79
-ulle_	 79
-_daa	 79
-Die_	 79
-daar	 78
-_daar	 78
-ien	 78
-_my	 78
-_jou	 78
-ok	 78
-il	 78
-lik_	 77
-sta	 77
-_Die	 77
-ur_	 77
-ga	 77
-ag_	 77
-kan	 77
diff --git a/libtextcat/data/new_fingerprints/lm/albanian.lm b/libtextcat/data/new_fingerprints/lm/albanian.lm
deleted file mode 100644
index 0665a96..0000000
--- a/libtextcat/data/new_fingerprints/lm/albanian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 19480
-ë	 4099
-e	 4082
-t	 3635
-i	 3134
-a	 2893
-r	 2820
-n	 2610
-s	 2380
-h	 2060
-ë_	 2055
-e_	 1825
-j	 1677
-u	 1489
-d	 1381
-o	 1370
-m	 1318
-k	 1264
-të	 1091
-p	 1072
-_t	 1068
-sh	 998
-l	 936
-_n	 876
-a_	 822
-,	 816
-,_	 808
-të_	 795
-i_	 770
-_p	 739
-_m	 702
-_s	 700
-te	 653
-ër	 620
-_d	 613
-_e	 607
-g	 602
-_k	 601
-_të	 593
-.	 575
-_të_	 574
-v	 567
-_e_	 554
-r_	 525
-._	 523
-ht	 503
-n_	 480
-he	 473
-në	 462
-sht	 461
-te_	 457
-q	 454
-nd	 436
-ri	 432
-is	 414
-et	 403
-b	 402
-je	 401
-me	 395
-in	 391
-it	 381
-rë	 374
-_a	 374
-t_	 359
-ur	 353
-_i	 346
-ar	 342
-ës	 339
-er	 338
-në_	 338
-ën	 338
-dh	 337
-en	 336
-pë	 334
-f	 328
-_v	 323
-jë	 318
-nj	 313
-ish	 312
-për	 294
-y	 285
-z	 282
-es	 281
-at	 274
-_me	 273
-_q	 273
-gj	 269
-ra	 261
-as	 258
-_në	 256
-ku	 256
-j_	 250
-ta	 249
-re	 246
-një	 245
-o_	 243
-ni	 243
-_pë	 240
-hte	 240
-_nj	 239
-on	 239
-isht	 236
-pa	 234
-th	 233
-shte	 233
-_për	 232
-se	 228
-_g	 223
-ve	 221
-in_	 220
-s_	 219
-_në_	 219
-do	 218
-hte_	 218
-më	 216
-ti	 215
-aj	 212
-shte_	 212
-ej	 212
-u_	 211
-që	 211
-_sh	 210
-nt	 207
-jë_	 206
-_b	 205
-_një	 203
-di	 202
-_pa	 201
-_i_	 201
-ll	 199
-_f	 199
-kë	 198
-me_	 197
-dhe	 195
-ishte	 195
-si	 194
-hi	 191
-he_	 188
--	 187
-ja	 187
-_që	 187
-ua	 186
-il	 184
-_dh	 184
-ur_	 183
-ër_	 182
-or	 180
-se_	 179
-që_	 178
-S	 176
-ç	 175
-_h	 173
-an	 172
-një_	 172
-ng	 170
-nte	 170
-_që_	 169
-_S	 169
-rë_	 166
-dhe_	 165
-_me_	 164
-ka	 162
-im	 159
-hë	 158
-mi	 157
-to	 156
-tu	 156
-ën_	 155
-_një_	 154
-ha	 153
-nte_	 150
-tr	 148
-sa	 148
-ët	 148
-_gj	 148
-un	 147
-rr	 147
-ë,	 147
-_dhe	 147
-ej_	 147
-ki	 146
-ë,_	 146
-_ku	 145
-_-	 144
-_ng	 142
-ik	 141
-_nd	 140
-end	 138
-uk	 137
-etë	 135
-ko	 135
-_dhe_	 135
-_ve	 132
-va	 131
-_l	 131
-për_	 131
-shi	 131
-erë	 129
-ke	 127
-kis	 127
-së	 126
-jo	 125
-li	 124
-ga	 124
-kish	 123
-_ki	 122
-po	 122
-_se	 122
-'	 121
-du	 120
-mb	 120
-_më	 119
-Si	 115
-më_	 115
-esh	 115
-_si	 114
-qe	 114
-lë	 114
-_kis	 113
-oh	 113
-_kish	 113
-_Si	 113
-pr	 112
-_u	 112
-uar	 111
-de	 111
-hu	 111
-_th	 111
-al	 111
-ta_	 109
-ilv	 108
-Sil	 108
-Silv	 108
-lv	 108
-k_	 108
-e,	 108
-ji	 107
-e,_	 106
-_Sil	 106
-_Silv	 106
-_r	 105
-os	 104
-_se_	 104
-kisht	 102
-_di	 102
-st	 101
-_për_	 101
-bë	 101
-tj	 100
-_nga	 99
-nga	 99
-_du	 98
-ra_	 98
-vë	 98
-gji	 98
-_ish	 96
-rt	 96
-_is	 96
-ro	 95
-ir	 94
-ga_	 94
-ësh	 94
-ont	 93
-c	 93
-t,	 93
-t,_	 93
-hin	 92
-a,	 92
-_at	 92
-und	 92
-jt	 91
-_mb	 91
-a,_	 91
-tje	 90
-_nga_	 90
-_do	 90
-_pr	 90
-rit	 90
-men	 90
-nga_	 90
-ri_	 89
-N	 89
-ma	 89
-it_	 88
-_kë	 88
--_	 88
-m_	 87
-jo_	 87
-onte	 87
-atë	 87
-la	 87
-ëri	 87
-ilva	 86
-shin	 86
-ë.	 86
-Silva	 86
-lva	 86
-së_	 85
-jer	 85
-et_	 85
-_po	 85
-ës_	 84
-kur	 84
-ru	 84
-nin	 83
-ot	 83
-hin_	 83
-_N	 83
-her	 83
-htë	 82
-ap	 82
-shin_	 82
-mo	 81
-ash	 81
-tha	 81
-_ç	 81
-ë._	 81
-ëm	 81
-jit	 80
-_ta	 80
-ul	 80
-le	 80
-ho	 80
-_z	 79
-dr	 78
-jet	 78
-nin_	 78
-_më_	 78
-gjit	 78
-A	 78
-hk	 78
-onte_	 78
-oni	 77
-lo	 77
-ba	 77
-herë	 77
-ndo	 76
-shk	 76
-mend	 75
-_vë	 75
-ha_	 75
-dë	 75
-tur	 74
-_A	 74
-el	 74
-bi	 74
-_ko	 74
-uk_	 73
-erë_	 73
-si_	 73
-_sa	 73
-ar_	 72
-P	 72
-rs	 72
-pas	 72
-ith	 72
-uar_	 71
-_isht	 71
-ai	 70
-e.	 70
-_vet	 70
-vet	 70
-_bë	 70
-zi	 70
-d_	 70
-jith	 70
-da	 70
-gjith	 69
-duk	 69
-na	 69
-hej	 69
-tër	 68
-_men	 68
-_ka	 68
-am	 68
-nd_	 68
-_c	 67
-_pas	 67
-_duk	 67
-jes	 67
-ak	 67
-s,	 67
-e._	 67
-s,_	 67
-K	 67
-ësht	 67
-mu	 66
-kur_	 66
-yr	 66
-em	 65
-_së	 65
-tha_	 65
-imi	 65
-ie	 65
-hej_	 64
-_së_	 64
-_u_	 64
-?	 64
-fu	 64
-_P	 64
diff --git a/libtextcat/data/new_fingerprints/lm/amharic_utf.lm b/libtextcat/data/new_fingerprints/lm/amharic_utf.lm
deleted file mode 100644
index 0c5bc81..0000000
--- a/libtextcat/data/new_fingerprints/lm/amharic_utf.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-�	 21403
-_	 10092
-�	 7734
-�	 6558
-_�	 5003
-�	 4717
-�	 4401
-�	 4274
-�	 4176
-�	 4054
-�	 3868
-�	 2728
-�	 1656
-�	 1591
-�	 1579
-�	 1425
-��	 1402
-_�	 1261
-_�	 1231
-�	 1217
-��	 1187
-��	 1183
-_�	 1160
-�	 1145
-��	 1123
-�	 1097
-ን	 1043
-��	 1043
-�	 1041
-��	 1004
-_�	 991
-�	 936
-�	 880
-��	 855
-ው	 855
-�	 849
-��	 805
-��	 783
-ት	 783
-�_	 763
-��	 709
-��	 704
-��	 682
-በ	 682
-��	 679
-�	 670
-��	 667
-በ�	 666
-���	 666
-��	 658
-�	 643
-የ	 637
-��	 637
-���	 627
-የ�	 627
-ለ	 614
-��	 614
-��	 611
-ር	 611
-�_	 588
-��_	 583
-ት_	 583
-_የ	 577
-_የ�	 574
-ለ�	 573
-���	 573
-ን�	 570
-���	 570
-መ	 563
-��	 563
-���	 557
-መ�	 557
-��	 554
-አ	 554
-አ�	 553
-ተ	 553
-���	 553
-��	 553
-ተ�	 547
-���	 547
-ም	 534
-��	 534
-��	 532
--	 531
-ስ	 525
-��	 525
---	 521
-ል	 515
-��	 515
----	 512
-----	 503
-_በ	 499
------	 494
-_በ�	 487
-��	 479
-��	 477
-�_	 473
-���	 469
-ው�	 469
-ን_	 468
-��_	 468
-�	 465
-�	 464
-ያ	 457
-��	 457
-��	 444
-_አ	 424
-_አ�	 424
-ስ�	 423
-���	 423
-�_	 415
-��	 402
-�	 401
-�	 390
-��	 389
-�	 382
-��_	 378
-ው_	 378
-��	 365
-���	 364
-ያ�	 364
-�	 363
-ል�	 357
-���	 357
-�	 356
-�_	 351
-��	 347
-ች	 347
-��	 341
-ነ	 341
-ይ	 337
-��	 337
-።	 337
-��	 337
-��_	 337
-።_	 337
-��	 336
-�	 334
-��	 320
-እ	 320
-��	 320
-��	 320
-���	 318
-እ�	 318
-��_	 314
-ር_	 314
-��	 312
-��	 311
-��	 301
-ና	 300
-ገ	 300
-��	 300
-��	 300
-��	 299
-��	 297
-ር�	 294
-��	 294
-ግ	 294
-���	 294
-�	 293
-���	 291
-ከ	 291
-���	 291
-���	 291
-��	 291
-ም�	 291
-ገ�	 291
-ነ�	 291
-ደ	 288
-��	 288
-_እ	 285
-_እ�	 283
-�	 279
-���	 279
-ከ�	 279
-���	 279
-በ�	 279
-ን�	 276
-��	 276
-���	 276
-_�	 272
-��	 270
-ብ	 270
-�_	 269
-ግ�	 264
-���	 264
-���	 262
-��	 262
-መ�	 262
-��	 262
-ይ�	 261
-���	 261
-��	 260
-ማ	 260
-ደ�	 259
-���	 259
-ራ	 254
-��	 254
-ባ	 254
-��	 254
-�	 253
-��	 249
-��	 247
-��	 245
-��	 244
-ላ	 242
-��	 242
-የ�	 242
-���	 242
-ማ�	 238
-���	 238
-��	 237
-ረ	 237
-��	 237
-���	 236
-ተ�	 236
-ም_	 235
-��_	 235
-��	 234
-��	 233
-��	 233
-���	 230
-��	 230
-ባ�	 230
-ሚ	 230
-ድ	 228
-��	 228
-_መ	 227
-��	 227
-_መ�	 226
-���	 225
-ረ�	 225
-�	 225
-�።	 222
-�።_	 222
-��	 216
-እ�	 214
-ሚ�	 214
-���	 214
-���	 214
-��	 213
-��	 212
-��	 210
-���	 209
-ላ�	 209
-�	 208
-��	 207
-��	 206
-�_	 206
-���	 205
-ብ�	 205
-��	 202
-��	 200
-ታ	 200
-��	 200
-ሰ	 200
-���	 199
-ራ�	 199
-ሰ�	 198
-���	 198
-ት�	 195
-ወ	 195
-���	 195
-��	 195
-���	 194
-ወ�	 194
-��	 191
-�	 191
-��_	 189
-ች_	 189
-��	 188
-��	 186
-�	 186
-_ለ	 184
-_ለ�	 183
-ለ�	 183
-���	 183
-�ን	 180
-���	 179
-የ�	 179
-��	 178
-�	 177
-�ን�	 177
-_ከ	 175
-��	 174
-ጥ	 174
-���	 172
-አ�	 172
-_ከ�	 170
-�	 170
-�_	 169
-��ን	 169
-��	 166
-��	 166
-ል�	 165
-�_	 165
-���	 165
-ና_	 163
-��_	 163
-��	 160
-ቸ	 160
-ቸ�	 160
-���	 160
-��	 160
-��	 159
-��	 159
-��	 158
-ቀ	 158
-��	 158
-��	 156
-ቀ�	 155
-���	 155
-ች�	 154
-���	 154
-ል_	 154
-���	 154
-�ው	 154
-ቸ�	 154
-��_	 154
-��	 152
-��	 151
-��ው	 151
-��	 150
-_ነ	 150
-�	 150
-_ነ�	 150
-�	 150
-_ይ�	 150
-_ይ	 150
-���	 149
-ታ�	 149
-��።	 148
-���	 147
-ደ�	 147
-���	 147
-በ�	 147
-�	 146
-_ተ	 146
-_ተ�	 146
-ለ�	 145
-���	 145
-ድ�	 144
-��	 144
-��	 144
-���	 144
-ቅ	 143
-��	 143
-�_	 143
-ግ�	 142
-���	 142
-��	 141
-ዳ	 141
-��	 139
-ህ	 138
-��	 138
-���	 137
-ና�	 137
-��	 137
-�ን	 136
-��	 136
-አ�	 135
-���	 135
-��	 135
-ስ�	 134
-���	 134
-ጠ	 133
-ዳ�	 133
-��	 133
-ሆ�	 133
-���	 133
-ሆ	 133
-���	 133
-��	 133
-ሆ�	 132
-���	 132
-�ተ	 131
-ያ�	 131
-�ተ�	 131
-���	 131
-��	 129
-��	 128
-��	 128
-ክ	 128
-ፍ	 128
-��	 128
-��	 127
-���	 127
-ጠ�	 127
-��	 126
-ካ	 126
-��	 124
-በ�	 123
-��	 123
-ያ�	 123
-���	 123
-���	 123
-���	 122
-ከ�	 122
-���	 121
-ገ�	 121
diff --git a/libtextcat/data/new_fingerprints/lm/arabic.lm b/libtextcat/data/new_fingerprints/lm/arabic.lm
deleted file mode 100644
index 85f7019..0000000
--- a/libtextcat/data/new_fingerprints/lm/arabic.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-ا
-ل
-و
-ال
-_ا
-ي
-ن
-م
-_ال
-ر
-ب
-.
-ت
-د
-ع
-ه
-_و
-ن_
-ف
-ا_
-ك
-ج
-..
-ة
-ح
-أ
-س
-_م
-._
-ق
-ة_
-ه_
-لا
-ْ
-_أ
-ان
-_ف
-ُ
-_ب
-َ
-لم
-د_
-ول
-ي_
-ى
-ى_
-...
-وج
-_ل
-_ع
-ل_
-وا
-جو
-ْ.
-ص
-الم
-_الم
-..._
-.._
-ث
-ود
-ذ
-ش
-من
-وجو
-َ_
-في
-لا_
-جود
-ر_
-لى_
-لى
-ان_
-وجود
-لو
-م_
-_ت
-ِ
-_من
-ْ...
-_وا
-لع
-الو
-عل
-ْ..._
-ْ..
-ين
-الع
-_في
-ز
-ات
-_ي
-_الع
-ُ_
-_ك
-_الو
-من_
-_ان
-مر
-ء
-في_
-يا
-ب_
-را
-،_
-ِ_
-،
-ض
-_في_
-تب
-_من_
-لوج
-كا
-لي
-ت_
-لوجو
-ّ
-ون
-الوج
-اء
-جود_
-أح
-_أح
-الوجو
-له
-ود_
-ها
-حا
-ذا
-_ر
-على_
-وجود_
-على
-رب
-لوجود
-عر
-_ان_
-او
-اول
-ط
-رت
-لت
-بْ
-أحا
-_الوج
-أحاو
-با
-وال
-_ول
-اد
-_وال
-حاول
-_أحاو
-_أحا
-أحاول
-_،_
-حاو
-_،
-ني
-بي
-_عل
-لن
-ته
-ما
--_
--
-مرتب
-نا
-_.
-ها_
-مرت
-_._
-_-
-_-_
-بة
-ول_
-_ح
-رتب
-دا
-له_
-ء_
-ك_
-قي
-تبة
-اول_
-مرتبة
-ية
-بل
-ور
-ده
-الت
-خ
-رتبة
-الا
-رتبة_
-ين_
-عرب
-ير
-بة_
-تبة_
-قد
-ربْ
-لعربْ
-لعر
-العر
-أن
-لك
-حد
-ون_
-لعرب
-_على_
-_العر
-تُ
-عن
-بْ.
-_لا
-حاول_
-ذات
-العرب
-_على
-ية_
-عربْ
-إ
-اب
-ئ
-سا
-نو
-كو
-المر
-لل
-يت
-_ش
-لم_
-_المر
-اع
-مو
-لمر
-_الا
-ته_
-اج
-ٍ
-_ق
-س_
-ائ
-جب
-ام
-اجب_
-كون
-واجب_
-لَ
-_لا_
-اني
-سي
-واج
-سم
-لَ_
-يس
-ال_
-_ولا
-عي
-وص
-عا
-جب_
-اس
-ير_
-_مر
-واجب
-اجب
-_بل
-الن
-ولا
-_بال
-وأ
-أع
-اك
-وق
-بلاد
-نت
-نف
-ضا
-نه
-كون_
-بْ..
-ثل
-كل
-ولا_
-_ذا
-ذاته
-المرت
-دة
-ذاته_
-ور_
-بال
-بْ...
-_ولا_
-_الت
-يه
-_الل
-_س
-اء_
-ات_
-بلا
-_وأ
-_ذ
-صو
-ربْ.
-_بلاد
-لاد
-_بلا
-غ
-لمرتب
-_ه
-بن
-لمرت
-عربْ.
-_ن
-_ذات
-اته_
-لله
-ْ._
-_با
-اته
-_إ
-وم
-الل
-الوا
-موج
-_الله
-نْ
-لُ
-اف
-_يكو
-لر
-قا
-عين
-ست
-يكون
-موجو
-ليس
-ده_
-لُ_
-_وج
-_وص
-دي
-حم
-الواج
-بين
-_الر
-_يك
-مس
-مُ
-لله_
-ٍ_
-عد
-يل
-_الن
-عق
-اش
-يكو
-يق
-الر
-تُ_
-_كا
-شي
-_يكون
-لوا
-ار
-موجود
-يك
-هْ
-_ذاته
-ع_
-جا
-الله
-فو
-وب
-_عي
-رس
-دة_
-لواجب
-يكون_
-لواج
-رك
-ف_
-كان
-لص
-لش
-لث
-زا
-ياء
-ساء
-لعق
-انت
-علم
-العق
-ما_
-قد_
-لف
-الله_
diff --git a/libtextcat/data/new_fingerprints/lm/armenian.lm b/libtextcat/data/new_fingerprints/lm/armenian.lm
deleted file mode 100644
index e69de29..0000000
--- a/libtextcat/data/new_fingerprints/lm/armenian.lm
+++ /dev/null
diff --git a/libtextcat/data/new_fingerprints/lm/basque.lm b/libtextcat/data/new_fingerprints/lm/basque.lm
deleted file mode 100644
index 32522a7..0000000
--- a/libtextcat/data/new_fingerprints/lm/basque.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 12114
-a	 5537
-e	 4040
-i	 3103
-t	 2567
-n	 2474
-r	 2406
-o	 1937
-k	 1761
-z	 1627
-u	 1561
-d	 1367
-l	 1075
-s	 1048
-b	 995
-n_	 958
-a_	 957
-en	 802
-g	 772
-_e	 736
-er	 680
-ra	 669
-.	 625
-at	 610
-_b	 594
-ar	 589
-an	 585
-_d	 580
-,	 569
-,_	 569
-h	 563
-ta	 563
-te	 555
-._	 520
-ko	 513
-m	 503
-o_	 486
-al	 481
-en_	 471
-tz	 458
-re	 435
-_a	 423
-ik	 416
-in	 409
-it	 392
-za	 391
-ak	 388
-ba	 358
-et	 357
-da	 352
-di	 351
-ka	 350
-ze	 349
-ai	 347
-p	 340
-ri	 335
-la	 329
-an_	 327
-de	 322
-ez	 318
-na	 314
-ti	 307
-be	 305
-i_	 302
-iz	 294
-k_	 293
-tu	 289
-eta	 287
-(	 280
-)	 280
-_i	 279
-or	 276
-_(	 270
-ko_	 269
-ek	 265
-rr	 264
-_h	 263
-e_	 260
-es	 260
-_ba	 258
-nt	 258
-ha	 255
-_g	 247
-era	 246
-ia	 240
-_be	 234
-oa	 229
-un	 229
-ta_	 218
-ma	 212
-on	 211
-z_	 209
-du	 207
-(_	 205
-_(_	 205
-:	 204
-tze	 204
-:_	 204
-us	 191
-u_	 191
-_da	 188
-ren	 183
-az	 183
-_)	 183
-ur	 182
-st	 182
-ea	 181
-_et	 181
-eta_	 179
-zi	 178
-si	 177
-zen	 177
-as	 176
-_n	 175
-go	 175
-_eta	 172
-il	 169
-tik	 169
-_z	 167
-_eta_	 167
-ne	 167
-bi	 166
-zk	 166
-sk	 165
-ag	 163
-t_	 162
-le	 160
-rt	 160
-ke	 158
--	 150
-gu	 148
-au	 148
-tza	 147
-_de	 147
-ati	 146
-ut	 146
-A	 145
-li	 145
-hi	 145
-E	 144
-bat	 144
-_o	 143
-a,	 142
-a,_	 142
-_m	 141
-ntz	 141
-ad	 140
-ren_	 139
-_er	 138
-io	 138
-)_	 138
-_ez	 138
-ir	 137
-eh	 137
-ab	 135
-ate	 135
-ak_	 134
-sa	 134
-ra_	 134
-_bat	 133
-nd	 133
-_l	 133
-ki	 132
-ere	 131
-ika	 125
-ku	 125
-f	 124
-ga	 123
-ld	 122
-_di	 121
-arr	 120
-el	 120
-eg	 119
-uz	 119
-are	 116
-ng	 116
-os	 116
-_E	 115
-gi	 113
-_p	 113
-_du	 113
-mo	 113
-zen_	 112
-ib	 111
-_k	 110
-ber	 109
-ako	 108
-_iz	 107
-iza	 107
-ala	 107
-itz	 107
-har	 106
-eko	 106
-adi	 105
-l_	 105
-ie	 105
-ste	 105
-atu	 104
-am	 104
-ska	 104
-ah	 104
-_.	 104
-r_	 104
-zt	 103
-rri	 103
-ait	 103
-ua	 103
-tzen	 103
-ald	 103
-usk	 102
-aren	 102
-_._	 102
-ro	 102
-id	 100
-la_	 99
-_s	 98
-ue	 98
-tek	 97
-uska	 97
-atz	 96
-aren_	 96
-_ha	 95
-rre	 95
-"	 94
-atik	 94
-tzen_	 94
-ara	 94
-in_	 93
-ni	 93
-j	 92
-ge	 91
-ez_	 91
-ain	 91
-od	 91
-no	 91
-na_	 91
-ri_	 90
-tan	 90
-mat	 90
-do	 89
-_mo	 88
-ho	 88
-iko	 88
-beh	 88
-_ad	 88
-al_	 87
-_iza	 87
-I	 87
-zan	 87
-_ze	 87
-_adi	 87
-_A	 86
-uk	 86
-eha	 85
-dit	 85
-ru	 85
-pe	 85
-eko_	 84
-ela	 84
-ed	 84
-kar	 84
-n,_	 83
-ari	 83
-bil	 83
-_beh	 83
-bai	 83
-tu_	 83
-n,	 83
-ehar	 83
-_izan	 82
-itu	 82
-_ho	 82
-is	 82
-ean	 82
-ama	 82
-izan	 82
-_)_	 81
-ik_	 81
-B	 80
-koa	 80
-ot	 80
-_na	 79
-zu	 79
-beha	 78
-behar	 78
-_t	 78
-H	 78
-_ko	 78
-dir	 77
-mati	 76
-_j	 75
-at_	 75
-em	 74
-tika	 74
-K	 74
-_B	 74
-zte	 74
-ten	 74
-_beha	 74
-ter	 74
-matik	 73
-egi	 73
-_dir	 73
-a.	 72
-ago	 72
-kal	 72
-ram	 72
-ena	 72
-unt	 71
-lt	 71
-_H	 71
-su	 71
-mod	 71
-bo	 71
-G	 70
-_ber	 70
-lde	 70
-c	 69
-te_	 69
-ar_	 69
-me	 69
-ina	 69
-dal	 69
-ako_	 68
-L	 68
-rik	 68
-a._	 68
-ori	 68
-ite	 68
-raz	 67
-alde	 67
-)._	 67
-).	 67
-zio	 66
-_ez_	 66
-tan_	 66
-amat	 66
-atika	 66
-est	 66
-ntza	 65
-dut	 65
-izk	 65
-_ga	 65
-ia_	 65
-s_	 65
-ita	 65
-tea	 64
-ei	 64
-hal	 64
-_mod	 64
-pa	 64
-bu	 64
-re_	 63
-eu	 63
-ert	 63
-oa_	 63
-_era	 63
-ten_	 63
-_G	 63
-_eg	 63
-rama	 63
-odal	 63
-ramat	 63
-oda	 63
-amati	 62
-atze	 62
-gr	 62
-untz	 62
-eza	 62
-gra	 62
-_ge	 61
-gram	 61
-kat	 61
-abi	 61
-_gr	 60
-_gram	 60
-_gra	 60
-int	 60
-rd	 60
-_in	 60
-k,	 59
-_hi	 59
-zko	 59
-k,_	 59
-pr	 59
-rab	 59
-da_	 59
-ide	 58
-_)._	 57
-tat	 57
-ing	 57
-ira	 57
-tak	 57
-x	 57
-_).	 57
-_ed	 57
-_es	 57
-_bi	 57
-rak	 56
-_-	 56
diff --git a/libtextcat/data/new_fingerprints/lm/belarus.lm b/libtextcat/data/new_fingerprints/lm/belarus.lm
deleted file mode 100644
index 7d58602..0000000
--- a/libtextcat/data/new_fingerprints/lm/belarus.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-а
-н
-р
-е
-i
-к
-ы
-л
-у
-я
-с
-т
-д
-а_
-о
-м
-в
-ц
-з
-.
-на
-г
-п
-ка
-._
-ра
-ч
-i_
-э
-ал
-у_
-ар
-ан
-я_
-та
-,
-б
-,_
-ва
-ы_
-ш
-_с
-ла
-ь
-й
-_д
-ле
-га
-_а
-ад
-_п
-ры
-да
-_у
-ен
-ты
-й_
-е_
-_г
-ны
-_н
-на_
-зе
-_в
--
-_б
-ас
-ам
-_i
-ав
-ро
-аг
-_у_
-_з
-па
-нн
-ск
-х
-ю
-_м
-не
-дз
-_i_
-_к
-А
-ыя
-пр
-ст
-ак
-ын
-iк
-ль
-ня
-нi
-лi
-за
-аз
-ру
-ет
-ж
-ян
-ку
-ля
-ай
-_М
-_А
-_я
-нс
-ага
-ат
-ай_
-М
-але
-га_
-ага_
-ме
-_на
-ала
-"
-_па
-тр
-ер
-кал
-кi
-м_
-кт
-ава
-вi
-дзе
-нск
-ана
-В
-го
-ац
-сц
-а.
-)
-о_
-iн
-_ад
-цы
-ца
-а._
-тар
-ма
-цi
-ау
-ь_
-ска
-ча
-_ка
-са
-р_
-_._
-як
-_га
-_р
-_т
-_пр
-_за
-ве
-ся
-ны_
-да_
-др
-мi
-бы
-_.
-рэ
-ара
-он
-оу
-_да
-ек
-и
-лек
-_У
-ым
-ыл
-ая
-ло
-нк
-нт
-пра
-)_
-пi
-ары
-_на_
-та_
-рн
-х_
-У
-сi
-шы
-кр
-ая_
-ел
-ван
-ец
-ста
-чы
-_бы
-ае
-I
-_э
-_П
-iка
-яу
-эд
-(
-iм
-газе
-_газ
-_газе
-_I
-азе
-_)
-вя
-_(
-iч
-тро
-ня_
-аш
-ор
-газ
-_)_
-ов
-аван
-П
-ран
-ун
-ля_
-ар_
-дак
-вар
-_да_
-ыян
-св
-черн
-_Я
-ык
-ктрон
-трон
-эл
-'
-ект
-ектро
-но
-нага_
-нна
---
-iл
-ку_
-няу
--_
-Ал
-Ве
-был
-рыя
-онн
-_-
-ронн
-iя
-эдак
-ктр
-кта
-сан
-лi_
-_"
-д_
-элект
-ап
-ктро
-_эл
-чер
-элек
-зе_
-лектр
-мп
-ерн
-_эле
-_кал
-нска
-ктар
-сцi
-Вечер
-ечер
-ач
-ечерн
-Я
-ам_
-ектр
-Вече
-кс
-_--_
-дзе_
-тронн
-наг
-Н
-эда
-Веч
-Б
-ты_
-зет
-ече
-лект
-_Ал
-еч
-ук
-ада
-рон
-_ва
-ла_
-_элек
-_был
-ус
---_
-нага
-че
-вары
-эле
-_--
-рав
-уку
-каг
-_ш
-кай
-ний_
-На
-ий_
-ка.
-_ч
-ннаг
-ыц
-_Р
-рус
-_В
-_Н
-яр
-эн
-эм
-_Б
-кра
-черни
-у,_
-нд
-ни
-дакт
-лару
-нц
-кага_
-_Мин
-ныя
-Минс
-нь
-акта
-лар
-_для
-..
-_вар
-нiк
-i,
-_пра
-i.
-янт
-яна
-о,
-су
-(_
-бо
-ння
-ць
-рни
-цц
-це
-янта_
-дл
-_Минс
-ларус
-янта
-_го
-тэ
-к_
-_рэ
-ерни
-вы
-цца
-ана_
-ронна
-не_
-ндр
-зеты_
-_як
-Мин
-для_
-_для_
-елар
-Бел
-рыян
diff --git a/libtextcat/data/new_fingerprints/lm/bosnian.lm b/libtextcat/data/new_fingerprints/lm/bosnian.lm
deleted file mode 100644
index cf6b8a4..0000000
--- a/libtextcat/data/new_fingerprints/lm/bosnian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 9464
-a	 2787
-i	 2108
-e	 2077
-o	 2018
-j	 1396
-n	 1328
-s	 1170
-u	 1010
-r	 988
-d	 957
-a_	 889
-e_	 833
-t	 774
-je	 771
-k	 756
-l	 743
-m	 702
-v	 685
-p	 604
-c	 538
-i_	 538
-_s	 522
-u_	 476
-z	 463
-_p	 450
-o_	 433
-,_	 381
-,	 381
-_i	 369
-_n	 358
-b	 349
-_d	 349
-.	 346
-na	 341
-je_	 337
-._	 321
-_j	 307
-g	 299
-ra	 292
-st	 283
-ko	 278
-_je	 274
-ij	 254
-_o	 245
-ni	 240
-_k	 236
-an	 228
-oj	 227
-da	 226
-_u	 222
-pr	 221
-no	 219
-ma	 219
-la	 211
-ri	 206
-_je_	 203
-po	 203
-ci	 196
-_pr	 191
-os	 190
-od	 187
-ka	 186
-im	 185
-ti	 184
-li	 182
-vo	 178
-_po	 174
-ja	 171
-_i_	 169
-ov	 169
-al	 168
-re	 167
-ne	 167
-m_	 164
-ta	 160
-na_	 158
-ed	 157
-_m	 157
-_na	 157
-se	 156
-_u_	 154
-en	 153
-ic	 151
-sa	 151
-_b	 149
-ak	 141
-va	 140
-ad	 137
-h	 136
-ju	 135
-su	 134
-dj	 133
-ije	 133
-ar	 127
-ca	 127
-_z	 126
-nj	 125
-ji	 124
-da_	 124
-_ko	 123
-_da	 122
-il	 121
-"	 120
-av	 120
-_t	 118
-aj	 116
-ob	 115
-ro	 114
-am	 114
-vi	 114
-_su	 113
-om	 112
-dje	 112
-za	 112
-at	 111
-le	 111
-di	 110
-su_	 107
-iz	 107
-ve	 107
-lj	 106
-_se	 105
-ev	 105
-is	 105
-es	 103
-se_	 103
-do	 101
-ih	 100
-a,	 99
-_su_	 99
-a,_	 99
-on	 98
-bi	 98
-in	 97
-voj	 97
-az	 96
-ac	 95
-_da_	 95
-la_	 95
-_r	 93
-_g	 93
-jev	 92
-ma_	 92
-er	 92
-or	 91
-h_	 90
-_sa	 90
-e,	 90
-e,_	 90
-ba	 90
-ima	 89
-a.	 88
-ol	 88
-_do	 87
-dn	 87
-it	 87
-ko_	 86
-ne_	 86
-ost	 85
-ek	 85
-to	 85
-d_	 84
-as	 84
-ju_	 84
-ao	 84
-ih_	 84
-a._	 84
-te	 83
-evo	 83
-koj	 83
-pri	 82
-jevo	 82
-ce	 81
-_se_	 81
-og	 80
-go	 80
-jevoj	 79
-de	 79
-uc	 79
-evoj	 79
-_od	 78
-_za	 78
-tr	 78
-S	 77
-_koj	 76
-ke	 75
-_v	 75
-ao_	 75
-_dje	 74
-_bi	 74
-sta	 74
-_dj	 74
-cij	 74
-ik	 74
-djev	 73
-sl	 73
-_djev	 72
-ga	 72
-djevo	 72
-_ka	 71
-rij	 71
-_iz	 71
-P	 71
-_pri	 70
-_a	 69
-us	 68
-_S	 68
-mo	 67
-el	 67
-sk	 66
-me	 66
-zi	 66
-ija	 65
-n_	 65
-ku	 64
-im_	 63
-_st	 63
-ica	 63
-_na_	 62
-_ne	 62
-em	 61
-edn	 61
-jk	 61
-io	 61
-li_	 60
-ojk	 60
-evojk	 60
-_"	 60
-zn	 60
-vojk	 60
-pro	 59
-lo	 59
-ije_	 59
-jed	 58
-ke_	 58
-om_	 58
-jen	 58
-sti	 57
-_im	 57
-le_	 57
-_ra	 56
-e.	 56
-ze	 55
-_pro	 55
-nu	 55
-nje	 55
-ti_	 55
-ec	 55
-pre	 55
-oc	 54
-aci	 54
-no_	 54
-et	 54
-oji	 53
-si	 53
-ara	 53
-ama	 53
-z_	 53
-pos	 52
-rad	 52
-ran	 52
-ima_	 52
-ru	 52
-_P	 52
-tu	 52
-mu	 51
-e._	 51
-ja_	 50
-_pre	 50
-sa_	 49
-io_	 49
-od_	 48
-ni_	 48
-_nj	 48
-j_	 48
-_pos	 47
-_c	 47
-ila	 47
-K	 46
-_sa_	 46
-uz	 46
-N	 46
-_ni	 45
-zna	 45
-U	 45
-za_	 45
-_no	 45
-ako	 45
-u,	 44
-lu	 44
-ali	 44
-u,_	 44
-sto	 44
-ste	 44
-ve_	 44
-ani	 44
-oli	 44
-aka	 44
-_jed	 43
-i,_	 43
-ji_	 43
-uci	 43
-i,	 43
-ci_	 43
-osti	 43
-_N	 42
-dr	 42
-so	 42
-ust	 41
-ila_	 41
-B	 41
--	 41
-red	 41
-jke	 41
-sv	 41
-_go	 41
-bar	 41
-g_	 41
-est	 40
-D	 40
-iv	 40
-vojke	 40
-aju	 40
-ta_	 40
-A	 40
-lje	 40
-jedn	 40
-bil	 40
-ojke	 40
-ova	 40
-ati	 39
-_mu	 39
-pa	 39
-M	 39
-_ba	 39
-ca_	 39
-O	 39
-ka_	 39
-_a_	 38
-_B	 38
-_ima	 38
-sn	 38
-nu_	 38
-T	 38
-to_	 38
-eg	 38
-ava	 38
-ros	 37
-ir	 37
-ala	 37
-og_	 37
-osl	 37
-ovi	 37
-koji	 37
-_sv	 37
-dv	 36
-ric	 36
-_za_	 36
-br	 36
-_on	 36
-odi	 36
-_koji	 36
-_jedn	 35
-nik	 35
-dno	 35
-_D	 35
-jo	 35
-tra	 35
-_M	 35
-sp	 35
-iz_	 35
-oz	 35
-vr	 35
-u.	 35
-eri	 35
-I	 35
-eko	 35
-ale	 35
-_ma	 34
-lik	 34
-_bil	 34
-c_	 34
-ut	 34
-je,_	 34
-u._	 34
-str	 34
-je,	 34
-adi	 34
-tit	 34
-_iz_	 34
-iti	 34
-i.	 33
-_rad	 33
-ici	 33
-rost	 33
-aju_	 33
-va_	 33
-_ob	 33
-nog	 33
diff --git a/libtextcat/data/new_fingerprints/lm/breton.lm b/libtextcat/data/new_fingerprints/lm/breton.lm
deleted file mode 100644
index 6d021d7..0000000
--- a/libtextcat/data/new_fingerprints/lm/breton.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 21447
-e	 6375
-a	 5414
-n	 3228
-r	 3039
-o	 2968
-t	 2392
-i	 1812
-h	 1751
-u	 1650
-l	 1630
-d	 1506
-a_	 1352
-z	 1319
-t_	 1310
-_e	 1168
-_a	 1168
-e_	 1133
-m	 1105
-s	 1100
-g	 1090
-r_	 998
-k	 997
-n_	 958
-et	 941
-v	 888
-_d	 868
-an	 859
-.	 846
-'	 841
-en	 836
-b	 757
-,	 749
-,_	 743
-._	 716
-ar	 703
-ou	 700
-et_	 689
-c	 686
-ez	 572
-'h	 572
-_g	 565
-er	 555
-p	 553
-_k	 535
-c'h	 530
-c'	 530
-nt	 513
-_h	 505
-re	 505
-ra	 478
-ha	 466
-ñ	 458
-ne	 456
-oa	 454
-_o	 442
-_b	 434
--	 432
-zh	 422
-ar_	 415
-_m	 414
-_e_	 414
-nn	 384
-el	 376
-_a_	 356
-ur	 350
-o_	 346
-h_	 345
-ve	 340
-nt_	 340
-w	 339
-ke	 338
-de	 333
-añ	 332
-_p	 332
-s_	 327
-he	 325
-on	 318
-le	 318
-ga	 316
-ma	 315
-_ar	 312
-eu	 312
-_n	 310
-an_	 298
-ant	 296
-enn	 285
-z_	 282
-_ar_	 281
-be	 280
-_v	 276
-_r	 272
-al	 270
-en_	 268
-_ke	 267
-l_	 264
-em	 264
-_c	 263
-ñ_	 262
-da	 262
-_s	 261
-ho	 260
-di	 259
-_ha	 252
-ll	 250
-tr	 248
-oa_	 247
-me	 246
-us	 242
-_ga	 234
-la	 231
-ket	 227
-ant_	 219
-_da	 219
-_l	 216
-ur_	 216
-_oa	 215
-in	 214
-ket_	 211
-gan	 211
-_c'	 207
-_u	 207
-_c'h	 207
-ad	 207
-añ_	 207
-ao	 204
-_ma	 204
-_t	 204
-_ket	 201
-_an	 199
-_di	 197
-ezh	 196
-ù	 196
-où	 196
-_de	 195
-ev	 193
-?	 192
-st	 192
-ro	 192
-P	 192
-_ket_	 188
-er_	 188
-f	 186
-na	 186
-ue	 185
-da_	 184
-?_	 184
-_gan	 184
-_da_	 184
-_ne	 183
-ed	 182
-_P	 180
-g_	 180
-pe	 179
-m_	 178
-A	 177
-ri	 176
-us_	 175
-ta	 174
-ze	 174
-gant	 174
-ka	 174
-i_	 172
-d_	 171
-G	 167
-te	 167
-ae	 166
-zh_	 164
-ha_	 163
-_ha_	 163
-_he	 161
-_gant	 159
-do	 159
-oue	 159
-_G	 158
-eus	 158
-eo	 158
-'h_	 157
-_en	 157
-go	 157
-am	 157
-c'h_	 157
-_be	 156
-we	 156
-iz	 154
-_an_	 151
-_A	 150
-eus_	 147
-sk	 147
-li	 146
-as	 146
-_pe	 146
-j	 146
-_oa_	 146
-av	 144
-gant_	 143
-ut	 142
-no	 141
-vez	 140
-va	 140
-_ra	 140
-ge	 138
-ez_	 138
-bo	 137
- 	 137
-_ur	 136
-lo	 134
-he_	 134
-où_	 133
-ù_	 133
-_ur_	 132
-es	 130
-'ho	 129
-ni	 129
-uz	 129
-tra	 127
-se	 126
-it	 125
-ra_	 125
-out	 125
-is	 125
-at	 125
-hi	 125
-eg	 125
-ig	 124
-ko	 124
-io	 123
-k_	 123
-ch	 123
-_w	 121
-or	 121
-Pe	 121
-_ma_	 119
-ma_	 119
-gw	 118
-_em	 118
-_Pe	 118
-un	 118
-eme	 117
-ne_	 117
-nn_	 117
-c'ho	 117
-ol	 116
-ag	 116
-M	 115
-'ha	 115
-_en_	 115
-iv	 115
-vi	 113
-_ka	 113
-K	 113
-ud	 112
-_he_	 111
-ont	 110
-oc	 110
-vo	 110
-ec	 109
-wa	 109
-..	 107
-_M	 107
-_z	 107
-br	 107
-om	 106
-to	 105
-_f	 105
-N	 105
-_c'ho	 104
-ti	 104
-ut_	 104
-D	 104
-_o_	 103
-_la	 103
-_go	 101
-az	 101
-out_	 101
-ba	 101
-enn_	 101
-c'ha	 101
-our	 100
-oc'h	 100
-ell	 100
-oc'	 100
-etr	 99
-el_	 99
-_K	 99
-_D	 99
-:	 99
-:_	 99
-eve	 98
-_d'	 97
-all	 97
-d'	 97
-E	 97
-_ne_	 97
-_me	 95
-eo_	 95
-ak	 95
-bet	 95
-_eu	 95
-rc	 94
-_do	 94
-_gw	 94
-zi	 93
-oz	 93
-aou	 93
-etra	 92
-pa	 91
-ab	 90
-on_	 90
-ei	 90
-tra_	 90
-n,	 89
-zo	 89
-ag_	 89
-_ev	 88
-ul	 88
-'e	 88
-n'	 88
-n,_	 88
-ouz	 87
-v_	 86
-_n'	 86
-_eus	 84
-H	 83
-za	 83
-S	 83
-etra_	 83
-_eo	 82
-t,_	 82
-t,	 82
-il	 81
-ent	 81
-fe	 81
-rc'h	 81
-rc'	 81
-_eus_	 80
-ie	 80
-_bo	 79
-ele	 79
-_ve	 79
-mp	 79
-_bet	 78
-B	 78
-it_	 77
-_vo	 77
-'a	 77
-n.	 76
-_S	 76
-hag	 76
-hoa	 75
-_hag	 75
-len	 75
-_N	 75
-'hoa	 74
-_E	 74
-ir	 74
-hag_	 74
-_hag_	 74
-mañ	 74
-as_	 73
-eze	 73
-ont_	 73
-_.	 73
-iñ	 73
-r,	 72
-pr	 72
-ed_	 72
-n._	 72
-re_	 72
-in_	 72
-r,_	 72
-_H	 71
-'he	 70
-t.	 70
-gou	 70
-em_	 70
-_br	 70
-rae	 70
-rez	 69
-t._	 69
-bet_	 69
-net	 69
-dr	 68
-_eo_	 68
-ll_	 68
-mo	 67
-po	 67
-oul	 67
-rou	 67
-c'hoa	 67
-a-	 67
-vel	 67
-oc'h_	 67
-nna	 66
-_B	 66
-met	 65
-ec'	 65
-ec'h	 65
-R	 64
-den	 64
diff --git a/libtextcat/data/new_fingerprints/lm/catalan.lm b/libtextcat/data/new_fingerprints/lm/catalan.lm
deleted file mode 100644
index 086a45b..0000000
--- a/libtextcat/data/new_fingerprints/lm/catalan.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 16604
-e	 5091
-a	 4937
-s	 3120
-r	 3037
-i	 2987
-l	 2747
-n	 2641
-t	 2466
-o	 2274
-d	 1775
-c	 1740
-u	 1515
-a_	 1460
-s_	 1416
-_d	 1116
-e_	 1067
-p	 1014
-m	 995
-es	 985
-de	 972
-_de	 842
-en	 700
-_l	 691
-re	 652
-_e	 637
-de_	 611
-el	 602
-_de_	 601
-_a	 600
-,	 599
-,_	 599
-er	 598
-la	 584
-ar	 583
-_p	 550
-l_	 547
-ci	 522
-n_	 518
-es_	 515
-an	 515
-ra	 499
-nt	 495
-ta	 495
-b	 476
-_c	 452
-al	 450
-v	 440
-g	 428
-.	 420
-on	 420
-or	 404
-t_	 402
-at	 396
-._	 377
-r_	 372
-i_	 371
-la_	 368
-_i	 364
-_la	 351
-_la_	 325
-f	 325
-le	 322
-te	 312
-'	 311
-_s	 308
-st	 308
-se	 305
-ó	 302
-ue	 302
-na	 301
-os	 301
-qu	 300
-q	 300
-el_	 299
-it	 292
-co	 290
-ri	 277
-ca	 277
-ti	 273
-ac	 272
-in	 268
-ll	 264
-ic	 264
-me	 259
-un	 257
-que	 248
-C	 248
-tr	 244
-ns	 242
-ió	 238
-_i_	 236
-ad	 233
-ent	 232
-_el	 227
-ne	 226
-_t	 223
-_co	 221
-_m	 221
-_C	 217
-en_	 217
-li	 217
-ia	 212
-à	 212
-pe	 207
-_a_	 207
-pr	 206
-ció	 203
-ó_	 203
-pa	 203
-ro	 202
-o_	 198
-E	 198
-di	 197
-io	 197
-ls	 196
-h	 192
-_q	 192
-_qu	 192
-_en	 187
-aci	 186
-am	 186
-ec	 183
-to	 183
-as	 180
-om	 180
-ni	 180
-da	 179
-ió_	 179
-si	 178
-ls_	 176
-L	 175
-ma	 172
-res	 172
-ur	 171
-_el_	 162
-rt	 162
-ue_	 160
-A	 160
-os_	 159
-_que	 159
-que_	 158
-_r	 158
-po	 157
-_es	 155
-er_	 155
-_que_	 155
-M	 155
-_se	 153
-va	 153
-del	 153
-ció_	 151
-_pr	 151
-is	 150
-_en_	 149
-P	 147
-_pe	 146
-_del	 145
-ts	 145
-lo	 145
-_M	 144
-ct	 144
-_u	 144
-ol	 143
-ve	 141
-_L	 140
-x	 140
-y	 140
-a,_	 139
-a,	 139
-nc	 138
-men	 137
-al_	 137
-_f	 137
-_re	 137
-_P	 136
-ació	 136
-les	 136
-rs	 134
-est	 133
-tu	 131
-_E	 130
-et	 130
-s,_	 129
-_un	 129
-na_	 129
-_v	 129
-s,	 129
-ion	 127
-per	 126
-so	 125
-em	 125
-at_	 124
-no	 124
-j	 124
-br	 123
-nt_	 122
-ar_	 122
-sa	 121
-_n	 119
-les_	 118
-é	 118
-ce	 117
-il	 117
-ell	 116
-_per	 114
-í	 114
-ob	 113
-re_	 113
-ir	 113
-_A	 112
-ons	 112
-do	 112
-ua	 112
-con	 112
-ment	 111
-gu	 111
-ts_	 110
-ss	 110
-ns_	 109
-ant	 109
-ra_	 109
-Co	 109
-par	 108
-l'	 107
-d'	 107
-_l'	 107
-els	 107
-tat	 107
-sc	 106
-_d'	 106
-an_	 105
-_Co	 105
-vi	 104
-els_	 104
-ica	 104
-ran	 103
-ul	 102
-iv	 102
-S	 102
-_del_	 102
-del_	 102
-mb	 101
-mi	 101
-ita	 101
-nta	 100
-_pa	 99
-_o	 99
-_con	 98
-ació_	 97
-rn	 96
-_in	 96
-ia_	 96
-z	 96
-im	 95
-rr	 95
-art	 94
-ta_	 93
-com	 93
-tre	 92
-_h	 92
-s.	 91
-mp	 90
-ie	 90
-J	 90
-s._	 89
-cio	 89
-_le	 89
-bre	 88
-_ca	 88
-_al	 88
-sta	 88
-_com	 88
-cu	 88
-à_	 87
-pre	 87
-fe	 86
-ba	 86
-tra	 86
-ge	 85
-pro	 85
-_les	 84
-des	 84
-ter	 84
-_po	 84
-_les_	 84
-T	 84
-_J	 84
-nd	 84
-cion	 84
-_S	 84
-ura	 83
-nci	 82
-va_	 81
-ha	 81
-ona	 81
-ent_	 80
-ues	 80
-oc	 80
-ea	 80
-nte	 80
-és	 80
-_di	 79
-ui	 79
-as_	 78
-ut	 78
-ici	 78
-res_	 78
-us	 77
-ot	 77
-ara	 77
-ip	 75
-rm	 75
-ab	 75
-eg	 75
-_per_	 75
-ng	 75
-'a	 75
-I	 75
-per_	 75
-rec	 74
-du	 74
-_tr	 74
-è	 73
-cia	 73
-_no	 73
-b_	 73
-_par	 72
-ep	 72
-id	 72
-lle	 71
-rc	 71
-_pro	 70
-D	 69
-G	 69
-ga	 69
-fo	 69
-una	 68
-El	 68
-lit	 68
-un_	 68
-ques	 68
-amb	 67
-ix	 67
-és_	 67
-_G	 67
-era	 67
-cr	 67
-)	 66
-da_	 66
--	 66
-sp	 66
-y_	 66
-ada	 66
-tor	 66
-(	 66
-_(	 66
-_T	 65
-ment_	 65
-B	 65
-_es_	 65
-Ma	 65
-V	 65
-uc	 65
-ect	 65
-ame	 64
-iu	 64
-_Ma	 64
-orn	 64
-_B	 64
-_D	 64
-Ca	 64
-sti	 64
-_g	 63
-esc	 63
-rd	 63
-una_	 63
-là	 62
-"	 62
-ed	 62
-amen	 61
-mo	 61
-ions	 61
-_El	 61
-_Ca	 61
-Jo	 61
-eu	 61
-ari	 61
-lt	 61
-F	 61
-u_	 61
-ament	 60
-_V	 60
-m_	 60
-fi	 60
-au	 60
-ev	 60
-La	 60
-itat	 59
-_ha	 59
diff --git a/libtextcat/data/new_fingerprints/lm/chinese_simplified.lm b/libtextcat/data/new_fingerprints/lm/chinese_simplified.lm
deleted file mode 100644
index 622b89c..0000000
--- a/libtextcat/data/new_fingerprints/lm/chinese_simplified.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-，_
-_，_
-_，
-，
-的
-的_
-_的
-_的_
-_。
-。_
-。
-_。_
-国
-了_
-了
-_了_
-在
-_了
-_￥_
-_在
-_１_
-_１
-_￥
-国_
-１
-在_
-￥_
-￥
-年
-１_
-_在_
-_０
-_０_
-部
-０
-０_
-５_
-民
-_５
-_５_
-５
-政
-工
-、_
-_年
-_日
-日
-_、
-年_
-行
-_、_
-建
-、
-４
-多_
-多
-６
-百
-作
-会
-日_
-_百
-_建
-理
-和
-_４
-军
-_多
-_多_
-_百_
-_部
-_日_
-关
-_６_
-和_
-成
-百_
-_６
-_和_
-_和
-４_
-进
-６_
-_军
-_４_
-_万_
-９
-我
-_万
-展
-得
-地
-们
-产
-举
-过
-主
-上
-目
-行_
-于
-一
-万
-_国
-全
-发
-到_
-_进
-_工
-_过
-人
-_９_
-_我
-到
-个_
-个
-_上
-_９
-万_
-_举
-不
-部_
-_关
-９_
-们_
-长
-_政
-开
-战
-经
-_性
-_上_
-并
-性
-治_
-大
-_工作
-_个
-民_
-_内_
-他
-这
-_内
-治
-计
-品
-术
-工作_
-共
-县
-内
-―_
-区_
-员_
-_―
-术_
-_工作_
-上_
-部门
-_部门
-作_
-_并
-_这
-一_
-于_
-分
-区
-品_
-_引
-_开
-系
-员
-县_
-_―_
-_不
-工作
-_一_
-―
-_发
-_到_
-_他
-_到
-_民
-主义
-_年_
-_全
-生
-_共
-_个_
-性_
-门
-_性_
-地_
-往
-机
-案
-引
-合
-内_
-_一
-展_
-义
-府
-问题_
-里_
-常
-取得了
-市
-期
-这_
-数
-门_
-就
-要_
-等_
-小
-他_
-字
-家
-社会
-技
-得_
-将
-_分_
-取得了_
-营
-８
-女
-级
-约
-_将_
-绝
-统
-厂_
-我们
-安
-字_
-_厂_
-大_
-＃_
-_作
-工_
-文
-将_
-新
-组
-外
-_已_
-已
-产_
-_中
-_产
-_技术_
-_生产
-过_
-但
-价
-绝_
-均
-坏
-已_
-_之
-_技
-家_
-事
-２
-_举行_
-联合国_
-中
-严
-训
-_元_
-_等_
-往_
-之
-_但
-_发展
-问题
-_机
-后
-_取得了_
-_市_
-政治_
-厂
-_战
-取
-务
-_但_
-十
-长_
-政_
-几
-刚
-_成
-_十_
-事_
-_会
-_８_
-会主义
-部门_
-_女
-_２_
-机_
-_已
-_”
-理_
-公
-各
-技术
-元_
-_职工
-经济_
-举行
-_＃_
-_军民
-_问题
-义_
-之_
-举行_
-_新
-解
-_两
-_这_
-得了
-_得_
-_几_
-_问
-两_
-我们_
-进行
-取得
-_文
-_他_
-_长
-_联合
-_过_
-_计
-_进行_
-法国_
-建设_
-_说
-题_
-重
-_政治
-_市
-里
-_解
-_政府
-口
-要
-_均
-发展_
-联合国
-_组
-几_
-_我们_
-后_
-_经
-_美
-来_
-合国_
-济_
-口_
-”_
-元
-＃
-府_
-军民
-并_
-职工
-_８
-成_
-约_
-_等
-级_
-次_
-_社会主
-_２
-_政治_
-_”_
-_英
-得了_
-_＃
-_发展_
-_社
-生产
-_条
-军民_
-”
-_职
-_取得了
-_联
-就_
-_我们
-发展
-两
-议
-_小
-_联合国
diff --git a/libtextcat/data/new_fingerprints/lm/chinese_traditional.lm b/libtextcat/data/new_fingerprints/lm/chinese_traditional.lm
deleted file mode 100644
index 6708981..0000000
--- a/libtextcat/data/new_fingerprints/lm/chinese_traditional.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-﹐_
-_﹐_
-﹐
-_﹐
-的
-_的
-的_
-_的_
-。
-_。
-。_
-_。_
-年
-_會
-會_
-_會_
-年_
-_年_
-十
-電
-會
-_年
-_在
-電_
-_是_
-_電_
-一
-於
-學_
-_於_
-_於
-在
-_電
-學
-是_
-港
-_學_
-在_
-_是
-於_
-_在_
-_學
-是
-不_
-_十
-_不
-_港_
-_港
-_不_
-十_
-_一
-員
-員_
-_一_
-不
-_十_
-一_
-港_
-_署
-_員_
-_員
-_業
-業
-_署_
-業_
-_業_
-署_
-署
-_事
-_同
-機
-_國_
-，
-、
-_，_
-_內
-、_
-_外_
-_同_
-_政_
-_公_
-為
-外
-公
-_公
-有
-_內_
-同
-_政
-國_
-國
-公_
-香
-_事_
-外_
-事
-內_
-_，
-_、
-政
-_外
-_、_
-香_
-政_
-內
-同_
-事_
-，_
-_國
-為_
-_長_
-_較_
-_方_
-_用_
-等_
-獲
-錦
-_文_
-_中
-_錦
-用
-_通
-_較
-_等
-有_
-_長
-_路
-通
-_警_
-_及
-_及_
-_警
-_香
-錦_
-_訴
-中_
-_話
-_有_
-通_
-時_
-獲_
-_予
-路_
-較_
-方_
-田
-警
-機_
-_訴_
-_田_
-等
-_有
-話_
-_機_
-_予_
-路
-時
-方
-日
-警_
-_通_
-訴_
-_用
-_方
-及_
-田_
-_話_
-_中_
-_香_
-訴
-_田
-_文
-_錦_
-三
-較
-用_
-_時_
-中
-_等_
-及
-話
-_機
-_獲
-九
-文
-_時
-_路_
-_獲_
-長
-_為_
-_為
-予
-長_
-予_
-文_
-_日_
-九_
-途_
-_高
-裝_
-故_
-_室
-_發_
-_控_
-前_
-回：
-_查_
-_三
-_安
-_以
-_控
-途
-_安_
-_裝
-_士_
-_雇
-_大_
-_上_
-_起
-出_
-_三_
-_人_
-_起_
-室_
-_人
-_分_
-_至_
-上_
-_出_
-第
-_*
-至
-_查
-程
-_煙_
-_生_
-_以_
-_只
-者
-_可
-三_
-_*_
-分_
-_途
-_前
-_分
-_線_
-_出
-發
-_與_
-生
-由
-可_
-煙_
-_由_
-_線
-者_
-至_
-日_
-只_
-煙
-發_
-_使
-_使_
-查
-_第
-_雇_
-以_
-_只_
-控_
-安_
-*
-與_
-線
-_與
-_至
-改
-人_
-大_
-_上
-_高_
-故
-起_
-高
-線_
-大
-控
-士
-_故_
-_作_
-使
-_由
-由_
-_途_
-安
-作
-*_
-以
-_生
-來
-_大
-回
-_日
-_前_
-四
-_九_
-_九
-人
-_裝_
-上
-_發
-_作
-士_
-_故
-作_
-高_
-雇
-只
-可
-：
-裝
-使_
-起
-出
-前
-_煙
-_可_
-雇_
-_室_
-生_
-八
-_士
-查_
-分
-室
-與
-也_
-肇_
-和_
-_物_
-_如_
-_霧_
-主_
-_商_
-約
-_府_
-到_
-達
-道
-都_
-黨_
-過
-_重_
-_者_
-未_
-_修_
-_約_
-別_
-郵_
-_能_
-來_
-_霧
-_車
-－
-_司_
-_排
-_該_
-_柙_
-被_
-總_
-_越
-呎_
-_資
-_排_
-期_
-_夜_
-_修
-巴_
-_育_
-_歌_
-_號_
-_圍_
-_調
-_亦_
-_校
-_)
-_後_
-入_
-_便
-_訊
-_期_
-脹_
-_而_
-_重
-o
-_該
-_o
-_(
-程_
diff --git a/libtextcat/data/new_fingerprints/lm/croatian.lm b/libtextcat/data/new_fingerprints/lm/croatian.lm
deleted file mode 100644
index b054ac3..0000000
--- a/libtextcat/data/new_fingerprints/lm/croatian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 36598
-a	 9456
-o	 9050
-i	 8526
-e	 7955
-n	 5513
-j	 5379
-s	 4971
-t	 4125
-r	 3889
-u	 3423
-je	 3281
-l	 3231
-e_	 3177
-d	 3128
-k	 2992
-v	 2891
-a_	 2835
-o_	 2679
-m	 2645
-p	 2316
-_s	 2212
-i_	 2205
-y	 2174
-c	 1894
-z	 1867
-je_	 1613
-_n	 1593
-g	 1581
-_p	 1490
-b	 1386
-u_	 1382
-,	 1208
-,_	 1208
-st	 1203
-_j	 1202
-na	 1159
-_je	 1118
-_d	 1105
-_i	 1104
-.	 1069
-._	 1058
-ra	 1017
-ko	 981
-ni	 980
-_je_	 918
-ij	 914
-ti	 911
-no	 891
-da	 884
-to	 879
-_k	 863
-_o	 856
-cy	 839
-li	 838
-ne	 790
-sy	 786
--	 785
-pr	 760
-_u	 748
-po	 734
-ta	 711
-_b	 705
-_t	 704
-la	 699
-ja	 699
-an	 691
-m_	 680
-ov	 674
-ije	 673
-_z	 669
-ka	 662
-ri	 652
-lo	 651
-vo	 643
-re	 641
-is	 626
-in	 623
-se	 623
-va	 622
-_m	 617
-oj	 614
-_po	 594
-_pr	 592
-bi	 588
-en	 582
-il	 578
-os	 576
-vi	 572
-nj	 569
-ak	 564
-_na	 558
-im	 558
-da_	 553
-od	 550
-ao	 550
-al	 549
-om	 545
-na_	 533
-_se	 524
-_i_	 523
-h	 517
-_g	 511
-ma	 508
-at	 502
-cj	 501
-og	 497
---	 493
-ro	 493
-on	 485
-av	 480
-_da	 474
-_ne	 474
-ed	 472
-zy	 471
-se_	 466
-_se_	 458
-_bi	 457
-ao_	 452
-ad	 452
-lj	 445
-es	 444
-ji	 441
-_v	 433
-_c	 430
-za	 421
-go	 418
-_r	 413
-_u_	 411
-yi	 410
-ek	 406
-di	 403
-sa	 396
-et	 393
-ic	 391
-io	 390
-_da_	 389
-to_	 389
-as	 386
-_ko	 383
-ye	 378
-ar	 378
-mo	 373
-le	 367
-or	 364
-ju	 363
-el	 354
-tr	 354
-io_	 352
-ve	 345
-lo_	 344
-su	 344
-ol	 344
-am	 344
-iz	 343
-li_	 338
-ti_	 336
-sto	 323
-n_	 321
-it	 319
-_za	 319
-sta	 317
-_ni	 316
-te	 312
-nu	 312
-a,	 309
-a,_	 309
-ya	 309
-do	 304
-om_	 303
-la_	 300
-no_	 299
-_na_	 299
-d_	 297
-ko_	 296
-aj	 294
-ik	 292
-ru	 291
-ga	 291
-em	 288
-nje	 283
-dj	 281
-ne_	 281
-k_	 277
-_st	 276
-koj	 276
-ec	 274
-_ka	 272
-_su	 270
-ob	 265
--_	 263
-az	 261
-sv	 260
-_koj	 260
-im_	 260
-ije_	 259
-pa	 258
-ot	 257
-yt	 256
-ok	 255
-su_	 255
-ih	 254
-me	 253
-dn	 253
-_cy	 253
-iv	 251
-syt	 248
-g_	 247
---_	 246
-_-	 246
-kr	 246
----	 246
-a.	 245
-e,_	 245
----_	 245
-e,	 245
-er	 245
-a._	 244
-_iz	 244
-mi	 243
-_---_	 242
-cyi	 242
-_--	 242
-_---	 242
-jed	 240
-h_	 239
-_a	 239
-_sa	 237
-j_	 236
-_l	 231
-_sv	 229
-_to	 229
-sk	 228
-ih_	 224
-ja_	 223
-pro	 223
-yn	 222
-t_	 222
-ost	 221
-_do	 221
-oc	 219
-gl	 218
-_su_	 216
-og_	 216
-uc	 214
-s_	 214
-bil	 213
-oz	 213
-ki	 212
-ni_	 212
-nij	 209
-ako	 208
-eg	 208
-ut	 205
-pre	 205
-ci	 204
-ji_	 203
-_od	 203
-ilo	 202
-ati	 202
-ac	 201
-ns	 200
-_mo	 197
-rij	 196
-bo	 195
-ovo	 195
-ku	 195
-dje	 194
-ma_	 192
-_bil	 191
-cje	 186
-sti	 186
-_go	 186
-de	 185
-sl	 183
-_pro	 182
-ju_	 182
-nije	 181
-tv	 180
-lje	 179
-isy	 179
-pri	 178
-_pre	 177
-dr	 177
-e._	 177
-e.	 177
-op	 176
-ima	 176
-anj	 175
-jen	 175
-us	 172
-ilo_	 172
-_ra	 170
-S	 167
-ecj	 166
-iti	 166
-sp	 163
-_S	 161
-vr	 161
-i.	 161
-i._	 161
-zn	 161
-ali	 161
-i,_	 160
-i,	 160
-ap	 157
-nije_	 157
-nst	 156
-pi	 156
-ga_	 156
-_sy	 155
-_nj	 155
-jes	 155
-ran	 155
-vo_	 155
-yto	 154
-ev	 153
-_to_	 152
-_pri	 151
-est	 150
-N	 150
-ins	 150
-ist	 149
-ir	 149
-o,	 148
-vj	 148
-vje	 148
-o,_	 148
-B	 148
-zi	 147
-jec	 147
-gov	 147
-yto_	 147
-syto	 146
-ton	 146
-od_	 145
-O	 144
-rije	 144
-lik	 143
-on_	 142
-ocy	 142
-W	 142
-ba	 142
-_W	 141
-kao	 141
-Wi	 141
-_N	 141
-inst	 141
-_nij	 141
-_nije	 140
-_Wi	 140
-syto_	 140
-lic	 139
-P	 139
-ovi	 138
-_tr	 138
-rs	 137
-ez	 137
-edn	 136
-_P	 136
-si	 136
-ili	 136
-du	 136
-Winst	 135
-cye	 135
-nston	 135
-ston	 135
-ud	 135
-kao_	 135
-Wins	 135
-insto	 135
-oji	 135
-nsto	 135
-Win	 135
-raz	 135
-zye	 135
-_Win	 134
-ova	 134
-_Wins	 134
-_on	 133
-ako_	 133
-odi	 133
-cya	 133
-ila	 133
-icy	 133
-oj_	 133
-ke	 133
-va_	 132
-ija	 132
-_is	 132
-jel	 132
-oje	 130
-pu	 130
-cje_	 130
-bi_	 129
-rat	 128
-ce	 128
-tu	 128
-mu	 128
-ve_	 127
diff --git a/libtextcat/data/new_fingerprints/lm/czech.lm b/libtextcat/data/new_fingerprints/lm/czech.lm
deleted file mode 100644
index 097bbc5..0000000
--- a/libtextcat/data/new_fingerprints/lm/czech.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 26378
-o	 5870
-e	 5354
-a	 4740
-n	 4462
-t	 3745
-s	 3438
-i	 3187
-v	 3118
-l	 2891
-r	 2754
-k	 2566
-d	 2508
-m	 2198
-u	 2197
-p	 2032
-í	 1924
-c	 1678
-h	 1572
-z	 1544
-á	 1522
-_p	 1299
-e_	 1266
-y	 1231
-a_	 1219
-j	 1219
-_s	 1156
-b	 1079
-o_	 1065
-ě	 1043
-_v	 1038
-,	 952
-,_	 946
-st	 945
-_n	 911
-é	 878
-.	 870
-í_	 848
-ř	 822
-._	 803
-ní	 782
-ov	 757
-_z	 723
-i_	 716
-u_	 684
-ro	 674
-en	 656
-ý	 647
-ž	 639
-po	 630
-ch	 629
-č	 625
-na	 599
-_a	 598
-sk	 592
-š	 563
-ho	 552
-_d	 551
-ra	 545
-m_	 539
-y_	 530
-_t	 512
-ko	 504
-_k	 503
-le	 502
-_j	 501
-_o	 486
-to	 479
-pr	 471
-ne	 468
-ní_	 462
-je	 458
-é_	 456
-ti	 455
-od	 433
-li	 432
-va	 432
-_po	 429
-_m	 428
-al	 424
-te	 424
-ou	 423
-ed	 418
-se	 415
-la	 410
-no	 397
-os	 382
-lo	 377
-an	 376
-_pr	 375
-ů	 375
-v_	 372
-ře	 370
-_a_	 364
-em	 363
-at	 360
-ta	 359
-do	 357
-t_	 357
-_b	 355
-or	 349
-h_	 345
-_v_	 338
-ch_	 327
-S	 325
-ce	 323
-av	 323
-př	 322
-ni	 319
-ké	 316
-er	 315
-ně	 315
-_na	 313
-na_	 312
-_ne	 311
-de	 308
-ic	 307
-in	 306
-_se	 306
-l_	 304
-dn	 302
-za	 298
-_př	 293
-ě_	 291
-ol	 290
-_je	 281
-ob	 280
-is	 277
-ve	 274
-ho_	 272
-es	 270
-ot	 268
-ak	 265
-vo	 263
-ná	 260
-il	 257
-se_	 257
-it	 256
-et	 253
-ad	 250
-by	 249
-P	 242
-_r	 242
-k_	 242
-ost	 241
-_se_	 241
-tr	 238
-me	 237
-pro	 234
-že	 234
-ka	 230
-_za	 227
-om	 224
-el	 223
-_P	 223
-on	 218
-_pro	 216
-ou_	 216
-tu	 215
-O	 212
-mi	 212
-ku	 211
-_u	 210
-_do	 208
-_l	 207
-_na_	 206
-N	 205
-ské	 205
-ím	 205
-íc	 205
-ý_	 203
-mě	 203
-_S	 200
-oz	 200
-V	 200
-ze	 198
-da	 194
-sl	 192
-á_	 191
-ova	 190
-mo	 190
-re	 189
-so	 187
-vy	 186
-ej	 185
-rá	 184
-ar	 184
-s_	 183
-vě	 183
-A	 181
-ru	 180
-_st	 178
-f	 178
-éh	 177
-ého	 176
-kt	 176
-tn	 175
-g	 174
-bo	 174
-ez	 173
-ci	 172
-ký	 172
-né	 170
-M	 170
-án	 169
-as	 168
-vi	 167
-ři	 167
-ac	 166
-že_	 165
-ýc	 165
-ž_	 165
-ck	 164
-K	 164
-B	 164
-ých	 164
-vá	 162
-_c	 162
-ého_	 162
-ení	 161
-lá	 160
-_ž	 160
-ří	 160
-pře	 159
-ec	 158
-ů_	 157
-J	 156
-vn	 156
-_h	 155
-ké_	 155
-ok	 154
-sta	 154
-to_	 152
-vý	 152
-nt	 151
-ých_	 149
-lo_	 149
-_by	 149
-dy	 149
-_pře	 148
-ce_	 147
-R	 146
-n_	 146
-ád	 146
-pa	 145
-vé	 145
-am	 145
-mu	 145
-ný	 145
-ud	 144
-_č	 144
-_B	 142
-ter	 141
-ně_	 141
-če	 140
-še	 140
-_V	 140
-_ko	 140
-li_	 139
-dě	 137
-hl	 137
-je_	 137
-ji	 137
-ist	 135
-jí	 135
--	 134
-ik	 133
-si	 133
-ál	 132
-em_	 132
-_to	 132
-_vy	 131
-sp	 130
-ut	 130
-_J	 130
-_že	 130
-_M	 129
-di	 129
-kon	 128
-la_	 128
-tí	 128
-_ro	 127
-ns	 127
-ek	 126
-ick	 126
-T	 126
-yl	 125
-čn	 125
-rn	 125
-_že_	 124
-op	 124
-sti	 124
-kte	 124
-řed	 124
-edn	 123
-us	 121
-ím_	 120
-"	 119
-z_	 119
-str	 118
-ti_	 118
-ém	 118
-vat	 118
-d_	 118
-_ve	 118
-áv	 118
-ení_	 117
-iv	 117
-oj	 117
-_kt	 117
-ěl	 117
-val	 116
-eb	 116
-_K	 115
-tř	 115
-_kte	 115
-át	 115
-_i	 114
-_N	 114
-D	 114
-kl	 114
-ny	 114
-byl	 113
-ev	 113
-ri	 113
-ú	 113
-ky	 111
-sm	 111
-oh	 111
-E	 110
-ma	 110
-ět	 110
-ský	 110
-kter	 109
-nu	 109
-le_	 108
-ja	 107
-zá	 107
-tě	 106
-tá	 106
-zn	 106
-let	 105
-aj	 105
-sto	 105
-ší	 105
-me_	 105
--_	 105
-u,	 105
-sv	 104
-_le	 104
-pol	 104
-L	 104
-_-	 104
-ln	 104
-pod	 104
-H	 103
-zi	 103
-kéh	 103
-kého	 103
-_ná	 103
-ent	 102
-u,_	 102
-_od	 102
-né_	 101
-_-_	 101
-al_	 101
-_kter	 101
-do_	 100
-nos	 100
-cí	 100
-rav	 99
-ran	 99
-_sv	 99
-ká	 98
-eč	 98
-ním	 98
-bu	 97
-_z_	 97
-ích	 97
-_byl	 97
-ání	 96
-rov	 96
-kr	 96
-dá	 95
-ové	 95
-dl	 95
-uj	 95
-nost	 95
-ém_	 95
-ech	 94
-ly	 94
-oc	 94
-vé_	 93
-_o_	 93
-dy_	 93
-ak_	 93
-nsk	 93
-_so	 93
-_ob	 92
-nc	 92
diff --git a/libtextcat/data/new_fingerprints/lm/danish.lm b/libtextcat/data/new_fingerprints/lm/danish.lm
deleted file mode 100644
index 5e5a61a..0000000
--- a/libtextcat/data/new_fingerprints/lm/danish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 21274
-e	 9291
-r	 5307
-n	 4733
-i	 3976
-t	 3948
-s	 3751
-a	 3296
-l	 3063
-d	 3025
-o	 2868
-g	 2471
-er	 2164
-k	 2002
-m	 1680
-e_	 1655
-en	 1613
-f	 1507
-de	 1484
-r_	 1379
-v	 1245
-u	 1176
-t_	 1081
-n_	 1032
-er_	 992
-b	 942
-.	 870
-ge	 868
-._	 831
-re	 816
-h	 816
-et	 813
-te	 813
-p	 806
-in	 788
-or	 775
-_s	 753
-_a	 749
-en_	 712
-_e	 691
-ti	 689
-an	 687
-,	 681
-,_	 677
-_f	 655
-_d	 645
-el	 642
-ng	 635
-nd	 634
-g_	 634
-se	 615
-le	 615
-st	 607
-s_	 601
-_o	 572
-ne	 560
-li	 537
-et_	 524
-es	 521
-_i	 512
-ri	 511
-sk	 510
-_de	 498
-å	 497
-ar	 475
-ed	 473
-ig	 463
-at	 452
-_m	 446
-is	 443
-fo	 441
-æ	 441
-ve	 438
-_k	 434
-ø	 432
-der	 429
-ke	 428
-ing	 427
-og	 426
-_b	 412
-me	 408
-il	 407
-for	 405
-ns	 394
-y	 389
-_h	 380
-_t	 374
-on	 371
-d_	 370
-al	 362
-be	 359
-_fo	 351
-af	 336
-de_	 335
-_og	 333
-_p	 332
-og_	 325
-om	 325
-_for	 324
-_og_	 313
-l_	 308
-nge	 302
-i_	 295
-_v	 294
-c	 289
-ter	 283
-ll	 280
-ni	 278
-nde	 278
-rs	 277
-_af	 277
-un	 275
-ra	 271
-ko	 271
-den	 270
-_i_	 268
-id	 265
-til	 265
-j	 265
-vi	 264
-D	 260
-ere	 256
-ma	 255
-si	 253
-f_	 252
-af_	 238
-_af_	 235
-ik	 235
-m_	 234
-å_	 232
-_ti	 227
-_D	 226
-_u	 226
-_er	 225
-nt	 224
-_en	 224
-ls	 221
-es_	 216
-lig	 216
-ger	 216
-re_	 210
-ag	 210
-_me	 207
-at_	 204
-lle	 200
-ge_	 200
-_til	 200
-ige	 199
-_er_	 199
-der_	 199
-em	 199
-ds	 197
-r.	 195
-io	 195
-r._	 195
-ud	 193
-_at	 192
-_at_	 191
-ta	 190
-els	 190
-_l	 190
-ha	 190
-il_	 189
-or_	 189
-ke_	 186
-rt	 185
-gen	 184
-ka	 183
--	 180
-rk	 180
-ning	 178
-ol	 178
-nin	 178
-la	 177
-ld	 175
-De	 175
-it	 173
-ede	 172
-ed_	 171
-_ko	 171
-lse	 171
-ek	 168
-else	 167
-inge	 167
-på	 167
-ng_	 167
-_på	 167
-iv	 166
-ør	 166
-so	 165
-he	 165
-ens	 165
-ske	 165
-ind	 164
-til_	 163
-rn	 163
-ide	 162
-ev	 162
-den_	 162
-to	 162
-sen	 160
-_be	 160
-sa	 160
-bl	 158
-_g	 158
-an_	 157
-det	 156
-om_	 156
-ru	 156
-va	 155
-_til_	 155
-ste	 154
-rd	 153
-_på_	 152
-k_	 152
-på_	 152
-di	 152
-kr	 152
-K	 151
-_De	 149
-for_	 148
-te_	 148
-kon	 148
-ver	 147
-mm	 146
-am	 146
-_en_	 145
-_r	 145
-ne_	 144
-ing_	 144
-tr	 143
-le_	 142
-del	 142
-_in	 142
-gt	 140
-_st	 138
-S	 138
-eg	 138
-gs	 138
-tt	 138
-r,	 137
-ser	 137
-r,_	 137
-er.	 137
-ro	 137
-er._	 137
-_for_	 136
-ent	 136
-kt	 136
-eri	 135
-ur	 134
-lin	 134
-B	 133
-A	 133
-sti	 133
-ner	 133
-da	 133
-ris	 132
-ion	 132
-_K	 131
-ern	 131
-ers	 130
-ist	 130
-ær	 130
-ige_	 130
-_si	 130
-tte	 129
-E	 128
-_n	 128
-nn	 127
-_B	 126
-_ha	 126
-_.	 126
-rne	 125
-H	 125
-_ud	 125
-rin	 124
-na	 124
-und	 124
-ft	 124
-_der	 124
-ku	 123
-_A	 122
-ler	 120
-and	 120
-end	 120
-ns_	 120
-rg	 119
-op	 119
-er,_	 119
-er,	 119
-ar_	 118
-P	 118
-_S	 117
-_H	 117
-_._	 116
-ov	 116
-erne	 115
-tio	 115
-med	 115
-tion	 115
-_E	 115
-_P	 115
-det_	 114
-pr	 114
-e.	 113
-ter_	 113
-:	 113
-kk	 113
-e._	 113
-e,_	 113
-e,	 113
-od	 113
-kke	 113
-ten	 113
-ling	 113
-:_	 112
-mi	 112
-eli	 112
-lo	 111
-som	 111
-_den	 111
-rb	 110
-se_	 110
-ell	 110
-sid	 110
-nne	 109
-fi	 108
-lt	 107
-v_	 107
-_de_	 107
-ark	 106
-lige	 106
-ngen	 106
-ie	 105
-_med	 105
-_der_	 105
-ring	 105
-a_	 105
-_vi	 104
--_	 104
-ys	 103
-gel	 103
-_so	 103
-ia	 103
-ive	 102
-ej	 101
-ati	 101
-ren	 101
-_det	 101
-side	 101
-ske_	 101
-br	 100
-gi	 100
-F	 100
-M	 100
-ul	 99
-isk	 99
-men	 99
-n,_	 99
-age	 99
-fr	 99
-n,	 99
-tu	 98
-ts	 98
-_ma	 98
-nder	 98
-ot	 97
-dt	 97
-R	 97
-med_	 96
-ho	 96
-ans	 95
-_kon	 95
-pe	 95
-ce	 94
-gr	 93
-mme	 92
-ret	 92
-lige_	 92
-mu	 91
-_med_	 91
-hv	 91
-væ	 91
-Det	 91
-ens_	 91
-kl	 91
-_M	 90
-T	 90
-ingen	 90
-rm	 90
-ill	 89
-elle	 89
-ef	 89
-ene	 89
-nds	 89
-ove	 89
-som_	 89
-C	 88
-_den_	 88
diff --git a/libtextcat/data/new_fingerprints/lm/drents.lm b/libtextcat/data/new_fingerprints/lm/drents.lm
deleted file mode 100644
index e69de29..0000000
--- a/libtextcat/data/new_fingerprints/lm/drents.lm
+++ /dev/null
diff --git a/libtextcat/data/new_fingerprints/lm/dutch.lm b/libtextcat/data/new_fingerprints/lm/dutch.lm
deleted file mode 100644
index 17a0626..0000000
--- a/libtextcat/data/new_fingerprints/lm/dutch.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20104
-e	 9848
-n	 5323
-a	 3733
-t	 3683
-i	 3490
-r	 3195
-d	 2876
-o	 2845
-n_	 2443
-en	 2439
-s	 2195
-e_	 1842
-l	 1837
-g	 1522
-en_	 1500
-de	 1489
-er	 1388
-t_	 1377
-v	 1253
-u	 1217
-k	 1204
-_d	 1136
-h	 1102
-m	 1084
-an	 939
-te	 875
-j	 857
-in	 810
-_v	 793
-r_	 751
-de_	 742
-ee	 737
-p	 732
-et	 718
-ge	 716
-aa	 708
-b	 703
-_e	 686
-st	 669
-z	 668
-ie	 662
-_de	 655
-w	 631
-c	 611
-.	 604
-s_	 582
-_de_	 576
-_h	 572
-el	 570
-ij	 564
-._	 554
-et_	 531
-an_	 522
-he	 505
-_o	 497
-nd	 478
-_i	 475
-ar	 459
-_m	 451
-re	 442
-ve	 441
-'	 428
-or	 424
-ng	 421
-at	 418
-_s	 415
-oo	 403
-_z	 401
-le	 395
-_b	 394
-_a	 391
-_he	 386
-va	 385
-er_	 381
-me	 372
-_w	 368
-f	 361
-on	 351
-_t	 351
-_va	 345
-_g	 342
-di	 342
-nt	 340
-,	 335
-g_	 335
-,_	 334
-van	 327
-ch	 326
-is	 326
-ing	 325
-be	 325
-ni	 320
-it	 317
-een	 316
-_van	 315
-al	 310
-den	 309
-ti	 309
-van_	 307
-oe	 302
-ke	 302
-_van_	 299
-aar	 299
-d_	 295
-we	 293
-da	 292
-tu	 290
-_ee	 290
-ud	 287
-een_	 286
-li	 284
-es	 282
-_st	 281
-ver	 281
-ten	 281
-ri	 275
-nde	 275
-der	 274
-_in	 270
-k_	 268
-vo	 267
-het	 266
-oor	 264
-_het	 262
-het_	 262
-_het_	 259
-_een	 258
-l_	 258
-ze	 257
-_n	 254
-ro	 248
-gen	 243
-_een_	 241
-at_	 240
-op	 238
-n.	 238
-_en	 237
-rs	 237
-_da	 235
-stu	 232
-in_	 230
-_be	 229
-_ge	 228
-_k	 226
-rd	 226
-tud	 220
-_en_	 220
-n._	 217
-te_	 209
-ei	 208
-ent	 206
-_me	 203
-la	 202
-ek	 202
-ed	 201
-ra	 200
-stud	 200
-en.	 200
-ie_	 197
-ste	 196
-_vo	 195
-_in_	 193
-_stu	 191
-zi	 191
-om	 189
-ui	 189
-en._	 186
-ten_	 185
-_stud	 185
-ude	 184
-die	 183
-ns	 183
-_j	 181
-D	 179
-aan	 179
-se	 179
-ma	 178
-_ve	 176
-ne	 174
-_p	 174
-eg	 173
-p_	 172
-ar_	 172
-aar_	 171
-_te	 170
-ng_	 169
-_we	 169
-''	 167
-_D	 165
-ers	 164
-_op	 163
-dat	 161
-dat_	 160
-ig	 160
-ere	 159
-eer	 158
-_zi	 158
-voor	 156
-voo	 156
-nge	 155
-nder	 151
-nte	 151
-or_	 150
-ta	 150
-je	 149
-ing_	 148
-ll	 148
-_ver	 147
-jk	 146
-oor_	 146
-_dat	 145
-ijk	 145
-ren	 145
-is_	 145
-_dat_	 144
-_l	 144
-and	 144
-lij	 143
-ter	 143
-na	 142
-uden	 139
-tude	 138
-_voor	 136
-_voo	 136
-ond	 136
-ken	 135
-cht	 135
-_al	 135
-ht	 135
-wa	 134
-ho	 133
-em	 133
-den_	 133
-pe	 132
-sc	 132
-un	 131
-ur	 131
-_di	 130
-gen_	 130
-zo	 129
-rt	 129
-ev	 128
-mo	 128
-lijk	 127
-_is	 126
-stude	 124
-ha	 123
-to	 122
-el_	 121
-og	 121
-op_	 121
-sch	 120
-ol	 120
-ente	 119
-_u	 118
-pr	 118
-end	 118
-mi	 117
-iet	 116
-_aa	 116
-eli	 115
-dent	 115
-ijn	 115
-jn	 115
-ou	 115
-men	 114
-_'	 114
-tie	 113
-_is_	 113
-nie	 113
-tr	 112
-ak	 112
-id	 112
-udent	 111
-tuden	 111
-uit	 110
-_te_	 109
-aan_	 109
-ld	 109
-S	 108
-_aan	 108
-ede	 108
-ja	 107
-nten	 107
-it_	 107
-je_	 107
-ts	 107
-erd	 106
-est	 106
-E	 105
-_op_	 105
-ad	 104
-al_	 104
-_ze	 104
-_on	 104
-rk	 104
-lle	 103
-ens	 103
-gel	 103
-m_	 103
-len	 103
-_r	 102
-ec	 102
-inge	 102
-met	 102
-_met	 101
-si	 100
-die_	 100
-us	 100
-onde	 99
-_ni	 99
-De	 99
-eu	 99
-dente	 99
-enten	 99
-ic	 99
-_met_	 98
-f_	 98
-met_	 98
-no	 97
-ko	 96
-voor_	 96
-rde	 96
-H	 96
-ngen	 95
-lo	 95
-ot	 95
-as	 94
-zij	 93
-_nie	 92
-vi	 92
-eb	 92
-_De	 92
-_zij	 91
-ep	 91
-wi	 91
-_zo	 91
-kt	 91
-ege	 91
-G	 91
-bi	 90
-j_	 90
-ij_	 90
-ze_	 90
-do	 90
-lan	 89
-ov	 89
-udi	 89
-ord	 89
-onder	 89
-V	 88
-elij	 88
-_wa	 88
-elijk	 88
-ef	 88
-_die	 87
-ag	 86
-erk	 86
-eren	 86
-R	 85
-ik	 85
-_ma	 85
-gr	 85
-am	 85
-_mo	 84
-ul	 84
-nn	 83
-eve	 83
-De_	 83
-maa	 83
-ingen	 83
-wo	 83
-_''	 83
-O	 83
-tudi	 82
-I	 82
-nt_	 82
-tudie	 81
-ven	 81
-udie	 81
-nten_	 81
-_die_	 81
-jaa	 80
-ka	 80
-eke	 80
-ite	 80
-a_	 80
-_je	 80
-ac	 80
-jaar	 80
-_je_	 79
-_H	 79
-_zijn	 79
-zijn	 79
-n,	 78
-nen	 78
-N	 78
-n,_	 78
-ijn_	 77
diff --git a/libtextcat/data/new_fingerprints/lm/english.lm b/libtextcat/data/new_fingerprints/lm/english.lm
deleted file mode 100644
index ab71632..0000000
--- a/libtextcat/data/new_fingerprints/lm/english.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20326
-e	 6617
-t	 4843
-o	 3834
-n	 3653
-i	 3602
-a	 3433
-s	 2945
-r	 2921
-h	 2507
-e_	 2000
-d	 1816
-_t	 1785
-c	 1639
-l	 1635
-th	 1535
-he	 1351
-_th	 1333
-u	 1309
-f	 1253
-m	 1175
-p	 1151
-_a	 1145
-the	 1142
-_the	 1060
-s_	 978
-er	 968
-_o	 967
-he_	 928
-d_	 888
-t_	 885
-the_	 844
-_the_	 843
-on	 842
-in	 817
-y	 783
-n_	 773
-b	 761
-re	 754
-,	 734
-,_	 732
-an	 732
-g	 728
-w	 718
-_i	 707
-en	 676
-f_	 599
-y_	 595
-of	 594
-_of	 592
-es	 589
-ti	 587
-v	 580
-_of_	 575
-of_	 575
-nd	 568
-at	 549
-r_	 540
-_w	 534
-it	 522
-ed	 496
-_p	 494
-nt	 485
-_c	 462
-o_	 457
-io	 450
-_an	 439
-te	 432
-or	 425
-_b	 418
-nd_	 407
-to	 406
-st	 402
-is	 401
-_s	 396
-_in	 389
-ion	 385
-and	 385
-de	 384
-ve	 382
-ha	 375
-ar	 366
-_m	 361
-and_	 360
-_and	 360
-_and_	 358
-se	 353
-_to	 347
-me	 346
-to_	 344
-ed_	 339
-.	 330
-be	 329
-_f	 329
-._	 329
-_to_	 320
-co	 317
-ic	 316
-ns	 308
-al	 307
-le	 304
-ou	 304
-ce	 293
-ent	 279
-l_	 278
-_co	 277
-tio	 275
-on_	 274
-_d	 274
-tion	 268
-ri	 266
-_e	 264
-ng	 253
-hi	 251
-er_	 249
-ea	 246
-as	 245
-_be	 242
-pe	 242
-h_	 234
-_r	 232
-ec	 227
-ch	 223
-ro	 222
-ct	 220
-_h	 219
-pr	 217
-in_	 217
-ne	 214
-ll	 214
-rt	 213
-s,_	 210
-s,	 210
-li	 209
-ra	 208
-T	 207
-wh	 204
-a_	 203
-ac	 201
-_wh	 199
-_n	 196
-ts	 196
-di	 196
-es_	 195
-si	 194
-re_	 193
-at_	 192
-nc	 192
-ie	 190
-_a_	 188
-_in_	 185
-ing	 184
-us	 182
-_re	 182
-g_	 179
-ng_	 178
-op	 178
-con	 177
-tha	 175
-_l	 174
-_tha	 174
-ver	 173
-ma	 173
-ion_	 171
-_con	 171
-ci	 170
-ons	 170
-_it	 170
-po	 169
-ere	 168
-is_	 167
-ta	 167
-la	 166
-_pr	 165
-fo	 164
-ho	 164
-ir	 162
-ss	 161
-men	 160
-be_	 160
-un	 159
-ty	 159
-_be_	 158
-ing_	 157
-om	 156
-ot	 156
-hat	 155
-ly	 155
-_g	 155
-em	 153
-_T	 151
-rs	 150
-mo	 148
-ch_	 148
-wi	 147
-we	 147
-ad	 147
-ts_	 145
-res	 143
-_wi	 143
-I	 143
-hat_	 142
-ei	 141
-ly_	 141
-ni	 140
-os	 140
-ca	 139
-ur	 139
-A	 138
-ut	 138
-that	 138
-_that	 137
-ati	 137
-_fo	 137
-st_	 137
-il	 136
-or_	 136
-for	 136
-pa	 136
-ul	 135
-ate	 135
-ter	 134
-it_	 134
-nt_	 133
-that_	 132
-_ha	 129
-al_	 128
-el	 128
-as_	 127
-ll_	 127
-_ma	 125
-no	 124
-ment	 124
-an_	 124
-tion_	 122
-su	 122
-bl	 122
-_de	 122
-nce	 120
-pl	 120
-fe	 119
-tr	 118
-so	 118
-int	 115
-ov	 114
-e,	 114
-e,_	 114
-_u	 113
-ent_	 113
-Th	 113
-her	 113
-j	 112
-atio	 112
-ation	 112
-_Th	 111
-le_	 110
-ai	 110
-_it_	 110
-_on	 110
-_for	 109
-ect	 109
-k	 109
-hic	 108
-est	 108
-der	 107
-tu	 107
-na	 106
-_by_	 106
-by_	 106
-E	 106
-by	 106
-_by	 106
-ve_	 106
-_di	 106
-en_	 104
-vi	 104
-m_	 103
-_whi	 102
-iv	 102
-whi	 102
-ns_	 102
-_A	 101
-ich	 100
-ge	 100
-pro	 99
-ess	 99
-_whic	 99
-ers	 99
-hich	 99
-ce_	 99
-which	 99
-whic	 99
-all	 98
-ove	 98
-_is	 98
-ich_	 97
-ee	 97
-hich_	 97
-n,_	 96
-n,	 96
-im	 95
-ir_	 94
-hei	 94
-ions	 94
-sti	 94
-se_	 94
-per	 93
-The	 93
-_pa	 93
-heir	 93
-id	 93
-eir	 93
-eir_	 93
-ig	 93
-heir_	 93
-_no	 93
-ev	 93
-era	 92
-_int	 92
-ted	 91
-_The	 91
-ies	 91
-art	 91
-thei	 90
-_ar	 90
-_thei	 90
-their	 90
-_pro	 90
-et	 89
-_pe	 88
-_mo	 88
-ther	 88
-x	 87
-gh	 87
-S	 87
-_is_	 87
-ol	 87
-ty_	 87
-_I	 86
-nde	 86
-am	 86
-rn	 86
-nte	 86
-mp	 85
-_su	 84
-_we	 84
-par	 84
-_v	 84
-pu	 82
-his	 82
-ow	 82
-mi	 82
-go	 81
-N	 81
-ue	 81
-ple	 81
-ep	 80
-ab	 80
-;_	 80
-;	 80
-ex	 80
-ain	 80
-over	 80
-_un	 79
-q	 79
-qu	 79
-pp	 79
-ith	 79
-ry	 79
-_as	 79
-ber	 79
-ub	 78
-av	 78
-uc	 78
-s._	 77
-s.	 77
-enc	 77
-are	 77
-iti	 77
-gr	 76
-his_	 76
-ua	 76
-part	 76
-ff	 75
-eve	 75
-O	 75
-rea	 74
-ous	 74
-ia	 74
-The_	 73
-ag	 73
-mb	 73
-_go	 73
-fa	 72
-on,_	 72
-ern	 72
-t,_	 72
-on,	 72
-t,	 72
-_me	 71
diff --git a/libtextcat/data/new_fingerprints/lm/esperanto.lm b/libtextcat/data/new_fingerprints/lm/esperanto.lm
deleted file mode 100644
index 0eef3ec..0000000
--- a/libtextcat/data/new_fingerprints/lm/esperanto.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 57050
-a	 16035
-i	 12706
-e	 12227
-o	 12102
-n	 10393
-s	 8344
-l	 7707
-r	 7492
-t	 7134
-k	 5376
-u	 4558
-j	 3946
-a_	 3875
-m	 3783
-d	 3710
-p	 3693
-la	 2840
-s_	 2769
-e_	 2751
-.	 2706
-_l	 2635
-_k	 2619
-v	 2531
-n_	 2504
-o_	 2444
-i_	 2333
-._	 2278
-on	 2238
-,	 2193
-,_	 2182
-_la	 2100
-en	 2080
-j_	 2050
-as	 2028
-la_	 2012
-ta	 1956
-_la_	 1907
-an	 1882
-_p	 1850
-g	 1831
-_e	 1791
-_d	 1778
-is	 1737
-aj	 1658
-st	 1635
-_s	 1575
-c	 1526
-de	 1517
-oj	 1498
-er	 1476
-ti	 1456
-f	 1443
-_a	 1442
-b	 1427
-ro	 1379
-_m	 1351
-ra	 1341
-nt	 1293
-ka	 1270
-ri	 1258
-al	 1249
-as_	 1248
-aj_	 1213
-to	 1209
-_de	 1203
-_t	 1200
-te	 1179
-_n	 1176
-is_	 1171
-in	 1151
-ko	 1145
-or	 1114
-es	 1083
-re	 1034
-ia	 1029
-li	 1022
-de_	 1016
-_de_	 979
-ar	 974
-_v	 966
-vi	 942
-lo	 932
-x	 928
-io	 917
-ne	 855
-no	 848
-ni	 843
-mi	 835
-ma	 819
-_ka	 816
-el	 815
-pr	 771
-z	 744
-un	 734
-l_	 732
-po	 730
-_f	 725
-ø	 724
-est	 691
-na	 687
-ki	 679
-kaj	 676
-si	 665
-u_	 663
-kaj_	 660
-"	 654
-tas	 651
-le	 650
-oj_	 648
-_i	 643
-tr	 642
-_pr	 630
-_es	 628
-jn	 626
-pe	 618
-_kaj	 616
-ig	 616
-_kaj_	 611
-do	 608
-sta	 606
-on_	 602
-ek	 602
-ci	 597
-r_	 595
-ý	 594
-_r	 593
-il	 592
-_est	 587
-di	 586
-am	 586
-_mi	 582
-aý	 578
-_vi	 577
-mo	 575
-ant	 565
-_ne	 562
-en_	 561
-o.	 559
-æ	 543
-iu	 538
-o,	 529
-ur	 527
-o._	 527
-om	 525
-o,_	 524
-at	 521
-va	 521
--	 519
-_en	 518
-:	 513
-:_	 512
-_ti	 500
-M	 496
-h	 488
-nd	 484
-me	 484
-_al	 481
-_ko	 479
-ve	 478
-ie	 478
-_ki	 473
-it	 473
-L	 466
-_b	 465
-se	 462
-em	 452
-ol	 450
-nta	 449
-tu	 448
-ik	 444
-ov	 443
-da	 443
-_M	 440
-_po	 439
-tas_	 438
-ne_	 437
-et	 437
-_ma	 436
-_en_	 435
-su	 429
-pl	 426
-_L	 425
-pa	 420
-_o	 417
-vo	 408
-an_	 407
-ro_	 406
-sti	 406
-nu	 399
-kon	 396
-stas	 391
-m_	 391
-ir	 388
-n.	 386
-fa	 386
-jn_	 382
-ku	 382
-os	 376
-ke	 375
-n,	 375
-esta	 374
-n,_	 372
-_su	 362
-ta_	 362
-stas_	 359
-xi	 359
-Mi	 358
-_ne_	 356
-al_	 355
-nk	 353
-so	 353
-n._	 352
-id	 349
-_g	 348
-estas	 347
-ga	 346
-_h	 345
-per	 345
-_Mi	 340
-ok	 339
-K	 339
-mp	 337
-_esta	 337
-s,_	 335
-s,	 335
-_se	 333
-anta	 332
-ul	 326
-ran	 325
-_"	 323
-ý_	 322
-te_	 320
-ak	 320
-aý_	 320
-ed	 320
-rt	 319
-ojn	 318
-gi	 318
-_æ	 317
-tis	 316
-gx	 316
-mal	 316
-ia_	 315
-ks	 310
-_al_	 310
-mi_	 309
-S	 309
-lu	 309
-ns	 308
-kt	 305
-io_	 302
-ent	 300
-?	 300
-_K	 300
-ec	 300
-el_	 299
-_-	 299
-li_	 299
-E	 298
-þ	 298
-_li	 297
-fo	 296
-ter	 296
-_re	 296
-A	 295
-nto	 294
-vi_	 292
-La	 292
-_mal	 290
-nte	 288
-sp	 287
-sa	 287
-_mi_	 279
-ut	 278
-op	 278
-_ke	 277
-bo	 277
-ajn	 276
-un_	 276
-T	 274
-to_	 272
--_	 272
-bl	 272
-_an	 271
-_La	 271
-øi	 269
-_S	 268
-_pl	 267
-_fa	 266
-ni_	 266
-La_	 265
-_E	 264
-N	 263
-tis_	 263
-_tr	 263
-'	 262
-!	 262
-_-_	 262
-pro	 261
-iu_	 261
-iø	 261
-nc	 260
-_si	 259
-du	 257
-_kon	 256
-ru	 255
-_vi_	 254
-_j	 253
-ce	 251
-ke_	 249
-ap	 248
-us	 247
-be	 247
-im	 247
-B	 246
-_ku	 246
-_La_	 246
-tra	 245
-ad	 245
-uj	 245
-ac	 245
-ita	 243
-pre	 242
-_pro	 242
-co	 241
-rm	 241
-_ni	 238
-_pe	 236
-?_	 234
-on.	 234
-toj	 234
-"_	 234
-j.	 234
-_ke_	 233
-s.	 232
-_A	 231
-av	 230
-ri_	 230
-_el	 229
-por	 229
-`	 224
-ev	 224
-las	 223
-P	 223
-j._	 221
-eni	 220
-_T	 220
-_B	 219
-j,_	 218
-j,	 218
-era	 217
-_in	 216
-on._	 216
-cx	 216
-_N	 215
-ion	 215
-ab	 215
-..	 214
-)	 213
-fi	 213
-or_	 212
-pri	 212
-s._	 212
-_por	 210
-ez	 210
-in_	 210
-am_	 209
-on,_	 209
-ll	 209
-æi	 209
-on,	 209
-_ve	 208
-ris	 208
-esti	 208
-!_	 207
-men	 206
-vas	 205
-iel	 204
-taj	 203
-_c	 201
-aro	 201
-ank	 200
-_pri	 200
-jo	 200
-ja	 200
-ont	 200
-lt	 199
-_P	 199
-igi	 199
-_pa	 197
-oj.	 197
-(	 196
-au	 195
-oro	 195
-ng	 195
-_(	 194
-sto	 194
-ast	 194
-ag	 193
diff --git a/libtextcat/data/new_fingerprints/lm/estonian.lm b/libtextcat/data/new_fingerprints/lm/estonian.lm
deleted file mode 100644
index 74a7aa0..0000000
--- a/libtextcat/data/new_fingerprints/lm/estonian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20738
-a	 7004
-e	 5699
-i	 5321
-s	 4731
-t	 3769
-l	 3448
-u	 3446
-n	 2902
-k	 2584
-d	 2202
-m	 2043
-a_	 1758
-o	 1684
-r	 1429
-g	 1174
-v	 1151
-e_	 1139
-i_	 1136
-_k	 1136
-s_	 1077
-h	 1009
-,	 995
-,_	 995
-_t	 953
-p	 953
-j	 940
-ä	 900
-is	 896
-st	 851
-se	 841
-_s	 822
-.	 821
-as	 801
-d_	 801
-le	 800
-ta	 794
-in	 793
-_m	 790
-ô	 754
-._	 753
-t_	 746
-ma	 710
-_p	 680
-si	 677
-_v	 660
-es	 636
-al	 626
-us	 619
-el	 602
-_o	 596
-_e	 586
-ja	 580
-_j	 563
-te	 562
-ü	 549
-li	 532
-va	 515
-id	 501
-ol	 498
-tu	 497
-da	 490
-_n	 480
-ku	 478
-ud	 459
-nu	 455
-na	 438
-ei	 432
-ks	 418
-mi	 411
-ee	 411
-u_	 407
-ka	 400
-n_	 394
-b	 394
-ga	 386
-_l	 384
-_a	 380
-an	 366
-ja_	 365
-et	 358
-me	 358
-l_	 350
-at	 348
-la	 341
-ad	 340
-st_	 339
-ne	 336
-ll	 333
-_ta	 332
-ra	 330
-_ja	 328
-ik	 323
-en	 318
-ni	 308
-ul	 305
-sa	 302
-_ol	 302
-nd	 299
-_ja_	 299
-nud	 296
-ii	 291
-ko	 286
-_se	 285
-le_	 283
-aa	 281
-is_	 281
-gi	 270
-_te	 269
-ag	 269
-_va	 268
-_ku	 267
-ed	 262
-em	 255
-_mi	 255
-ma_	 247
-ti	 246
-ri	 245
-_h	 242
-gu	 239
-id_	 238
-ast	 237
-it	 236
-ga_	 236
-un	 232
-de	 230
-ud_	 230
-ha	 230
-ak	 228
-ah	 228
-uu	 228
-il	 227
-ôi	 226
-as_	 223
-ke	 222
-ar	 220
-a,	 220
-am	 220
-_ko	 220
-a,_	 220
-_ka	 220
-ai	 220
-eg	 216
-sin	 214
-est	 214
-ui	 214
-he	 214
-ks_	 213
-ö	 213
-oo	 213
-ju	 207
-är	 205
-ut	 203
-in_	 203
-oli	 201
-ki	 199
-su	 199
-es_	 199
-lt	 198
-ist	 188
-li_	 186
-ea	 186
-vi	 184
-im	 181
-mu	 181
-se_	 180
-ts	 180
-on	 178
-ise	 178
-ta_	 177
-ek	 176
-_oli	 176
-sel	 173
-nud_	 173
-_ü	 172
-a.	 171
-nn	 170
-ema	 169
-ng	 168
-lu	 168
-ge	 167
-_si	 166
-_ei	 165
-_i	 165
-_ei_	 164
-ei_	 164
-_r	 163
-ole	 161
-pa	 160
-lle	 160
-a._	 160
-ust	 159
-du	 156
-er	 156
-vô	 153
-da_	 153
-min	 152
-et_	 151
-d,_	 149
-_M	 149
-ht	 149
-d,	 149
-M	 149
-kui	 148
-_et	 147
-K	 147
-_K	 146
-pe	 145
-gi_	 145
-_vô	 145
-or	 144
-_tu	 142
-lt_	 141
-_ma	 141
-asi	 140
-ve	 139
-us_	 138
-ig	 136
-sin_	 136
-ur	 135
-_ta_	 134
-di	 134
-_et_	 134
-s,_	 132
-tas	 132
-s,	 132
-_kui	 131
-sk	 131
-re	 130
-po	 129
-oli_	 129
-om	 129
-äi	 128
-inu	 128
-_na	 128
-_oli_	 128
-_sa	 128
-aj	 128
-mis	 127
-ui_	 127
-_me	 127
-_pa	 126
-tus	 125
-pi	 125
-te_	 124
-ül	 123
--	 123
-est_	 122
-_on	 121
-kk	 121
-tt	 120
-aga	 119
-na_	 119
-_T	 119
-T	 119
-b_	 118
-al_	 118
-sta	 118
-_mu	 116
-_ju	 116
-ida	 116
-aks	 116
-gu_	 116
-_ni	 116
-s.	 116
-ad_	 116
-_pe	 114
-eks	 114
-ev	 114
-end	 113
-s._	 113
-use	 111
-ära	 111
-_po	 111
-_min	 110
-S	 110
-aja	 110
-_la	 110
-ele	 109
-el_	 108
-on_	 108
-ab	 108
-_S	 108
-av	 107
-ing	 107
-kui_	 106
-_on_	 106
-au	 104
-ne_	 104
-ti_	 104
-ell	 103
-ae	 101
-kô	 101
-ed_	 100
-_ke	 99
-ata	 99
-iis	 99
-!	 98
-!_	 98
-sid	 98
-nda	 98
-eh	 98
-lle_	 97
-pu	 97
-ää	 97
-vôi	 97
-ine	 96
-t,	 96
-e,_	 96
-ale	 96
-_vôi	 96
-t,_	 96
-e,	 96
-eda	 96
-uk	 95
-ast_	 95
-ld	 95
-?	 94
-_kui_	 94
-_sel	 93
-_kô	 93
-tul	 93
-ega	 93
-lg	 92
-sii	 92
-val	 92
-e.	 92
-_su	 92
-ug	 92
-oh	 92
-kü	 92
-d.	 91
-ee_	 91
-see	 91
-e._	 91
-öö	 91
-oma	 91
-_ole	 90
-ses	 90
-stu	 90
-ôt	 90
-üü	 90
-_om	 89
-me_	 89
-ot	 89
-d._	 89
-_sii	 88
-to	 88
-_en	 87
-atu	 87
-?_	 87
-A	 86
-J	 86
-pea	 86
-jä	 85
-_A	 85
-_see	 85
-ime	 84
-_pi	 84
-_ha	 84
-mô	 84
-nä	 84
-_J	 84
-les	 84
-ste	 84
-kas	 84
-_ä	 84
-vä	 83
-E	 83
-pä	 83
-_ve	 83
-_E	 83
-eis	 82
-_jä	 81
-_pea	 81
-_mô	 80
-um	 80
-_kü	 80
-iku	 80
-üd	 80
-all	 79
-eid	 79
-ba	 79
-_vä	 79
-ina	 78
-lj	 78
-sid_	 78
-hu	 78
-tun	 78
-lä	 78
-_oma	 77
-i,_	 77
-i,	 77
-agu	 77
-uh	 77
-lm	 76
-ras	 76
-ss	 76
-kä	 76
-ees	 76
diff --git a/libtextcat/data/new_fingerprints/lm/finnish.lm b/libtextcat/data/new_fingerprints/lm/finnish.lm
deleted file mode 100644
index 328f886..0000000
--- a/libtextcat/data/new_fingerprints/lm/finnish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 19984
-a	 9133
-i	 8384
-t	 7797
-e	 6481
-n	 6431
-s	 5897
-l	 4504
-o	 4163
-u	 4106
-k	 4013
-ä	 3354
-n_	 2868
-m	 2569
-a_	 1987
-v	 1905
-r	 1827
-ta	 1580
-en	 1553
-is	 1515
-h	 1508
-y	 1462
-st	 1390
-in	 1375
-p	 1342
-j	 1333
-an	 1139
-si	 1073
-tt	 1030
-te	 1008
-en_	 982
-_k	 980
-it	 974
-ll	 947
-aa	 942
-ä_	 902
-va	 878
-el	 855
-_t	 851
-ka	 846
-i_	 835
-.	 832
-se	 818
-li	 806
-tä	 804
-oi	 767
-ai	 744
-._	 739
-tu	 734
-_o	 719
-mi	 715
-al	 703
-on	 684
-d	 681
-_v	 662
-et	 654
-_j	 641
-t_	 635
-ti	 632
-_m	 628
-_s	 620
-ja	 616
-ma	 596
-sa	 595
-la	 582
-ist	 575
-_e	 565
-to	 565
-ks	 557
-in_	 554
-es	 551
-il	 538
-an_	 536
-ki	 527
-,	 525
-ku	 525
-,_	 524
-us	 520
-as	 514
-nt	 512
-ri	 495
-ke	 494
-at	 491
-_p	 485
-le	 484
-ik	 483
-ss	 477
-ut	 469
-ö	 469
-sta	 460
-ee	 459
-uu	 458
-ol	 457
-ta_	 451
-ne	 445
-ää	 445
-ei	 443
-uo	 436
-ko	 433
-un	 430
-lu	 421
-ii	 420
-e_	 418
-nn	 413
-_h	 412
-ar	 408
-er	 402
-än	 396
-ja_	 386
-im	 381
-on_	 365
-_va	 363
-aan	 354
-_a	 352
-me	 350
-ak	 345
-ssa	 331
-na	 330
-ie	 329
-pa	 327
-_ja	 326
-ia	 325
-tä_	 322
-_l	 319
-vi	 317
-ise	 316
-tta	 315
-de	 314
-os	 312
-lli	 309
-_ja_	 304
-jo	 295
-vä	 290
-su	 289
-au	 287
-lis	 286
-_on	 285
-sä	 284
-uk	 280
-am	 280
-ot	 280
-ty	 275
-ett	 271
-ttä	 270
-ni	 269
-lä	 267
-ksi	 264
-nk	 264
-ht	 263
-ul	 261
-ell	 261
-sa_	 259
-ha	 257
-sen	 257
-a.	 254
-isi	 253
-ste	 253
-aan_	 252
-_on_	 252
-_ka	 252
-sk	 251
-kk	 246
-itt	 245
-ok	 242
-a._	 239
-all	 239
-yt	 239
-mä	 237
-mu	 237
-av	 237
-_y	 236
-lla	 233
-taa	 231
-ais	 231
-een	 230
-K	 230
-lt	 228
-s_	 227
-ast	 227
-iv	 226
-ssa_	 225
-ra	 225
--	 223
-kse	 223
-oit	 220
-om	 220
-T	 219
-_ku	 218
-än_	 216
-aa_	 214
-at_	 214
-tel	 211
-ui	 210
-si_	 208
-rk	 207
-sta_	 207
-_jo	 203
-kä	 202
-_K	 201
-est	 200
-em	 200
-he	 199
-_n	 199
-vo	 198
-_ta	 196
-eh	 196
-_ol	 196
-S	 196
-nta	 196
-_ko	 194
-je	 194
-stä	 194
-är	 193
-ust	 191
-mis	 191
-ns	 190
-pu	 189
-nen	 188
-ät	 188
-toi	 188
-iin	 187
-ten	 187
-min	 186
-ista	 185
-hd	 184
-a,	 184
-a,_	 184
-sen_	 183
-E	 182
-lle	 181
-vat	 179
-ill	 177
-no	 176
-pä	 176
-lm	 176
-llis	 175
-n.	 175
-io	 172
-ine	 171
-n._	 170
-pi	 169
-uks	 168
-ava	 168
-ään	 166
-nen_	 165
-ah	 165
-_mu	 164
-tus	 163
-mm	 162
-_to	 162
-ek	 160
-int	 159
-_r	 159
-lin	 158
-oim	 158
-_T	 158
-A	 158
-imi	 157
-tö	 157
-la_	 157
-jä	 157
-aj	 156
-yh	 155
-o_	 154
-lo	 154
-oli	 153
-een_	 153
-le_	 153
-_si	 153
-g	 152
-aik	 151
-vat_	 150
-L	 149
-ur	 149
-ti_	 149
-sia	 148
-ite	 147
-inen	 147
-ain	 146
-sti	 146
-lla_	 146
-ys	 145
-_mi	 145
-val	 144
-stu	 144
-äm	 144
-alli	 143
-pe	 143
-utt	 142
-et_	 141
-_tu	 141
-eri	 140
-_E	 140
-:	 140
-nki	 139
-ir	 139
-llä	 138
-up	 138
-äi	 137
-ama	 137
-_ha	 135
-id	 135
-_se	 135
-po	 134
-inen_	 134
-tte	 133
-nna	 133
-ten_	 132
-or	 132
-ts	 131
-nä	 131
-yk	 131
-äs	 131
-_S	 130
-ses	 130
-ve	 130
-ess	 129
-äl	 129
-ita	 129
-lai	 129
-H	 129
-van	 127
-äk	 127
-kin	 127
-N	 127
-_te	 126
-den	 126
-tee	 126
-P	 126
-kaa	 126
-iin_	 125
-kun	 125
-ois	 125
-sit	 125
-oh	 124
-V	 124
-yö	 124
-äv	 124
-tav	 124
-voi	 124
-ia_	 123
-I	 123
-oll	 123
-maa	 122
-ih	 122
-oj	 122
-rj	 121
-ro	 121
-ikk	 120
-so	 120
-oo	 120
-oimi	 120
-do	 120
-pp	 119
-M	 119
-_ei	 118
-toim	 118
-op	 118
-uut	 118
-tet	 118
-_i	 118
-_ma	 117
-vai	 117
-lä_	 116
-u_	 116
-sy	 116
-kau	 116
-utta	 116
-un_	 115
-eu	 115
-ssä	 115
-tti	 115
-_sa	 115
-mp	 114
-eis	 114
-ka_	 112
-että	 112
-taa_	 111
-_et	 111
-hu	 111
-itu	 111
-suu	 111
-den_	 111
-ksen	 110
-ap	 110
-_ke	 110
-uv	 110
-tam	 110
-yv	 109
-aup	 109
-stä_	 109
-asta	 109
-äy	 109
-kan	 108
-nu	 108
-ukse	 108
-_toi	 107
-ien	 107
-hi	 107
-iss	 107
diff --git a/libtextcat/data/new_fingerprints/lm/french.lm b/libtextcat/data/new_fingerprints/lm/french.lm
deleted file mode 100644
index 5080d9c..0000000
--- a/libtextcat/data/new_fingerprints/lm/french.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20800
-e	 7258
-i	 4051
-s	 4003
-a	 3972
-n	 3903
-r	 3650
-t	 3590
-u	 2968
-o	 2823
-l	 2723
-e_	 2632
-d	 2241
-s_	 1721
-_d	 1693
-c	 1663
-p	 1528
-é	 1320
-m	 1297
-es	 1164
-t_	 1106
-_l	 1079
-de	 1048
-on	 959
-_de	 940
-en	 939
-_p	 852
-nt	 825
-le	 808
-es_	 791
-re	 777
-,	 721
-,_	 720
-n_	 703
-de_	 685
-'	 670
-an	 667
-_de_	 645
-v	 641
-_s	 610
-r_	 596
-_c	 594
-er	 585
-ai	 575
-_a	 558
-_e	 554
-ou	 554
-q	 549
-qu	 538
-is	 530
-te	 528
-ti	 525
-ur	 519
-it	 514
-g	 498
-a_	 490
-f	 480
-la	 476
-in	 475
-_le	 441
-me	 436
-nt_	 432
-.	 427
-b	 427
-ra	 423
-io	 416
-ent	 415
-._	 404
-ne	 395
-ns	 392
-ion	 383
-h	 381
-ue	 376
-se	 371
-le_	 370
-ar	 370
-ie	 362
-co	 361
-at	 359
-tr	 359
-et	 349
-pr	 342
-ce	 336
-au	 328
-u_	 321
-il	 314
-_r	 313
-_la	 304
-un	 303
-eu	 303
-st	 300
-re_	 296
-ro	 290
-la_	 288
-on_	 287
-_m	 286
-_la_	 283
-que	 281
-_qu	 280
-_q	 280
-po	 275
-tio	 273
-tion	 273
-pa	 273
-li	 271
-_t	 269
-nc	 268
-si	 266
-_pr	 265
-ri	 264
-al	 263
-ui	 262
-_co	 259
-i_	 255
-ta	 255
-é_	 251
-x	 247
-em	 244
-l_	 243
-et_	 238
-_l'	 236
-l'	 236
-les	 233
-ns_	 233
-ir	 232
-_le_	 228
-ent_	 227
-or	 226
-ré	 224
-_f	 224
-ne_	 222
-à	 221
-ve	 220
-ch	 220
-it_	 219
-di	 219
-oi	 217
--	 216
-ni	 215
-à_	 215
-les_	 215
-d'	 214
-el	 212
-ss	 212
-_n	 212
-ut	 211
-our	 210
-des	 210
-"	 208
-ur_	 207
-nd	 207
-er_	 206
-ait	 206
-ion_	 204
-rs	 202
-_en	 201
-_et	 200
-j	 200
-_d'	 200
-ll	 199
-_des	 198
-des_	 197
-_pa	 197
-té	 196
-_et_	 195
-_à	 195
-_à_	 195
-om	 193
-ma	 192
-ati	 190
-_des_	 189
-L	 188
-so	 187
-_u	 185
-è	 184
-_"	 183
-sa	 182
-_po	 181
-tre	 181
-dé	 181
-ue_	 180
-pe	 179
-en_	 179
-ont	 178
-_un	 178
-_L	 178
-us	 176
-_les	 176
-_les_	 176
-rt	 176
-is_	 173
-_i	 173
-du	 172
-e,_	 171
-e,	 171
-na	 171
-s,	 170
-s,_	 170
-as	 169
-men	 169
-M	 167
-ait_	 167
-'a	 166
-vi	 162
-ci	 159
-ant	 158
-_au	 158
-da	 157
-_M	 157
-ation	 155
-atio	 155
-con	 154
-que_	 153
-ons	 153
-eur	 151
-est	 149
-me_	 149
-mi	 149
-par	 148
-tion_	 148
-_so	 147
-te_	 147
-res	 144
-lo	 144
-ment	 144
-és	 144
-ans	 143
-_du	 142
-du_	 141
-ux	 141
-un_	 140
-y	 138
-pro	 138
-_du_	 136
-_dé	 136
-ce_	 135
-_se	 134
-_re	 134
-pl	 133
-A	 132
-ge	 131
-ic	 131
-su	 130
-x_	 129
-ien	 129
-nce	 129
-"_	 129
-ac	 128
-il_	 128
-qui	 128
-_pro	 127
-no	 127
-av	 126
-_v	 125
-_o	 125
-rs_	 125
-ans_	 124
-eme	 124
-bl	 123
-emen	 122
-_en_	 122
-iqu	 122
-ct	 122
-iq	 122
-lle	 122
-nn	 121
-ts	 121
-ement	 121
-ét	 120
-_"_	 120
-ér	 119
-té_	 119
-_ce	 119
-mp	 119
-ire	 119
-ui_	 119
-to	 118
-he	 117
-_é	 117
-ca	 117
-_j	 116
-ec	 116
-va	 116
-_par	 116
-ée	 115
-_con	 115
-se_	 114
-tre_	 113
-ique	 112
-dan	 111
-éc	 111
-ha	 110
-une	 110
-P	 110
-lu	 110
-ux_	 109
-_b	 108
-s.	 108
-pou	 108
-_pou	 108
-ier	 107
-C	 107
-ais	 106
-s._	 105
-ain	 104
-_un_	 104
-nte	 103
-'e	 103
-mo	 103
-mm	 103
-ment_	 102
-une_	 102
-com	 101
-_P	 101
-'i	 101
-_ma	 100
-do	 99
-ant_	 98
-anc	 98
-che	 97
-ap	 97
-ont_	 97
-_que	 97
-os	 97
-urs	 96
-_di	 96
-fi	 96
-im	 96
-pour	 96
-_pour	 96
-ê	 95
-ts_	 95
-_g	 95
-our_	 94
-_sa	 94
-ntr	 94
-_da	 94
-_ré	 93
-rai	 93
-rm	 93
-_qui	 93
-e.	 92
-am	 92
-_com	 91
-uv	 91
-_C	 91
-D	 91
-qui_	 90
-e._	 90
-pu	 89
-_qui_	 88
-ia	 87
-_dan	 87
-_dans	 87
-dans	 87
-ter	 87
-fo	 87
-son	 87
-dans_	 87
-id	 86
-ag	 86
-ine	 86
-tu	 85
-ran	 85
-au_	 85
-ol	 85
-oc	 84
-est_	 84
-st_	 84
-enc	 84
-F	 82
-_tr	 81
-'u	 81
-tai	 81
-ell	 80
-R	 79
-_su	 79
-S	 79
-ions	 79
-pré	 79
-sé	 78
-ab	 78
-né	 77
-_que_	 77
-_in	 77
-_av	 76
-pour_	 76
-fa	 76
-rr	 76
-air	 75
-_ch	 75
-_a_	 75
-ba	 74
-_pl	 74
-gr	 74
-tt	 74
-ssi	 74
-rd	 73
-pas	 73
-bi	 73
diff --git a/libtextcat/data/new_fingerprints/lm/frisian.lm b/libtextcat/data/new_fingerprints/lm/frisian.lm
deleted file mode 100644
index 9efa35f..0000000
--- a/libtextcat/data/new_fingerprints/lm/frisian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 46446
-e	 15767
-n	 9616
-i	 7837
-a	 7830
-t	 7562
-r	 7297
-s	 6307
-o	 4784
-n_	 4595
-d	 4564
-e_	 4213
-l	 4032
-k	 3951
-t_	 3079
-en	 2863
-m	 2605
-er	 2492
-y	 2462
-f	 2371
-_d	 2253
-de	 2124
-h	 1943
-in	 1899
-w	 1898
-en_	 1857
-_i	 1815
-u	 1769
-g	 1738
-an	 1690
-j	 1678
-p	 1651
-r_	 1619
-_f	 1602
-.	 1601
-ar	 1561
-te	 1545
-b	 1488
-s_	 1476
-._	 1435
-_s	 1370
-de_	 1235
-_de	 1224
-_w	 1181
-it	 1172
-ie	 1140
-,	 1078
-_o	 1056
-,_	 1056
-oa	 1045
-_e	 1040
-st	 1038
-an_	 1010
-_b	 972
-_de_	 965
-ke	 949
-_m	 947
-_t	 933
-ne	 920
-er_	 895
-at	 863
-sk	 856
-c	 850
-it_	 848
-_h	 838
-ei	 832
-k_	 817
-yn	 790
-ch	 784
-le	 772
-is	 769
-je	 765
-el	 761
-me	 758
-ea	 754
-_k	 740
-fa	 736
-in_	 735
-'	 733
-_it	 733
-_it_	 727
-ge	 727
-re	 725
-al	 724
-_fa	 684
-yn_	 640
-aa	 628
-fan	 626
-_y	 618
-ar_	 617
-et	 616
-ri	 615
-_fan	 613
-_n	 612
-li	 611
-_yn	 610
-_en	 598
-fan_	 594
-oe	 589
-_fan_	 584
-_en_	 583
-at_	 581
-_in	 570
-oar	 565
-_in_	 560
-y_	 555
-F	 549
-es	 540
-_a	 536
-ng	 523
-be	 514
-sj	 512
-nt	 510
-l_	 510
-_F	 506
-ns	 506
-D	 499
-te_	 499
-der	 497
-_yn_	 497
-ti	 493
-ek	 490
-ro	 476
-rs	 474
-rd	 473
-se	 470
-fo	 470
-ys	 462
-op	 461
-û	 461
-we	 456
-ry	 451
-da	 445
-d_	 443
-is_	 442
-_D	 440
-ur	 433
-i_	 432
-ha	 426
-_me	 425
-ear	 422
-_l	 417
-ed	 410
-as	 409
-om	 407
-ei_	 406
-Fr	 405
-nd	 404
-_fo	 394
-_p	 393
-oc	 390
-rys	 389
-ol	 386
-_Fr	 386
-och	 383
-fe	 381
-ik	 379
-ma	 379
-ra	 377
-nn	 374
-_g	 368
-_da	 367
-di	 363
-ts	 362
-ta	 361
-a_	 360
-ko	 359
-et_	 358
-ysk	 356
-Fry	 354
-Frys	 354
-z	 354
-ll	 350
-_be	 349
-ke_	 348
-I	 347
-ing	 346
-_'	 345
-m_	 343
-h_	 340
-ske	 339
-_ha	 338
-sje	 336
-_Fry	 336
-_Frys	 336
-wi	 335
-_op	 334
-p_	 334
-_is	 333
-ch_	 333
-tr	 330
-ten	 328
-ers	 327
-wa	 325
-ter	 322
-ji	 322
-rysk	 319
-_ne	 319
-je_	 312
-foa	 311
-ê	 309
-jo	 307
-_is_	 307
-ste	 307
-_te	 306
-â	 301
-n.	 301
-nne	 300
-rt	 300
-foar	 299
-S	 299
-mei	 299
-_r	 298
-_oa	 297
-wu	 293
-ak	 291
-si	 290
-wur	 290
-ni	 290
-pe	 288
-Frysk	 287
-oan	 286
-n._	 285
-_mei	 284
-der_	 281
-_foar	 281
-_foa	 281
-ht	 278
-cht	 277
--	 275
-ú	 275
-_j	 274
-ne_	 273
-ken	 273
-fer	 271
-ûn	 270
-am	 270
-on	 268
-nde	 264
-_S	 264
-B	 262
-ki	 261
-id	 261
-le_	 261
-dat	 260
-v	 259
-_I	 256
-oar_	 255
-op_	 254
-lle	 252
-la	 244
-tt	 243
-dat_	 242
-_fe	 242
-mm	 240
-inn	 239
-_wi	 239
-_dat	 237
-g_	 236
-mei_	 236
-al_	 235
-_B	 234
-e.	 234
-ld	 231
-_al	 230
-_wur	 230
-urd	 230
-_wu	 230
-_op_	 230
-De	 229
-inne	 228
-ng_	 227
-_mei_	 227
-'t	 226
-ks	 226
-'t_	 224
-_dat_	 224
-_ko	 223
-_st	 220
-ân	 219
-rk	 219
-sa	 219
-e._	 219
-tte	 218
-en.	 218
-n,	 217
-ier	 216
-ten_	 216
-_fer	 215
-mi	 215
-hi	 215
-ien	 214
-_wa	 213
-n,_	 213
-no	 213
-_te_	 212
-ig	 212
-_De	 212
-ske_	 212
-_der	 212
-W	 211
-H	 211
-_oan	 210
-ee	 209
-dy	 208
-ek_	 207
-en._	 207
-ic	 207
-mme	 206
-yk	 204
-pr	 204
-net	 203
-foar_	 203
-he	 203
-wurd	 201
-_der_	 199
-jen	 199
-_dy	 199
-kr	 198
-ka	 197
-im	 196
-_H	 196
-il	 196
-ze	 196
-_ma	 195
-by	 194
-oer	 194
-kt	 193
-us	 193
-M	 193
-sk_	 192
-wo	 192
-_hi	 191
-or	 190
-ing_	 190
-_W	 190
-ich	 189
-De_	 187
-rr	 186
-int	 185
-_ú	 184
-:	 184
-ij	 184
-_ek	 183
-eg	 182
-:_	 180
-gen	 180
-as_	 180
-_se	 179
-e,	 178
-_net	 177
-e,_	 177
-ins	 177
-N	 177
-ls	 176
-st_	 176
-_wurd	 176
-ie_	 175
-E	 175
-nne_	 175
-_De_	 175
-sy	 175
-wer	 174
-gr	 174
-f_	 173
-nk	 172
-och_	 172
-net_	 169
-ad	 169
-_we	 169
-rde	 168
-sl	 168
-bi	 168
-of	 168
-so	 168
-_no	 167
-_ta	 167
-re_	 167
-to	 167
-den	 167
-J	 167
-t.	 166
-It	 165
-út	 165
-inne_	 165
-ysk_	 165
-lik	 164
-sp	 163
-_ek_	 162
-ou	 162
-tsj	 162
-It_	 161
-_sa	 160
-A	 160
-wol	 160
-lâ	 159
-_wo	 159
-ge_	 159
-lân	 159
-ige	 158
diff --git a/libtextcat/data/new_fingerprints/lm/georgian.lm b/libtextcat/data/new_fingerprints/lm/georgian.lm
deleted file mode 100644
index 0e88ab0..0000000
--- a/libtextcat/data/new_fingerprints/lm/georgian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 14926
-À	 7221
-È	 5780
-Ä	 4137
-Ð	 2966
-Ñ	 2908
-Ë	 2607
-Ê	 2372
-Í	 2260
-Å	 2080
-Ã	 2078
-Ì	 2005
-Ç	 1598
-Á	 1383
-Ó	 1363
-È_	 1248
-À_	 1149
-Â	 1145
-ÊÈ	 1009
-Þ	 974
-_Ë	 965
-Ñ_	 964
-ÃÀ	 912
-ÈÑ	 901
-ÀÐ	 897
-Ø	 820
-.	 813
-ÄÁ	 767
-"	 762
-._	 735
-,	 720
-,_	 718
-ÑÀ	 684
-_À	 669
-Ú	 653
-ËÀ	 631
-ÀÌ	 622
-ÄÊ	 575
-ÐÈ	 570
-ÅÄ	 567
-Õ	 551
-_Ã	 550
-Ò	 542
-_Ñ	 526
-É	 518
-ÀË	 517
-ÅÀ	 485
-ÅÈ	 479
-ÂÀ	 478
-_Â	 474
-ÓÊ	 468
-_È	 436
-ÐÀ	 435
-ÀÅ	 420
-ËÈ	 419
-ÌÈ	 418
-ÄÐ	 416
-ÄÌ	 412
-ÈÑ_	 407
-_ÃÀ	 404
-ÃÀ_	 393
-ÀÊ	 384
-ËÍ	 382
-Ü	 376
-_"	 374
-ÊÈ_	 371
-×	 369
-ÐÍ	 364
-ÀÑ	 360
-ÈÇ	 358
-ÀÃ	 353
-ÌÀ	 349
-Ô	 349
-ÁÀ	 342
-Æ	 341
-ËÄ	 335
-ÈÀ	 334
-ÈÊ	 332
-ÐÇ	 326
-_Ð	 322
-ÁÈ	 321
-ØÈ	 319
-_Ä	 319
-_Ø	 319
-ÃÄ	 317
-_ÂÀ	 316
-ÇÀ	 316
-ÄÑ	 306
-Ä_	 299
-_Ç	 288
-ÐÄ	 279
-ÓÊÈ	 273
-ÊÍ	 271
-Ö	 270
-Ì_	 267
-ÌÄ	 267
-_ÑÀ	 266
-ÍÁ	 263
-ÓÐ	 260
-Ç_	 256
-ÄÊÈ	 255
-ÃÈ	 238
-ÊÄ	 238
-ÑÈ	 234
-ÊÀ	 233
-ÍÐ	 230
-ÈÌ	 229
-_Þ	 227
-"_	 225
-ÄÁÈ	 224
-:	 224
-:_	 223
-È.	 221
-_ÃÀ_	 217
-Û	 215
-ÞÄ	 213
-È,	 213
-È,_	 212
-_Ó	 211
-Í_	 209
-_ËÀ	 208
-ÈÑÀ	 208
-ÍË	 206
-_ÀÐ	 204
-ÇÅ	 203
-ÀÐÇ	 203
-ØÄ	 203
-È._	 201
-À.	 200
--	 193
-ÀÞ	 192
-ÅÄÊ	 192
-Ú_	 189
-ÈÃ	 188
-Ù	 188
-ÕÀ	 187
-Ã_	 185
-ÈÊÈ	 183
-ÄÃ	 179
-À._	 177
-Ð_	 177
-ÍÃ	 174
-ÞÀ	 174
-ÈÐ	 173
-ÌÃ	 172
-_ÐÍ	 172
-ÍÑ	 172
-ÄÁÀ	 171
-_ËÍ	 170
-ÐÈ_	 170
-_ËÈ	 170
-_Ü	 169
-ÇÈ	 166
-ÁÄ	 166
-_Õ	 165
-ØÈ_	 165
-ÄÑ_	 163
-ÀÈ	 162
-_ØÄ	 160
-ÄÅ	 158
-_É	 155
-ÀÚ	 154
-ÊÈÑ	 153
-Î	 151
-Ë_	 149
-ÕÀÐ	 148
-À,_	 147
-À,	 147
-ÀÇ	 147
-ÀÂ	 145
-ÕÀÐÇ	 145
-ÈÂ	 143
-ËÀÐ	 143
-ÍÊ	 143
-ÀÊÈ	 142
-ÂÈ	 142
-ÌÄÁ	 141
-ÄË	 140
-ÀØ	 139
-ÓÊÈ_	 139
-ÄÇ	 139
-ÇÓ	 138
-_Ì	 136
-ÈÇ_	 135
-ÀÐÈ	 133
-ÀÌ_	 132
-ÊÄÁ	 131
-×Í	 130
-ÑÄ	 130
-ÈË	 130
-ÐÄÁ	 128
-ÀÕ	 125
-ÆÄ	 125
-ÔÄ	 125
-Ê_	 124
-ÀÅÈ	 124
-ÀÃ_	 124
-ÅÈÑ	 123
-_ËÄ	 123
-ÀËÈ	 122
-_ÕÀ	 121
-ÉÈ	 121
-_Å	 120
-×Å	 120
-ÍÅ	 116
-_Á	 114
-ÀÌÈ	 113
-ÀËÍ	 113
-ÂÀÌ	 113
-ÍÌ	 112
-ÉÀ	 112
-ÈÚ	 112
-ØÀ	 112
-ÀÐÀ	 111
-ÁÓ	 111
-ÞÅ	 109
-ÀÖ	 109
-ÂÍ	 107
-ÁÀ_	 107
-ÌÈ_	 107
-ÅÀÐ	 107
-ÄÊÈ_	 106
-ÐÃ	 106
-ÀÐ_	 106
-_ÀË	 105
-ß	 104
-ÄÐÇ	 104
-_ÄÐ	 104
-ÅÄÌ	 103
-_ÄÑ	 103
-ÐÍË	 103
-ÄÌÈ	 103
-_Ú	 103
-ÁÍ	 102
-_Ù	 102
-ËÈÑ	 102
-ÐÈÑ	 102
-ÞÍ	 102
-_ÐÍË	 101
-_ÕÀÐ	 101
-ÈÅ	 100
-_ÕÀÐÇ	 100
-ÓÐÈ	 99
-ÒÈ	 99
-ÂÄ	 99
-ÈÒ	 99
-ÀÀ	 97
-ÀÒ	 97
-ÁÓÊ	 96
-ÕÅ	 94
-ÈÄ	 94
-_ÇÀ	 94
-Ñ,_	 93
-ÐÑ	 93
-ÅÊ	 93
-_ØÀ	 93
-Ñ,	 93
-_ÑÈ	 93
-ÀÉ	 93
-ÀÆ	 92
-ÍÁÀ	 92
-ÀÑ_	 92
-ÌÍ	 91
-ÄÁÓ	 91
-ÇÕ	 91
-ËÓ	 90
-ÄÌ_	 90
-ÇÀÅ	 89
-ÄÁÓÊ	 89
-ÊÑ	 89
-ÀØÈ	 89
-ÃÄÁ	 89
-ÀÁ	 89
-È"	 89
-Ñ.	 88
-ÚÞ	 88
-ÂÀË	 88
-ÍÑ_	 87
-_ÄÐÇ	 87
-È×	 87
-ÁÈÑ	 87
-ÌÃÀ	 87
-ØÅ	 87
-ÞÄÊ	 87
-ÁÈÇ	 85
-ÑÀ_	 85
-ÇÅÄ	 85
-ÓÌ	 85
-ÒÀ	 85
-_Î	 84
-ÊÈ.	 84
-_ÐÀ	 83
-Ñ._	 83
-_Ô	 83
-_ÂÀË	 83
-ÊÈÀ	 83
-ÊÈ._	 82
-ÄÐÈ	 82
-ÈÀ_	 82
-ÈÀÌ	 82
-ÜÈ	 81
-ÀÚ_	 81
-"Ë	 81
-ÈÓ	 80
-_"Ë	 80
-ÐÇÅ	 80
-_ÄÑ_	 79
-_ÈÂ	 79
-ÀÓ	 79
-ÈÕ	 79
-ÀÐÇÅ	 79
-ÇÈ_	 79
-ÑÀÞ	 79
-ÐÇÓ	 78
-ÊÈ,	 78
-ÚÈ	 78
-ÞÈ	 78
-ÐÇÓÊ	 78
-ÇÓÊ	 78
-ÊÈ,_	 78
-ÀÃÀ	 78
-ÁÑ	 78
-_ÀÐ_	 77
-ÞÊ	 77
-ÐÓ	 77
-ÀÐÇÓÊ	 77
-_ÌÀ	 77
-ÅÈÇ	 77
-ÈÂÈ	 77
-ÀÐÇÓ	 77
-ÜÀ	 76
-ÅÀ_	 75
-_ÞÀ	 75
-ÉÅ	 75
-ÒÄ	 75
-ÐÀ_	 75
-ÅÀÊ	 75
-ÇÅÄÊ	 74
-ÐÇÅÄ	 74
-ÀÐÇÅÄ	 74
-ÄÁÀ_	 74
-ÐË	 73
-ÑÞ	 73
-ÑÒ	 73
-ÅÑ	 73
-ÑÓ	 73
-ÐÇÅÄÊ	 73
-ËÞ	 73
-ÍÊÍ	 72
-ÐÚ	 72
-_×	 72
-ÂÐ	 71
-ÅÄ_	 71
-ÒÍ	 71
-ÇÄ	 71
-ÍÂ	 71
-ÅÄÁ	 71
-ÕÀÐÇÓ	 71
-ÐÀÃ	 70
-ÀË_	 70
-ÅÃ	 69
-ËÀ_	 69
-ÍÄ	 69
-_ÀÐÀ	 67
-à	 67
-ÄÃÀ	 67
-ÇÀÌ	 67
-È×Í	 67
-ÕÀÐÇÅ	 67
-Ò×	 67
-ÂÀËÍ	 66
-_ÂÀËÍ	 66
-ÄÒ	 66
-ÍÃÀ	 66
-ÅÄÊÈ	 66
-ÀÌÀ	 66
-ÄÁÈÇ	 66
-_ÈÂÈ	 66
-ÄÊÍ	 65
-ÄÂ	 65
-ËÈÊ	 65
-ÊË	 65
-ÈÊÈ_	 65
-ÍÁÈ	 65
-ÅÐ	 65
-_ÈÑ	 64
-Ó_	 63
-ËÃ	 63
-",	 63
-ÃÍ	 63
-ÊÍÁ	 63
-ÂÅ	 63
-ÃÂ	 63
-ÄÍ	 62
-À"	 62
-ÀÅÀ	 62
-?	 62
-",_	 62
-!	 62
-_È×	 62
diff --git a/libtextcat/data/new_fingerprints/lm/german.lm b/libtextcat/data/new_fingerprints/lm/german.lm
deleted file mode 100644
index eb4eda0..0000000
--- a/libtextcat/data/new_fingerprints/lm/german.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 31586
-e	 15008
-n	 9058
-i	 7299
-r	 6830
-t	 5662
-s	 5348
-a	 4618
-h	 4176
-d	 4011
-er	 3415
-en	 3412
-u	 3341
-l	 3266
-n_	 2848
-c	 2636
-ch	 2460
-g	 2407
-o	 2376
-e_	 2208
-r_	 2128
-m	 2077
-_d	 1948
-de	 1831
-en_	 1786
-ei	 1718
-er_	 1570
-in	 1568
-te	 1505
-ie	 1505
-b	 1458
-t_	 1425
-f	 1306
-k	 1176
-ge	 1144
-s_	 1137
-un	 1113
-,	 1104
-,_	 1099
-w	 1099
-z	 1060
-nd	 1039
-he	 1004
-st	 989
-_s	 952
-_de	 949
-.	 909
-_e	 906
-ne	 906
-der	 880
-._	 847
-be	 841
-es	 829
-ic	 796
-_a	 791
-ie_	 779
-is	 769
-ich	 763
-an	 755
-re	 749
-di	 732
-ein	 730
-se	 730
-"	 720
-ng	 709
-_i	 706
-sc	 683
-sch	 681
-it	 673
-der_	 652
-h_	 651
-ch_	 642
-S	 630
-le	 609
-p	 609
-ä	 607
-ü	 603
-au	 603
-v	 602
-che	 599
-_w	 596
-d_	 585
-die	 576
-_di	 572
-m_	 562
-_die	 559
-el	 548
-_S	 540
-_der	 529
-li	 527
-_der_	 523
-si	 515
-al	 514
-ns	 507
-on	 501
-or	 495
-ti	 490
-ten	 487
-ht	 486
-die_	 485
-_die_	 483
-D	 479
-rt	 478
-nd_	 476
-_u	 470
-nt	 468
-A	 466
-in_	 464
-den	 461
-cht	 447
-und	 443
-me	 440
-_z	 429
-ung	 426
-ll	 423
-_un	 421
-_ei	 419
-_n	 415
-hr	 412
-ine	 412
-_A	 408
-_ein	 405
-ar	 404
-ra	 403
-_v	 400
-_g	 400
-as	 395
-zu	 392
-et	 389
-em	 385
-_D	 380
-eine	 376
-gen	 376
-g_	 376
-da	 368
-we	 366
-K	 365
-lt	 360
-B	 354
-_"	 353
-nde	 349
-ni	 347
-und_	 345
-E	 345
-ur	 345
-_m	 342
-ri	 341
-ha	 340
-eh	 339
-ten_	 338
-es_	 336
-_K	 336
-_und	 335
-ig	 335
-_b	 335
-hen	 334
-_und_	 332
-_au	 329
-_B	 327
-_da	 325
-_zu	 324
-_in	 322
-at	 321
-us	 318
-wi	 307
-n,	 305
-n,_	 304
-nn	 304
-te_	 301
-eit	 301
-_h	 300
-ter	 299
-M	 298
-n.	 295
-ß	 294
-ng_	 289
-sche	 289
--	 283
-rs	 282
-den_	 282
-_si	 280
-G	 280
-im	 278
-_ge	 277
-chen	 276
-rd	 273
-_E	 273
-n._	 270
-icht	 270
-rn	 268
-uf	 267
-isch	 264
-isc	 264
-nen	 263
-_in_	 262
-_M	 260
-_er	 257
-ich_	 255
-ac	 253
-lic	 252
-_G	 252
-ber	 252
-la	 251
-vo	 251
-eb	 250
-ke	 249
-F	 248
-as_	 248
-hen_	 248
-ach	 245
-en,	 244
-ung_	 243
-lich	 243
-ste	 243
-en,_	 243
-_k	 241
-ben	 241
-_f	 241
-en.	 241
-_be	 239
-it_	 239
-L	 238
-_se	 237
-mi	 236
-ve	 236
-na	 236
-on_	 236
-P	 235
-ss	 234
-ist	 234
-ö	 234
-ht_	 233
-ru	 233
-st_	 229
-_F	 229
-ts	 227
-ab	 226
-W	 226
-ol	 225
-_eine	 225
-hi	 225
-so	 224
-em_	 223
-"_	 223
-ren	 222
-en._	 221
-chen_	 221
-R	 221
-ta	 221
-ere	 220
-ische	 219
-ers	 218
-ert	 217
-_P	 217
-tr	 217
-ed	 215
-ze	 215
-eg	 215
-ens	 215
-ür	 213
-ah	 212
-_vo	 212
-ne_	 211
-cht_	 210
-uc	 209
-_wi	 209
-nge	 208
-lle	 208
-fe	 207
-_L	 207
-ver	 206
-hl	 205
-V	 204
-ma	 203
-wa	 203
-auf	 201
-H	 198
-_W	 195
-T	 195
-nte	 193
-uch	 193
-l_	 192
-sei	 192
-nen_	 190
-u_	 189
-_den	 189
-_al	 189
-_V	 188
-t.	 188
-lte	 187
-ut	 186
-ent	 184
-sich	 183
-sic	 183
-il	 183
-ier	 182
-am	 181
-gen_	 180
-sen	 179
-fü	 178
-um	 178
-t._	 177
-f_	 174
-he_	 174
-ner	 174
-nst	 174
-ls	 174
-_sei	 173
-ro	 173
-ir	 173
-ebe	 173
-mm	 173
-ag	 172
-ern	 169
-t,_	 169
-t,	 169
-eu	 169
-ft	 168
-icht_	 167
-hre	 167
-Be	 166
-nz	 165
-nder	 165
-_T	 164
-_den_	 164
-iche	 163
-tt	 163
-zu_	 162
-and	 162
-J	 161
-rde	 160
-rei	 160
-_we	 159
-_H	 159
-ige	 159
-_Be	 158
-rte	 157
-hei	 156
-das	 155
-aus	 155
-che_	 154
-_das	 154
-_zu_	 154
-tz	 154
-_ni	 153
-das_	 153
-_R	 153
-N	 153
-des	 153
-_ve	 153
-_J	 152
-I	 152
-_das_	 152
-men	 151
-_so	 151
-_ver	 151
-_auf	 150
-ine_	 150
-_ha	 150
-rg	 149
-ind	 148
-eben	 148
-kt	 147
-mit	 147
-_an	 147
-her	 146
-Ge	 146
-Sc	 145
-_sich	 145
-U	 145
-Sch	 145
-_sic	 145
-end	 145
-Di	 144
-abe	 143
-ck	 143
-sse	 142
-ür_	 142
-ell	 142
-ik	 141
-o_	 141
-nic	 141
-nich	 141
-sa	 141
-_fü	 140
-hn	 140
-zi	 140
-no	 140
-nicht	 140
-im_	 139
-von_	 139
-von	 139
-_nic	 139
-_nich	 139
-eine_	 139
-oc	 138
-wei	 138
-io	 138
-schen	 138
-gt	 138
diff --git a/libtextcat/data/new_fingerprints/lm/greek.lm b/libtextcat/data/new_fingerprints/lm/greek.lm
deleted file mode 100644
index 6dff6cd..0000000
--- a/libtextcat/data/new_fingerprints/lm/greek.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 89284
-α	 19666
-τ	 16086
-ο	 15826
-ε	 14848
-ι	 12766
-ν	 12189
-π	 8776
-σ	 8653
-ρ	 8399
-κ	 7761
-μ	 7529
-υ	 6850
-ά	 6284
-_τ	 5918
-λ	 5802
-ς	 5371
-α_	 5272
-η	 5236
-έ	 4739
-ί	 4609
-ό	 4489
-το	 4461
-ς_	 4111
-ου	 4075
-ι_	 4033
-ε_	 4019
-.	 3916
-_κ	 3897
-ο_	 3836
-._	 3810
-ν_	 3661
-_π	 3414
-_σ	 3333
-"	 3247
-_μ	 3242
-_το	 3118
-,	 3106
-,_	 3068
-γ	 3058
-_α	 2912
-ω	 2689
-να	 2593
-δ	 2455
-τα	 2420
-χ	 2411
-κα	 2406
-στ	 2406
-_ε	 2353
--	 2335
--_	 2192
-ύ	 2171
-αν	 2162
-τη	 2151
-ή	 2141
-υ_	 2133
-αι	 2100
-θ	 2053
-φ	 1989
-ου_	 1974
-ει	 1889
-_κα	 1882
-εί	 1864
-το_	 1802
-πο	 1771
-αι_	 1727
-σε	 1709
-_ν	 1647
-_"	 1619
-η_	 1609
-ια	 1602
-να_	 1518
-τι	 1501
-ον	 1501
-του	 1495
-με	 1460
-_του	 1407
-_έ	 1405
-_στ	 1396
-ώ	 1364
-πε	 1359
-τε	 1300
-μα	 1298
-β	 1274
-ρι	 1252
-ό_	 1241
-_δ	 1231
-ξ	 1223
-ντ	 1220
-_το_	 1196
-απ	 1187
-ρο	 1184
-_γ	 1183
-_τη	 1177
-ζ	 1158
-_εί	 1150
-ά_	 1150
-_να	 1124
-έν	 1115
-και	 1110
-_και	 1093
-αν_	 1082
-ρα	 1078
-και_	 1061
-_να_	 1060
-_και_	 1053
-μπ	 1049
-νο	 1048
-ατ	 1036
-ιο	 1024
-ια_	 1018
-ερ	 1003
-ού	 993
-_απ	 984
-σε_	 974
-ικ	 973
-_ο	 967
-εν	 947
-ος	 936
-ει_	 935
-πό	 901
-λο	 892
-_με	 890
-νε	 884
-του_	 871
-ον_	 869
-ας	 865
-_του_	 854
-ασ	 841
-με_	 840
-σα	 834
-κο	 833
-αρ	 832
-πρ	 824
-ίν	 820
-κά	 808
-_πο	 804
-πι	 796
-Κ	 796
-μέ	 783
-μο	 777
-έρ	 772
-αλ	 766
-ην	 762
-Μ	 759
-ισ	 745
-κε	 742
-τα_	 740
-στο	 738
-ω_	 730
-ην_	 728
-Ο	 717
-Τ	 714
-_φ	 711
-ετ	 705
-δε	 704
-πα	 697
-ας_	 688
-τά	 684
-ος_	 683
-_ό	 680
-_Κ	 675
-οι	 671
-_χ	 670
-την	 663
-την_	 658
-_στο	 647
-ή_	 645
-πό_	 638
-_θ	 633
-_ο_	 631
-",	 630
-_πρ	 626
-_Μ	 624
-ίπ	 624
-άν	 623
-",_	 623
-από	 620
-που	 619
-ότ	 618
-λα	 617
-τον	 617
-_από	 616
-μι	 612
-Ο_	 611
-ρε	 607
-υτ	 604
-λε	 595
-_λ	 594
-ρό	 590
-_με_	 586
-ιά	 580
-τον_	 577
-γι	 577
-_Ο	 575
-από_	 572
-άρ	 570
-πά	 570
-_από_	 569
-ρά	 562
-ταν	 554
-ένα	 553
-υν	 552
-που_	 551
-δι	 547
-τρ	 547
-τό	 544
-_β	 540
-χε	 536
-εν_	 534
-ησ	 528
-_Ο_	 525
-ης	 520
-".	 519
-_που	 516
-_Τ	 515
-"._	 513
-τη_	 512
-ς.	 510
-είπ	 508
-ταν_	 504
-_είπ	 503
-ς._	 501
-_τα	 500
-ξε	 497
-στο_	 496
-λλ	 493
-ακ	 492
-Α	 491
-_που_	 490
-άλ	 489
-ίπε	 489
-είπε	 485
-_είπε	 483
-_την	 483
-τι_	 482
-_την_	 481
-άτ	 480
-λι	 480
-_δε	 479
-άμ	 477
-_στο_	 475
-σο	 473
-_ά	 468
-"_	 463
-μέν	 463
-ιν	 461
-ις	 452
-_αν	 452
-κό	 451
-αυ	 451
-_τον	 450
-_γι	 449
-θα	 447
-ες	 446
-ση	 446
-_μι	 445
-_τον_	 443
-ε.	 441
-ε._	 441
-ους	 439
-λά	 439
-υς	 439
-ολ	 438
-πιο	 437
-ορ	 432
-_πα	 428
-_κά	 427
-τε_	 427
-αμ	 423
-;	 423
-_μο	 422
-σκ	 421
-της	 421
-_ξ	 418
-στη	 415
-Κά	 411
-νη	 408
-για	 405
-α.	 403
-κρ	 402
-κι	 402
-ς,	 402
-ς,_	 401
-α._	 398
-ηκ	 397
-_Κά	 397
-ελ	 396
-_έν	 395
-_ή	 393
-_μα	 392
-ία	 391
-ως	 391
-λη	 390
-ίνα	 389
-πί	 389
-μου	 388
-μά	 388
-_αυ	 387
-ης_	 386
-συ	 384
-ναι	 384
-Π	 383
-αυτ	 382
-ί_	 376
-μπι	 375
-ίσ	 372
-_της	 370
-_τα_	 367
-_για	 365
-_ένα	 362
-_μπ	 361
-θε	 361
-ιον	 359
-ις_	 358
-τή	 358
-_θα	 354
-_αυτ	 354
-άμπ	 352
-κ.	 352
-κ._	 351
-είν	 351
-ομ	 350
-ίναι	 348
-ντα	 348
-ναι_	 348
-ως_	 347
-χα	 346
-Ε	 346
-υ.	 346
-για_	 346
-υ._	 345
-δεν	 345
-ένα_	 345
-α,	 344
-α,_	 344
-δεν_	 344
-ύρ	 343
-όν	 343
-α-	 342
-ύσ	 341
-_κ.	 340
-στε	 339
-Κάμ	 339
-_κ._	 339
-τέ	 339
-α-_	 338
-ευ	 338
-ιλ	 338
-ρί	 338
-Κάμπ	 338
-_μου	 338
-_Κάμ	 338
-_Κάμπ	 337
-υμ	 336
-σει	 336
-πιον	 336
-μπιον	 336
-μπιο	 336
-_κο	 334
-Κάμπι	 334
-_η	 334
-άμπι	 334
-θα_	 333
-νι	 332
-της_	 331
-ψ	 331
-όμ	 330
-ησε	 330
-_σα	 329
-μα_	 328
-ός	 328
-Σ	 326
-_δεν	 325
-_δεν_	 325
-σμ	 324
-ες_	 324
-περ	 324
-ίχ	 323
-ίναι_	 323
-τικ	 322
-_ρ	 321
-άμπιο	 321
-υς_	 321
-ους_	 321
-_πε	 321
-σω	 320
-_για_	 320
-προ	 320
-γε	 318
-;"	 316
-;"_	 316
-Δ	 315
-τυ	 314
-ρα_	 313
-_συ	 312
-ρω	 312
-_θα_	 310
-όσ	 309
-ου.	 309
diff --git a/libtextcat/data/new_fingerprints/lm/hebrew.lm b/libtextcat/data/new_fingerprints/lm/hebrew.lm
deleted file mode 100644
index 31b4ee0..0000000
--- a/libtextcat/data/new_fingerprints/lm/hebrew.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 81560
-י	 23072
-ו	 19215
-ה	 15606
-ל	 12612
-ר	 11293
-ת	 11070
-מ	 10090
-ב	 9648
-א	 9601
-ש	 9081
-ה_	 7811
-נ	 6685
-ע	 6326
-_ת	 5878
-ם	 5542
-ד	 5019
-ח	 4669
-_ם	 4570
-ב_	 4267
-כ	 3984
-_ה	 3812
-ק	 3769
-פ	 3699
-ל_	 3693
-םי	 3535
-מ_	 3489
-ס	 3374
-א_	 3362
-תו	 3130
-,	 3067
-_ל	 3037
-_,	 3035
-_י	 2936
-ש_	 2886
-_םי	 2840
-ג	 2768
-ט	 2626
-ן	 2424
-_ר	 2395
-_תו	 2291
-.	 2256
-צ	 2215
-_.	 2205
-ינ	 2144
-ע_	 2003
-_ן	 1959
-_ו	 1913
-"	 1815
-יב	 1797
-לש	 1742
-יל	 1687
-יר	 1665
-י_	 1647
-וי	 1620
-ו_	 1578
-ור	 1525
-תא	 1475
-כ_	 1469
-רו	 1411
-ז	 1383
-ונ	 1353
-מה	 1351
-תי	 1343
-יי	 1343
-לו	 1315
-יד	 1285
-רי	 1236
-מה_	 1211
-הל	 1206
-ומ	 1192
-ני	 1163
-רש	 1155
-יא	 1146
-אר	 1138
-_תא	 1137
-שי	 1134
-יש	 1087
-נ_	 1080
-לא	 1074
-וח	 1067
-_א	 1062
-שמ	 1059
-ימ	 1052
-הי	 1047
--	 1024
-לש_	 1008
-וה	 973
-רב	 967
-וא	 954
-תא_	 951
-ול	 948
-_ד	 941
-יה	 896
-נו	 888
-וע	 883
-יכ	 873
-וש	 871
-לע	 867
-אל	 850
-עו	 843
-_-	 830
-ח_	 830
-דו	 824
-ןו	 820
-ר_	 806
-וב	 805
-_לש	 799
-יט	 784
-אה	 773
-_לש_	 748
-יע	 746
-די	 743
-_ש	 726
-_תא_	 723
-ך	 720
-_תי	 719
--_	 716
-_-_	 713
-בי	 709
-בו	 706
-ות	 699
-אה_	 690
-רמ	 686
-שה	 683
-וד	 678
-יח	 675
-פ_	 672
-הנ	 669
-_ב	 668
-_ע	 659
-_ך	 655
-יס	 652
-ןי	 649
-_לע	 640
-יו	 635
-אמ	 635
-יב_	 632
-ת_	 631
-מא	 628
-שו	 627
-_ןו	 624
-לי	 624
-לע_	 621
-תה	 619
-ית	 600
-הל_	 599
-וכ	 599
-יפ	 596
-פה	 595
-וק	 586
-הש	 578
-עי	 575
-_ןי	 569
-מו	 564
-_לע_	 561
-קי	 560
-יג	 557
-יה_	 557
-רשי	 554
-םו	 548
-אל_	 548
-תוי	 548
-לאר	 546
-רא	 542
-הר	 540
-"_	 540
-מב	 539
-שה_	 538
-ופ	 538
-ארש	 535
-רע	 534
-חה	 533
-וג	 532
-ארשי	 530
-לארשי	 530
-לארש	 530
-או	 527
-מי	 525
-_יכ	 518
-המ	 518
-פה_	 511
-יכ_	 510
-_ינ	 509
-לכ	 506
-תמ	 502
-מב_	 500
-סו	 498
-חא	 497
-יק	 497
-וו	 494
-_ק	 485
-ג_	 481
-םיל	 477
-_הי	 477
-דמ	 472
-בה	 470
-,ה	 470
-_,ה	 470
-ק_	 469
-עב	 468
-_םו	 467
-הב	 467
-חה_	 466
-_יכ_	 463
-אב	 462
-רח	 462
-_אל	 461
-ץ	 455
-מל	 454
-יני	 454
-שא	 453
-רה	 453
-יצ	 452
-םיר	 451
-_הנ	 447
-טי	 443
-ד_	 441
-מע	 440
-םיי	 439
-וה_	 439
-'	 435
-אמ_	 430
-.ם	 429
-תנ	 429
-_.ם	 428
-רק	 427
-תר	 423
-וס	 417
-נש	 417
-_הל	 414
-סל	 413
-נת	 408
-ס_	 405
-סה	 400
-לפ	 400
-בש	 399
-,ם	 399
-_,ם	 399
-ממ	 397
-שי_	 396
-נב	 396
-עה	 394
-תה_	 393
-תונ	 393
-םינ	 389
-_רו	 385
-רמא	 384
-יא_	 384
-לב	 384
-תב	 381
-בר	 378
-בה_	 377
-טס	 374
-_ץ	 374
-עמ	 374
-חי	 373
-רפ	 373
-הו	 371
-חו	 370
-בל	 370
-_לא	 370
-קו	 367
-_הר	 366
-_םיר	 364
-חמ	 363
-ז_	 362
-_ח	 360
-נכ	 360
-_לו	 360
-כו	 359
-,ת	 358
-_,ת	 357
-מת	 356
-ינו	 353
-ורי	 353
-וא_	 349
-רד	 348
-תור	 348
-אי	 345
-ף	 345
-לשמ	 344
-כי	 340
-_םיל	 340
-וצ	 338
-תל	 338
-_םיי	 336
-רחא	 335
-_תוי	 335
-מא_	 332
-לח	 331
-_תר	 329
-_תונ	 325
-גי	 325
-עה_	 325
-:	 324
-פל	 324
-אב_	 324
-שר	 322
-רט	 321
-תש	 320
-צ_	 320
-מע_	 319
-וי_	 319
-_:	 319
-צמ	 316
-שממ	 315
-_ס	 315
-תינ	 315
-סמ	 315
-הד	 313
-רה_	 312
-וט	 312
-_ף	 310
-שאר	 309
-רשי_	 305
-ארשי_	 305
-.םי	 305
-_.םי	 304
-הת	 303
-יטס	 303
-_'	 303
-גה	 302
-שמ_	 302
-_םינ	 301
-לה	 298
-רג	 294
-חט	 293
-דע	 293
-םיד	 292
-אש	 292
-לשממ	 292
-םע	 292
-ידי	 290
-של	 289
-פו	 289
-דב	 289
-צו	 287
-_םע	 286
-,םי	 285
-_,םי	 285
-נמ	 284
-סי	 282
-שב	 282
-_רש	 281
-דר	 281
-_תור	 281
-קה	 280
-תוש	 278
-הש_	 276
-מל_	 276
-_אל_	 275
-והי	 274
-_לאר	 274
-פי	 274
-עב_	 271
-לא_	 271
-בא	 270
-חא_	 269
-חל	 268
-עפ	 267
-בע	 267
-.ה	 266
-_רי	 266
-_לארש	 266
-וני	 266
-_.ה	 265
-יטסל	 265
-טסל	 265
-ילא	 265
-תע	 264
-נה	 263
-קל	 262
-ניט	 260
-_.ת	 260
-.ת	 260
-פל_	 260
-הו_	 259
-סלפ	 258
-טסלפ	 258
-יטסלפ	 258
-ניטסל	 257
-ניטס	 257
-ומ_	 256
-סה_	 256
-מש	 255
-ירו	 255
-נש_	 254
-ומת	 254
-הה	 252
-בק	 251
-יש_	 251
-_ונ	 251
-ירב	 251
-_רב	 249
-_יד	 249
-_םיד	 249
-כה	 248
-גנ	 247
-_דו	 247
diff --git a/libtextcat/data/new_fingerprints/lm/hindi.lm b/libtextcat/data/new_fingerprints/lm/hindi.lm
deleted file mode 100644
index 3b4e158..0000000
--- a/libtextcat/data/new_fingerprints/lm/hindi.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 75620
-æ	 19109
-U	 16333
-ð	 11131
-¤	 11107
-·	 10241
-·¤	 7855
-Ú	 6993
-ÚU	 6598
-ç	 6322
-è	 6151
-Ù	 5887
-_·	 5800
-ã	 5370
-â	 5168
-U_	 5118
-æ_	 4935
-Ì	 4508
-×	 4467
-Ø	 4292
-ð_	 3962
-_·¤	 3937
-è_	 3904
-Â	 3718
-¤_	 3609
-Ü	 3563
-ãU	 3514
-_ç	 3394
-´	 3363
-ß	 2962
-¥	 2907
-ÚU_	 2851
-_¥	 2668
-_ã	 2632
-_â	 2575
-ô	 2527
-Î	 2513
-´_	 2512
-Á	 2451
-Uæ	 2336
-Õ	 2314
-_Â	 2280
-_×	 2260
-ñ	 2187
-¢	 2082
-»	 2078
-¤æ	 1988
-ð´	 1913
-·¤æ	 1886
-·ð	 1881
-ð¤	 1877
-·ð¤	 1860
-Ð	 1842
-Ð_	 1830
-·¤_	 1746
-é	 1714
-æð	 1703
-ð¤_	 1695
-·ð¤_	 1694
-æÚ	 1631
-ü	 1610
-_·ð	 1579
-_·ð¤	 1567
-ð´_	 1556
-æÚU	 1536
-Øæ	 1528
-Ùð	 1525
-Uè	 1515
-_·ð¤_	 1488
-Ù_	 1411
-Ùð_	 1407
-à	 1390
-_ãñ	 1357
-ãñ	 1357
-Å	 1337
-Ì_	 1319
-_Õ	 1315
-×ð	 1300
-ç·	 1279
-Ö	 1270
-_Á	 1258
-_·¤æ	 1209
-ç·¤	 1203
-¤è	 1195
-_Ù	 1187
-°	 1181
-§	 1166
-×ð´	 1163
-àæ	 1162
-ý	 1157
-¿	 1155
-_×ð	 1150
-×ð´_	 1140
-·¤è	 1127
-¤è_	 1092
-_×ð´	 1086
-_×ð´_	 1077
-ñU	 1075
-_ãU	 1071
-·¤è_	 1065
-ãñU	 1062
-_ãñU	 1062
-æÙ	 1053
-¥æ	 1052
-Ìæ	 1038
-¤Ú	 1035
-_ç·	 1009
-¤ÚU	 972
-âð	 970
-_ç·¤	 967
-_·¤è	 959
-ÚUæ	 936
-ãUæ	 930
-_·¤è_	 929
-·¤Ú	 928
-Í	 926
-_¥æ	 904
-ÅU	 904
-Ç	 904
-©	 890
-ê	 887
-©U	 885
-·¤ÚU	 866
-_©	 865
-_©U	 862
-_Ö	 854
-âð_	 850
-_Ú	 847
-_Ì	 837
-S	 834
-UÐ	 831
-_Î	 830
-UÐ_	 823
-_ß	 798
-Ùæ	 788
-â_	 783
-_ÚU	 773
-Uè_	 770
-ô´	 753
-æØ	 752
-Ï	 749
-Øæ_	 732
-×æ	 732
-ô_	 704
-_§	 704
-Áæ	 704
-_âð	 697
-Âý	 695
-ãUè	 693
-¤æ_	 690
-ü_	 688
-æÚU_	 685
-,	 684
-_»	 682
-·¤æ_	 679
-,_	 674
-_·¤Ú	 670
-¹	 665
-ðU	 664
-ßæ	 648
-_Âý	 647
-UÌ	 644
-Ü_	 643
-_Ü	 641
-ç·¤_	 639
-Ø_	 639
-Üæ	 633
-_âð_	 633
-æç	 623
-Uô	 621
-ô´_	 615
-_·¤ÚU	 611
-Uæ_	 599
-ãU_	 595
-Üð	 594
-UÙ	 589
-ñUÐ	 580
-_ãñUÐ	 580
-ãñUÐ	 580
-_°	 576
-_Áæ	 573
-ñUÐ_	 572
-ãñUÐ_	 572
-æÜ	 569
-_Ø	 569
-_Ùð	 569
-ÂÚ	 561
-_ç·¤_	 557
-	 556
-¤ô	 552
-ææ	 550
-ÂÚU	 549
-çß	 544
-Õæ	 538
-_·¤æ_	 535
-×_	 532
-çÜ	 525
-âæ	 523
-·¤ô	 519
-æð_	 502
-æ¢	 501
-¸	 498
-_Ùð_	 495
-	 494
-_ÂÚ	 493
-Âæ	 493
-Ìæ_	 490
-_ÂÚU	 485
-çÙ	 484
-õ	 481
-È	 478
-æ	 469
-.	 459
-ÂÚU_	 458
-Öæ	 449
-Øð	 449
-_çß	 445
-§â	 444
-¤ÚU_	 443
-Öè	 442
-_§â	 440
-_ÂÚU_	 439
-æð´	 437
-Ùæ_	 435
-	 434
-_¿	 433
-ÚUè	 431
-â¢	 431
-_·¤ô	 430
-Îð	 427
-æÌ	 425
-Î_	 420
-Öè_	 419
-¸U	 415
-	 412
-æ	 412
-§ü	 410
-´U	 405
-ÇU	 399
-»æ	 399
-·¤ÚU_	 394
-Uã	 394
-æÙ_	 393
-çÌ	 393
-¤ô_	 392
-·¤ô_	 392
-çÎ	 389
-ÚUÌ	 385
-æÁ	 385
-Ç¸	 383
-æð´_	 382
-Ìè	 381
-Íæ	 379
-çÚ	 375
-°_	 374
-ãUô	 374
-ÚUã	 374
-æÐ	 373
-æÐ_	 372
-_·¤ô_	 371
-_Õæ	 369
-æè	 364
-çÚU	 364
-ðU_	 362
-¤æð	 358
-È¤	 357
-Uæð	 354
-è´	 353
-â·	 352
-ß_	 350
-U·	 349
-¤æÚ	 346
-Ìð	 346
-·¤æð	 346
-æü	 345
-õÚ	 344
-õÚU	 342
-·¤æÚ	 342
-_×æ	 341
-_Öè	 341
-_çÜ	 340
-ñU_	 337
-_ãñU_	 337
-ÿ	 337
-ãñU_	 337
-Ùè	 336
-ãUè_	 334
-¿æ	 334
-ñ´	 334
-_Öè_	 332
-æ×	 327
-¤æÚU	 327
-ÿæ	 326
-_Í	 325
-U·¤	 323
-·¤æÚU	 323
-Uè´	 322
-ãUè´	 321
-_âæ	 320
-Ç¸U	 319
-_¥õ	 319
-¥õ	 319
-õÚU_	 319
-_ÚUã	 318
-Úð	 317
-è´_	 316
-_â¢	 316
-æ·	 313
-Øô	 310
-_ãUæ	 309
-Øã	 309
-À	 308
-ØãU	 308
-_Øã	 308
-_ØãU	 307
-_·¤æð	 304
-_¥õÚ	 304
-¥õÚ	 304
-_¥õÚU	 304
-_Öæ	 304
-¥õÚU	 304
-¥õÚU_	 303
-_çÙ	 303
-ãUè´_	 300
-Uè´_	 300
-_S	 300
-Îæ	 300
-UÜ	 298
-ÚUè_	 296
-æÎ	 296
-æß	 294
-ÅU_	 294
-Øð_	 293
-Ùã	 292
-âè	 291
-_Ùã	 290
-æè_	 290
-ðà	 290
-Üð_	 289
-UãU	 288
-ÙãU	 288
-Uâ	 288
-_ÙãU	 286
-_à	 286
-_ÙãUè	 285
-_Âæ	 285
-ÙãUè	 285
-æ·¤	 284
-_àæ	 284
-ÙãUè´	 283
-UÌ_	 282
-ãñ´	 280
-_ãñ´	 280
-ñ´U	 280
-â×	 279
-_çÎ	 278
-_ãñ´U	 278
-ãñ´U	 278
-»_	 277
-_Îð	 275
-ðàæ	 274
-àæ_	 273
-æñ	 272
-·¤ã	 272
-¤ã	 272
-Ìð_	 272
-_ãUô	 272
-æ_	 272
--	 271
-¤ãU	 271
-·¤ãU	 271
-¢_	 271
-_·¤ã	 270
-ãUæ_	 270
-_·¤ãU	 269
-ÚUãU	 268
-ãé	 267
-æâ	 265
-°·	 263
-¤Ø	 263
-¤æð_	 262
-·¤æð_	 262
-°·¤	 262
-ÚðU	 258
-_°·	 258
-Ùè_	 258
-_°·¤	 257
-ÀU	 256
-v	 253
-ÂÙ	 252
-_ÚUæ	 252
-Üè	 249
-ç×	 247
-çâ	 246
-_Å	 246
-ÚUÙ	 246
-×é	 245
-._	 245
-UÚ	 244
-éU	 243
diff --git a/libtextcat/data/new_fingerprints/lm/hungarian.lm b/libtextcat/data/new_fingerprints/lm/hungarian.lm
deleted file mode 100644
index 307348b..0000000
--- a/libtextcat/data/new_fingerprints/lm/hungarian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 19186
-e	 5753
-a	 4627
-t	 4522
-s	 3480
-l	 3437
-n	 3137
-k	 3036
-i	 2527
-r	 2437
-z	 2399
-o	 2303
-á	 2039
-é	 1995
-g	 1978
-m	 1695
-y	 1338
-_a	 1256
-b	 1186
-d	 1148
-a_	 1108
-v	 1057
-t_	 901
-sz	 889
-el	 832
-,	 819
-,_	 818
-h	 792
-k_	 769
-.	 767
-et	 743
-gy	 711
-s_	 705
-_m	 702
-_a_	 695
-en	 671
-ö	 662
-n_	 646
-_k	 645
-j	 623
-._	 613
-i_	 606
-eg	 601
-p	 586
-_e	 580
-u	 579
-le	 576
-ó	 542
-er	 495
-f	 485
-ek	 477
-te	 477
-és	 473
-_s	 471
-al	 464
-ta	 458
-í	 453
-_h	 444
-_t	 442
-an	 426
-ze	 425
-me	 406
-at	 405
-l_	 401
-es	 395
-õ	 387
-y_	 381
-z_	 375
-tt	 374
-ke	 372
-_v	 369
-ás	 368
-ak	 367
-_é	 365
-ny	 363
-tá	 359
-c	 358
-re	 350
-to	 347
-A	 343
-e_	 340
-ü	 332
-ne	 330
-os	 326
-ál	 320
-_f	 320
-az	 317
-zt	 317
-ár	 317
-_n	 315
-ko	 312
-_A	 303
-_sz	 302
-is	 301
-ve	 299
-gy_	 297
-ít	 293
-_b	 293
-ra	 291
-or	 289
-ol	 284
-_i	 281
-em	 279
-_l	 274
-la	 264
-ez	 262
-be	 260
-lt	 260
-ok	 260
-ye	 256
-_me	 252
-on	 251
-en_	 247
-ar	 245
-_az	 245
-in	 243
-án	 242
-se	 242
-ég	 238
-egy	 237
-ha	 237
-r_	 237
-té	 237
-ér	 235
-sze	 233
-én	 226
-ly	 224
-g_	 221
-"	 221
-ll	 219
-iz	 214
-de	 214
-ek_	 213
-mi	 212
-rt	 211
-ba	 209
-ho	 209
-A_	 209
-és_	 209
-az_	 205
-va	 204
-ag	 203
-ka	 202
-na	 202
-og	 201
-ik	 201
-nt	 200
-_A_	 199
-ô	 199
--	 198
-tt_	 198
-_az_	 197
-ni	 195
-cs	 194
-ki	 190
-kö	 187
-át	 187
-_eg	 187
-nd	 186
-fe	 185
-_és	 185
-lá	 182
-bi	 181
-nk	 180
-_le	 179
-an_	 179
-_és_	 177
-tás	 175
-ké	 174
-meg	 173
-_egy	 172
-ma	 171
-as	 170
-sa	 170
-sí	 169
-ge	 167
-ot	 167
-za	 167
-E	 166
-m_	 165
-_meg	 165
-_el	 165
-bb	 164
-ro	 164
-zá	 163
-he	 162
-má	 161
-sé	 160
-_r	 160
-sít	 160
-tos	 159
-ti	 159
-st	 158
-_j	 158
-él	 157
-it	 156
-_ho	 156
-ül	 156
-_ha	 155
-vé	 154
-am	 152
-oz	 152
-ele	 151
-ya	 151
-zto	 150
-ú	 149
-biz	 147
-so	 147
-et_	 145
-izto	 144
-izt	 144
-ap	 141
-"_	 141
-ed	 141
-ss	 140
-bizt	 140
-ék	 140
-bizto	 140
-iztos	 139
-ét	 139
-ztos	 139
-osít	 138
-zet	 138
-osí	 138
-mé	 137
-_is	 137
-t,	 136
-tosít	 136
-tosí	 136
-t,_	 136
-ó_	 135
-agy	 135
-ztosí	 135
-li	 134
-om	 134
-_fe	 134
-ere	 133
-ág	 133
-t.	 132
-nek	 131
-vi	 129
-_d	 129
-zo	 128
-k,_	 128
-k,	 128
-_kö	 127
-_p	 127
-M	 126
-let	 126
-ak_	 125
-já	 125
-ett	 125
-û	 124
-si	 124
-ész	 123
-_E	 123
-ép	 123
-vá	 123
-rá	 123
-t._	 123
-is_	 123
-S	 123
-ítás	 122
-ítá	 122
-kor	 121
-ai	 121
-fel	 120
-da	 120
-_mi	 120
-pe	 119
-ogy	 118
-ban	 118
-ad	 117
-ga	 116
-_va	 116
-ott	 114
-_ne	 114
-_ki	 113
-ör	 113
-zé	 112
-ben	 112
-_te	 111
-zi	 111
-sá	 110
-ség	 109
-do	 109
-tó	 108
-em_	 108
-_"	 108
-_ta	 108
-_M	 107
-ogy_	 107
-_á	 107
-k.	 106
-ól	 105
-_ke	 105
-_g	 104
-:	 103
-gye	 102
-ák	 102
-hog	 102
-ri	 102
-mo	 101
-ok_	 101
-:_	 101
-hogy	 101
-il	 101
-el_	 100
-zer	 100
-ete	 99
-nn	 99
-nak	 98
-je	 98
-sítá	 98
-szá	 98
-yo	 98
-osítá	 98
-sítás	 98
-_ké	 98
-_hog	 98
-lé	 97
-_S	 97
-_hogy	 97
-ig	 97
-_-	 96
-hogy_	 96
-ban_	 96
-ese	 95
-_bi	 94
-fo	 94
-ja	 94
-ul	 94
-õ_	 94
-k._	 94
-_c	 93
-ká	 91
-es_	 91
-ná	 91
-ény	 91
-gé	 91
-ás_	 91
-egy_	 90
-áb	 90
-rd	 89
-I	 89
-ány	 89
-_biz	 89
-_fel	 88
-öv	 88
-ala	 88
-szer	 88
-po	 88
-_ma	 88
-leg	 88
-tö	 88
-ket	 87
-un	 87
-di	 87
-ai_	 87
-nek_	 87
-rm	 86
-tal	 86
-év	 85
-_is_	 85
-nem	 85
-ti_	 84
-öz	 84
-szt	 84
-ut	 83
-ter	 83
-dé	 83
-kk	 83
-or_	 83
-b_	 82
-né	 82
-os_	 82
-re_	 82
-rs	 82
-_bizt	 82
-min	 82
-ben_	 81
-ra_	 81
-ik_	 81
-go	 80
-len	 80
-lm	 80
-öt	 80
-ely	 80
-aj	 80
-öl	 80
-_sze	 80
-_be	 79
-ev	 79
-ré	 79
-ssz	 79
-nt_	 79
-gya	 79
-K	 79
-si_	 79
-sza	 78
diff --git a/libtextcat/data/new_fingerprints/lm/icelandic.lm b/libtextcat/data/new_fingerprints/lm/icelandic.lm
deleted file mode 100644
index b1fe0f2..0000000
--- a/libtextcat/data/new_fingerprints/lm/icelandic.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 26104
-a	 6496
-r	 6044
-n	 5160
-i	 5123
-s	 3987
-e	 3891
-u	 3582
-t	 3300
-�	 3126
-l	 3071
-g	 2726
-m	 2459
-k	 2256
-f	 2230
-r_	 1967
-v	 1641
-ar	 1472
-�_	 1420
-_s	 1332
-�	 1248
-o	 1221
-�	 1197
-a_	 1155
-in	 1150
-i_	 1114
-h	 1023
-j	 975
-d	 974
-st	 929
-a�	 925
-.	 922
-n_	 875
-._	 875
-_v	 874
-m_	 854
-nn	 842
-_f	 840
-ur	 824
-_a	 806
-�	 785
-_h	 782
-�	 779
-i�	 771
-er	 765
-um	 727
-g_	 716
-y	 711
-_e	 709
-�	 672
-b	 672
-ir	 671
-ri	 670
-an	 667
-�	 650
-_�	 648
-a�_	 645
-u_	 633
-na	 631
-�_	 625
-ar_	 622
-_�	 608
-�_	 606
-_�	 595
-ta	 567
-ei	 566
-la	 558
-_m	 549
-_�_	 549
-um_	 547
-t_	 535
-ti	 529
-_o	 524
-ur_	 523
-_a�	 519
-i�_	 512
-�i	 496
-ve	 494
-og	 494
-�	 482
-og_	 479
-_og	 478
-_og_	 478
-nd	 469
-p	 464
-ra	 455
-un	 454
-ir_	 452
-_a�_	 451
-ni	 439
-en	 439
-�u	 439
-_�_	 436
-ng	 434
-il	 404
-ga	 395
-_t	 395
-nu	 393
-ki	 392
-ja	 383
-inn	 379
-_b	 375
-sk	 352
-s_	 350
-vi	 349
-r�	 347
-�a	 345
-ef	 339
-ag	 336
-_u	 330
-se	 324
-lu	 324
-af	 321
-_ve	 320
-tu	 318
-em	 307
-eg	 304
-nn_	 303
-_l	 303
-va	 301
-_k	 296
-,	 295
-ns	 292
-re	 292
-tt	 291
-,_	 291
-l_	 286
-am	 286
-es	 285
-yr	 285
-al	 281
-da	 277
-S	 275
-gu	 273
-_se	 271
-ver	 268
-_g	 266
-ing	 266
-_n	 262
-is	 258
-_er	 257
-sa	 256
-�ur	 255
-le	 255
-_st	 255
-_S	 254
-sem	 254
-ll	 254
-me	 253
-ha	 251
-li	 249
-kk	 249
-rs	 247
-_vi	 247
-rn	 246
-sl	 244
-gi	 243
-ss	 242
-rf	 241
-fy	 240
-�i_	 240
-mi	 238
-ka	 237
-ma	 231
-ld	 230
-�	 229
-rir	 227
-sta	 227
-fyr	 227
-v�	 227
-di	 226
-ru	 224
-var	 224
-_fy	 222
-ku	 221
-em_	 221
-nar	 220
-_sem_	 220
-_sem	 220
-sem_	 220
-he	 219
-yri	 217
-_fyr	 216
-si	 216
-yrir	 215
-au	 212
-er_	 212
-ek	 211
-_ha	 210
-�e	 209
-fyri	 207
-fyrir	 207
-_�e	 205
-fi	 204
-fr	 203
-ge	 201
-or	 200
-ne	 200
-ann	 198
-j�	 198
-_va	 196
-_fyri	 196
-_ver	 194
-fl	 192
-_er_	 191
-_um	 189
-�k	 188
-til	 187
-_he	 186
-fa	 186
-il_	 182
-_ti	 178
-_til	 177
-gar	 176
-_var	 176
-na_	 176
-�	 175
-e�	 171
-fu	 170
-nni	 169
-_me	 168
-ki_	 167
-vi�	 166
-ey	 165
-fn	 165
-arf	 164
-til_	 163
-st_	 162
-_til_	 162
-�a	 161
-num	 161
-_�a	 161
-as	 160
-_vi�	 160
-rt	 159
-el	 158
-u�	 156
-inn_	 155
-_um_	 154
-ra_	 153
-b�	 153
-tar	 151
-ta_	 151
-er�	 151
-�r	 148
-and	 148
-_sa	 146
-ig	 146
-_en	 146
-nga	 145
-rir_	 145
-us	 144
-jar	 143
-et	 143
-�r	 142
-_sk	 140
-ndi	 140
-��	 139
-var_	 139
-_r	 138
-av	 138
-�k	 137
-nna	 137
-�ur_	 136
-�l	 136
-ko	 135
-nin	 135
-vi�_	 135
-�l	 135
-ins	 134
-ik	 133
-E	 133
-K	 133
-yrir_	 133
-ns_	 133
-on	 133
-ein	 132
-_vi�_	 132
-�g	 132
-j�	 132
-�	 132
-�l	 132
-�s	 132
-_mi	 131
-f_	 131
-s�	 131
-sj	 131
-stu	 131
-nda	 130
-_var_	 130
-gr	 129
-�s	 128
-t�	 127
-ri_	 126
-haf	 126
-_s�	 125
-v�k	 124
-rin	 124
-te	 124
-r.	 124
-r._	 123
-H	 123
-nes	 123
-�t	 123
-ru_	 123
-kr	 122
-F	 122
-�r	 121
-num_	 121
-k_	 121
-a.	 121
-_H	 121
-_fr	 120
-_ge	 120
-r�	 120
-_E	 120
-_�	 120
-ug	 120
-ngu	 119
-an_	 119
-inga	 118
-_K	 118
-_haf	 118
-enn	 117
-ars	 117
-ri�	 117
-en_	 117
-sin	 116
-kur	 116
-it	 116
-�a_	 116
-ti_	 115
-r�i	 114
-tj	 114
-ni_	 114
-at	 114
-tarf	 114
-br	 113
-slu	 113
-kki	 113
-rg	 113
-m�	 113
-kv	 113
-_en_	 113
-a._	 112
-gar_	 112
-du	 112
-ju	 110
-ei�	 110
-und	 110
-lag	 110
-tur	 110
-ega	 109
-h�	 109
-��	 109
-gn	 109
-hef	 109
-kj	 109
-_hef	 109
-_sta	 108
-B	 108
-V	 108
-sam	 107
-_ei	 106
-_B	 106
-ft	 106
-ga_	 106
-G	 106
-_G	 105
-l�	 105
-kki_	 105
-star	 104
-in_	 104
-R	 104
-me�	 104
-_�r	 103
-_me�	 103
-ekk	 103
-inu	 103
-t�	 103
-_V	 103
-m.	 103
-a�i	 103
-j�	 102
-�j	 102
-_b�	 102
-ess	 102
-h�s	 101
-ut	 101
-gs	 101
-av�	 101
-mu	 101
-_R	 101
-_�	 101
-rst	 100
-�jar	 100
-leg	 100
-�ja	 100
-ja_	 99
-av�k	 99
diff --git a/libtextcat/data/new_fingerprints/lm/indonesian.lm b/libtextcat/data/new_fingerprints/lm/indonesian.lm
deleted file mode 100644
index 3fa5a09..0000000
--- a/libtextcat/data/new_fingerprints/lm/indonesian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 19406
-a	 10666
-n	 5455
-e	 4535
-i	 4387
-r	 2936
-t	 2902
-an	 2853
-u	 2841
-k	 2761
-s	 2311
-m	 2178
-d	 2134
-g	 2105
-l	 1780
-a_	 1506
-n_	 1476
-ng	 1449
-p	 1397
-b	 1275
-an_	 1270
-o	 1246
-h	 1130
-i_	 1108
-er	 1038
-ka	 1032
-_d	 1006
-y	 997
-,	 951
-en	 941
-ar	 914
-,_	 900
-_m	 880
-ya	 842
-ta	 838
-ang	 797
-di	 787
-da	 773
-.	 754
-la	 742
-._	 738
-me	 732
-ak	 728
-_s	 718
-at	 690
-ra	 688
-ga	 683
-_k	 671
-_me	 650
-in	 628
-ah	 601
-_t	 583
-_p	 570
-g_	 551
-_b	 551
-_di	 548
-ng_	 544
-ma	 536
-se	 526
-tu	 511
-na	 506
-al	 500
-ri	 490
-as	 483
-k_	 482
-j	 480
-si	 470
-ny	 467
-h_	 457
-sa	 452
-ang_	 439
-it	 424
-kan	 423
-ti	 418
-_se	 417
-pe	 412
-S	 409
-ba	 407
-ke	 407
-em	 405
-men	 405
-be	 403
-un	 401
-te	 401
-am	 396
-pa	 395
-nya	 390
-_men	 374
-el	 374
-t_	 371
-_a	 360
-_i	 356
-u_	 355
-kan_	 345
-_ke	 339
-is	 335
-ah_	 324
-_S	 324
-eng	 321
-nga	 320
-ia	 318
-_pe	 316
-ha	 313
-ap	 311
-r_	 308
-w	 305
-li	 301
-_da	 300
-s_	 299
-P	 296
-nd	 290
-_be	 287
-ik	 283
-ja	 281
-yan	 281
-ad	 275
-ek	 273
-uk	 272
-di_	 270
-bu	 269
-ya_	 268
-yang	 268
-ak_	 266
-ber	 265
-_y	 265
-_ya	 264
-_P	 263
-ru	 260
-K	 259
-yang_	 256
-_yang	 256
-_yan	 256
-nt	 255
-de	 253
-_te	 250
-wa	 249
-et	 247
-at_	 246
-ara	 245
-gan	 243
-A	 237
-ari	 235
-ala	 230
-itu	 229
-c	 225
-ol	 225
-ni	 225
-us	 225
-dan	 224
-_K	 224
-M	 224
-B	 223
-ata	 222
-ai	 221
-ur	 219
-nya_	 217
-ua	 215
-_ka	 214
-_ber	 210
-eb	 209
-ran	 206
-D	 206
-ela	 206
-_di_	 205
-_l	 204
-ngan	 204
-ter	 203
-re	 201
--	 199
-aka	 198
-l_	 194
-_A	 191
-era	 191
-a,	 191
-e_	 190
-ir	 187
-I	 186
-tan	 185
-_B	 184
-ut	 184
-ku	 183
-a,_	 183
-il	 182
-J	 181
-um	 180
-_it	 180
-_itu	 180
-_ta	 179
-su	 179
-dan_	 177
-es	 177
-on	 177
-or	 177
-_dan	 176
-lu	 174
-_M	 172
-tu_	 172
-_dan_	 172
-enga	 171
-mb	 169
-R	 169
-si_	 168
-per	 168
-gan_	 168
-ngan_	 165
-"	 162
-_ter	 162
-a.	 161
-man	 161
-gk	 160
-a._	 160
-asi	 160
-ngk	 160
-ep	 160
-ag	 159
-ul	 158
-da_	 157
-m_	 155
-du	 155
-ada	 153
-ki	 153
-rt	 150
-mp	 150
-T	 150
-ama	 148
-ing	 148
-na_	 147
-_J	 147
-_D	 145
-ung	 145
-ana	 145
-n,	 144
-ju	 144
-ud	 144
-rin	 143
-gi	 143
-aw	 141
-lah	 138
-lan	 138
-_sa	 136
-ri_	 136
-meng	 136
-_meng	 135
-_ma	 134
-n,_	 134
-awa	 134
-st	 134
-eka	 133
-mi	 133
-mu	 132
-_T	 132
-po	 131
-ge	 131
-ar_	 130
-id	 129
-ko	 129
-le	 128
-_h	 128
-ena	 127
-_j	 126
-emb	 126
-ina	 125
-_r	 124
-itu_	 124
-ay	 123
-ngg	 123
-gg	 123
-rang	 123
-pi	 120
-nan	 120
-_ba	 119
-_la	 119
-apa	 119
-_I	 118
-p_	 118
-bi	 117
-ai_	 117
-ta_	 116
-san	 116
-Ke	 116
-ro	 115
-eri	 114
-kar	 113
-lah_	 113
-_itu_	 112
-aya	 111
-i,	 110
-an,	 110
-ra_	 110
-_per	 110
-im	 110
-ika	 109
-isi	 109
-mem	 109
-tah	 108
-_Ke	 108
-ian	 108
-_mem	 108
-akan	 108
-Se	 108
-to	 107
-ab	 107
-ngka	 106
-rs	 106
-gka	 106
-uk_	 105
-seb	 104
-_de	 104
-pu	 104
-i,_	 104
-ita	 104
-nda	 103
-_ti	 103
-ni_	 103
-ca	 103
-_Se	 103
-ers	 103
-pen	 103
-ini	 102
-an,_	 102
-angk	 101
-uh	 101
-han	 101
-nta	 100
-_in	 99
-f	 99
-nj	 99
-ok	 99
-aga	 99
-_R	 98
-as_	 98
-tr	 98
-mer	 97
-lam	 97
-and	 97
-end	 96
-anga	 96
-ne	 96
-Sa	 96
-ka_	 96
-arin	 95
-gu	 95
-_ha	 94
-Z	 94
-al_	 94
-ga_	 94
-_Z	 93
-_pen	 93
-dar	 93
-Ad	 93
-i._	 93
-ada_	 93
-atan	 93
-tak	 93
-i.	 93
-ia_	 92
-asa	 92
-ap_	 92
-ari_	 92
-kat	 92
-_seb	 92
-_Za	 91
-Za	 91
-den	 91
-n.	 90
-_u	 90
-_Ad	 90
-engan	 89
-ib	 89
-any	 89
-n._	 89
-o_	 89
-Zar	 88
-Zari	 88
-rina	 88
-_Zar	 88
-_Zari	 88
-Zarin	 88
-arina	 88
-ks	 88
-angka	 87
-oli	 87
-eg	 87
-kt	 86
-_Sa	 86
-hu	 85
-ih	 85
-us_	 85
-adi	 85
-om	 85
-eba	 85
-anya	 85
-_bu	 84
-denga	 83
-L	 83
-ed	 83
-dak	 83
-deng	 83
-ma_	 82
-asi_	 82
diff --git a/libtextcat/data/new_fingerprints/lm/irish_gaelic.lm b/libtextcat/data/new_fingerprints/lm/irish_gaelic.lm
deleted file mode 100644
index b687486..0000000
--- a/libtextcat/data/new_fingerprints/lm/irish_gaelic.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 8010
-a	 2622
-i	 1573
-h	 1334
-n	 1247
-r	 968
-_a	 847
-e	 830
-s	 817
-t	 747
-l	 639
-c	 636
-g	 598
-o	 590
-d	 554
-n_	 501
-a_	 487
-m	 432
-an	 415
-u	 413
-b	 379
-h_	 352
-ai	 350
-ch	 350
-ea	 346
-r_	 346
-í	 334
-é	 321
-_s	 309
-á	 306
-in	 281
-ar	 277
-.	 269
-_d	 266
-s_	 254
-ir	 253
-_b	 250
-f	 250
-an_	 246
-,	 241
-,_	 226
-ag	 225
-_an	 221
-bh	 218
-_c	 216
-._	 212
-ac	 210
-ha	 208
-_a_	 201
-"	 199
-_m	 199
-th	 198
-_t	 190
-ach	 182
-_ag	 180
-_an_	 179
-í_	 176
-_l	 168
-na	 168
-nn	 160
-e_	 159
-ar_	 158
-_g	 157
-ú	 156
-_i	 152
-il	 150
-le	 150
-is	 143
-ó	 142
-_bh	 138
-ei	 138
-g_	 135
-_f	 135
-dh	 135
-l_	 126
-t_	 125
-ig	 123
-é_	 122
-_n	 120
-gu	 120
-á_	 120
-mh	 118
-id	 117
-ch_	 117
-ad	 116
-he	 114
-ir_	 114
-ra	 109
-o_	 109
-ach_	 107
-ia	 105
-_ar	 105
-us	 104
-ui	 104
-_"	 101
-us_	 100
-T	 99
-am	 99
-ta	 98
-gus	 98
-gus_	 98
-_le	 97
-gh	 97
-_ch	 97
-agus	 94
-agus_	 94
-agu	 94
-éa	 93
-_agus	 93
-_agu	 93
-ean	 93
-na_	 92
-d_	 92
-ái	 91
-p	 89
-it	 89
-A	 89
-_ar_	 88
-rt	 86
-al	 85
-oi	 84
-sa	 84
-"_	 82
-hai	 81
-_r	 79
-nn_	 79
-hu	 79
-as	 79
-éi	 78
-_T	 78
-ma	 77
-air	 77
-at	 77
-ann	 76
-B	 76
-sé	 76
-hí	 75
-igh	 74
-st	 74
-ga	 73
-go	 71
-ua	 71
-ne	 71
-la	 71
--	 71
-de	 71
-te	 71
-re	 70
-inn	 70
-ith	 69
-eac	 69
-_sé	 69
-in_	 68
-_go	 68
-hi	 68
-each	 68
-dh_	 68
-si	 67
-ag_	 67
-_go_	 66
-hea	 66
-go_	 66
-tha	 64
-om	 64
-_sé_	 63
-sé_	 63
-hí_	 63
-on	 62
-se	 61
-úi	 60
-nt	 60
-C	 60
-D	 59
-i_	 58
-_ag_	 58
-is_	 58
-ío	 58
-_de	 57
-_B	 56
-il_	 56
-or	 56
-_th	 54
-ca	 53
-fa	 53
-amh	 53
-_A	 53
-le_	 52
-?	 52
-S	 51
-io	 51
-_in	 51
-sí	 51
-li	 51
-rai	 50
-hf	 50
-ht	 50
-eo	 50
-sc	 50
-ri	 49
-:	 49
-igh_	 49
-gh_	 49
-_sí	 49
-:_	 49
-há	 49
-_D	 49
-be	 49
-aig	 49
-hé	 48
-oc	 48
-idh	 48
-rt_	 48
-ho	 47
-os	 47
-ann_	 47
-_C	 46
-!	 46
-Bh	 46
-bhf	 45
-_si	 45
-lt	 45
-_bhf	 45
-irt	 45
-ear	 44
-_na	 44
-ta_	 44
-air_	 44
-_p	 44
-im	 44
-aga	 44
-_ma	 44
-_S	 44
-aigh	 43
-án	 43
-_dh	 43
-uai	 43
-ao	 43
-cht	 43
-ain	 42
-bhe	 42
-ait	 42
-fh	 42
-sa_	 41
-m_	 41
-adh	 41
-ile	 41
-_é	 41
-ail	 41
-eir	 41
-ói	 41
-_Bh	 40
-as_	 40
-cha	 40
-idh_	 40
-hái	 39
-_i_	 39
-bh_	 39
-th_	 39
-ad_	 39
-och	 39
-mh_	 39
-tr	 39
-rea	 38
-_se	 38
-ro	 38
-rí	 38
-hair	 38
-_is	 38
-uil	 37
-iú	 37
-áin	 37
-I	 37
-ll	 37
-mé	 37
-_be	 36
-ba	 36
-eann	 36
-tá	 36
-_o	 36
-M	 36
-aid	 36
-aith	 36
-ib	 36
-'	 36
-tea	 36
-_mé	 35
-chu	 35
-ibh	 35
-each_	 35
-ean_	 34
-irt_	 34
-_na_	 34
-N	 34
-ist	 34
-fu	 34
-mha	 34
-bea	 34
-h.	 34
-_bhe	 34
-lá	 34
-ic	 34
-_sí_	 33
-eis	 33
-bhí	 33
-ni	 33
-héa	 33
-_sa	 33
-ith_	 33
-sí_	 33
-har	 33
-_bhí	 33
-ig_	 32
-ur	 32
-aí	 32
-hr	 32
-_am	 32
-_bhí_	 31
-da	 31
-úir	 31
-hfu	 31
-_chu	 31
-ol	 31
-ne_	 31
-_fa	 31
-An	 31
-Bhí_	 31
-Bhí	 31
-n,	 31
-_ac	 31
-bhí_	 31
-_bhfu	 30
-_ó	 30
-ana	 30
-_M	 30
-mé_	 30
-_fh	 30
-aigh_	 30
-bhfu	 30
-_mé_	 30
-tú	 29
-_le_	 29
-tá_	 29
-hean	 29
-háin	 29
-sin	 29
-eir_	 29
-nne	 29
-cé	 29
-_aga	 29
-h._	 29
-Tá	 29
-ibh_	 29
-iste	 28
-An_	 28
-do	 28
-hui	 28
-fui	 28
-ní	 28
-ste	 28
-acht	 28
-n,_	 28
-co	 28
-dea	 28
-ng	 28
-nach	 28
-id_	 28
-hfui	 28
-..	 28
-lei	 28
-nac	 28
-ce	 27
-a.	 27
-c_	 27
-lea	 27
-hfuil	 27
-_Bhí_	 27
-_bea	 27
-adh_	 27
-di	 27
-fuil	 27
-."	 27
-Tá_	 27
-ha_	 27
-ú_	 27
-uil_	 27
-."_	 27
-bhfui	 27
-_Bhí	 27
-éan	 27
-_do	 27
-lta	 27
-aoi	 27
-_lei	 27
-_mh	 26
-dú	 26
-fuil_	 26
-eat	 26
--_	 26
-teac	 26
-ath	 26
diff --git a/libtextcat/data/new_fingerprints/lm/italian.lm b/libtextcat/data/new_fingerprints/lm/italian.lm
deleted file mode 100644
index 543cadc..0000000
--- a/libtextcat/data/new_fingerprints/lm/italian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 25028
-a	 7570
-e	 6477
-i	 5481
-o	 5104
-l	 3905
-n	 3866
-r	 3502
-t	 2934
-c	 2862
-s	 2862
-a_	 2504
-e_	 2404
-d	 2004
-i_	 1749
-o_	 1679
-u	 1650
-v	 1611
-p	 1561
-m	 1414
-_c	 1325
-,	 1192
-,_	 1192
-_s	 1190
-_d	 1094
-g	 1067
-an	 925
-er	 915
-_a	 914
-_p	 895
-la	 858
-_l	 830
-re	 799
-ar	 769
-h	 762
-no	 753
-co	 726
-va	 698
-_e	 657
-n_	 656
-on	 656
-ra	 653
-to	 651
-f	 638
-di	 638
-_i	 634
-ch	 634
-ll	 633
-l_	 624
-la_	 598
-ta	 593
-el	 576
-in	 567
-_m	 558
-en	 529
-b	 528
-ri	 525
-_co	 523
-_n	 523
-_di	 522
-li	 513
-av	 507
-al	 501
-le	 494
-ia	 492
-se	 484
-ol	 479
-_f	 477
-or	 477
-te	 469
-_e_	 467
-ve	 454
-at	 449
-de	 447
-.	 443
-ne	 429
-va_	 428
-ca	 426
-._	 422
-tt	 422
-re_	 415
-nt	 415
-io	 411
-_v	 407
-pe	 405
-z	 392
-to_	 391
-_ch	 389
-na	 384
-si	 384
-'	 383
-he	 382
-no_	 379
-ci	 374
-_la	 373
-ro	 371
-_g	 370
-st	 368
-cc	 366
-he_	 362
-di_	 362
-ma	 358
-ev	 354
-che	 354
-es	 352
-me	 352
-pa	 351
-_t	 349
-ti	 348
-_di_	 347
-ss	 345
-che_	 344
-a,_	 337
-a,	 337
-nd	 335
-o,	 333
-o,_	 333
-ell	 330
-gl	 323
-sa	 322
-il	 322
-gli	 321
-da	 318
-as	 318
-do	 314
-_che	 308
-_che_	 306
-eva	 306
-_la_	 300
-lla	 298
-le_	 293
-un	 291
-_pe	 290
-_de	 288
-q	 283
-qu	 283
-ava	 280
-po	 277
-on_	 275
-r_	 273
-li_	 273
-_b	 269
-_il	 268
-_il_	 268
-il_	 268
-lo	 267
-om	 263
-e,	 263
-e,_	 263
-ni	 258
-tr	 258
-so	 255
-ra_	 253
-os	 251
-_in	 249
-_u	 248
-per	 244
-are	 243
-et	 243
-_se	 240
-ano	 239
-si_	 238
-_ca	 238
-_qu	 238
-lla_	 238
-_q	 238
-_a_	 236
-ac	 236
-_r	 234
-ic	 233
-_no	 232
-ie	 227
-fa	 227
-hi	 226
-del	 225
-ua	 222
-_per	 218
-ce	 218
-_ma	 216
-sc	 216
-_del	 215
-mi	 212
-_un	 208
-chi	 206
-era	 205
-i,	 205
-i,_	 205
-su	 203
-and	 202
-vo	 202
-_fa	 201
-eva_	 200
-ano_	 199
-gli_	 197
-non	 196
-pi	 196
-vi	 195
-er_	 195
-_al	 194
-se_	 193
-_ne	 192
-_non	 191
-am	 190
-is	 187
-ava_	 187
-_non_	 186
-non_	 186
-in_	 185
-ent	 185
-_si	 184
-_pa	 184
-com	 183
-!	 182
-_le	 182
-_su	 181
-uo	 181
-el_	 180
-!_	 180
-l'	 178
-ue	 177
-te_	 177
-_com	 177
-are_	 176
-pr	 176
-_in_	 176
-van	 172
-mo	 172
-ta_	 171
-gn	 167
-ere	 166
-na_	 166
-tto	 163
-it	 161
-_per_	 161
-per_	 161
-é	 161
-all	 160
-ess	 159
-ut	 159
-col	 158
-acc	 157
-gi	 155
-lo_	 154
-oc	 154
-vano	 153
-io_	 153
-_av	 151
-ndo	 151
-é_	 151
-ato	 149
-ave	 148
-_st	 147
-me_	 147
-'a	 146
-ia_	 144
-con	 143
-mp	 143
-fi	 142
-ett	 142
-_si_	 141
-_pi	 140
-era_	 140
-ti_	 140
-ó	 140
-vano_	 140
-_gl	 139
-qua	 139
-ella	 139
-sta	 138
-ome	 137
-S	 137
-_gli	 137
-_S	 137
-ad	 136
-_ve	 134
-ant	 134
-ne_	 134
-ó_	 133
-sp	 133
-do_	 133
-_po	 132
-ro_	 132
-ov	 132
-_le_	 131
-ella_	 130
-sse	 129
-_con	 128
-ir	 128
-_vi	 128
-ig	 127
-_gli_	 127
-_ave	 127
-vev	 127
-un_	 126
-ot	 126
-veva	 125
-dell	 125
-que	 125
-a.	 125
-_o	 125
-a._	 124
-tu	 124
-cia	 123
-za	 123
-_que	 123
-_da	 121
-par	 121
-_pr	 120
-cch	 120
-_dell	 120
-eg	 119
-_sa	 119
-o._	 119
-o.	 119
-_col	 118
-lt	 118
-_un_	 118
-rt	 118
-ur	 117
-_vo	 117
-_me	 117
-ome_	 117
-L	 116
-ap	 116
-_L	 116
-zi	 116
-nto	 116
-og	 115
-_an	 115
-_so	 115
-em	 114
-ag	 114
-be	 111
-ni_	 111
-im	 110
-cchi	 110
-ver	 110
-lle	 109
-nz	 109
-cci	 109
-_ri	 109
-nc	 108
-_er	 108
-come_	 107
-come	 107
-aveva	 107
-ui	 107
-avev	 107
-tto_	 107
-_come	 106
-ed	 106
-P	 105
-man	 105
-_P	 105
-rs	 105
-occ	 104
-ndo_	 103
-ato_	 103
-_qua	 103
-_era	 103
-ari	 102
-ba	 100
-_mo	 100
-nel	 100
-id	 99
-men	 98
-_fi	 98
-_all	 98
-rr	 97
-_do	 97
-_avev	 97
-att	 97
-l'a	 96
-ei	 96
-zz	 96
-;	 96
-vol	 95
-pp	 95
-tra	 95
-;_	 95
-ere_	 94
-lle_	 94
-nda	 94
-utt	 94
-est	 93
-_nel	 93
-ul	 92
-ola	 92
-iv	 92
-ando	 90
-ale	 90
-lu	 90
-rn	 90
-e.	 89
-e._	 89
-ll'	 89
-tta	 88
-nte	 87
-_l'	 87
-uel	 87
diff --git a/libtextcat/data/new_fingerprints/lm/japanese.lm b/libtextcat/data/new_fingerprints/lm/japanese.lm
deleted file mode 100644
index 654341b..0000000
--- a/libtextcat/data/new_fingerprints/lm/japanese.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-の
-、
-に
-を
-と
-し
-た
-な
-て
-。
-で
-る
-か
-す
-は
-り
-い
-ま
-ら
-く
-が
-　
-。_
-っ
-も
-_　
-して
-す。
-１
-地
-から
-う
-き
-だ
-ます
-年
-ー
-中
-れ
-め
-ます。
-」
-た。
-大
-分
-「
-ス
-した
-け
-こ
-人
-国
-政
-ん
-学
-って
-方
-りま
-った
-する
-改革
-革
-改
-的
-は、
-ち
-さ
-２
-あ
-て、
-部
-ど
-生
-てい
-タ
-会
-ン
-９
-よ
-果
-せ
-わ
-ると
-地方
-に、
-行
-や
-す。_
-３
-力
-自
-とし
-レ
-立
-)
-として
-_)
-なり
-でき
-進
-月
-新
-ります
-水
-同
-女
-下
-ります。
-作
-(_
-こと
-実
-役
-権
-いた
-(
-してい
-ル
-ク
-（
-み
-ニ
-ね
-つ
-きる
-そ
-経
-６
-時
-強
-家
-性
-５
-内
-調
-集
-る。
-上
-財
-改革(
-安
-的な
-事
-務
-」と
-一
-った。
-子
-全
-できる
-川
-た。_
-次
-業
-ない
-ド
-）
-現
-革(_
-０
-る。_
-改革(_
-革(
-です
-で、
-マ
-ミ
-ジ
-社
-でも
-目
-年から
-発
-省
-、中
-ア
-べ
-ッ
-ば
-済
-女性
-％
-法
-なん
-え
-画
-地方分権
-なく
-民
-構
-根
-し、
-が、
-高
-推
-施
-とい
-何
-電
-調査
-際
-も、
-和
-分権
-効
-限
-地方分
-国の
-長
-経済
-設
-計
-方分権
-野
-重
-小
-にな
-構造
-本
-校
-査
-しま
-造
-ます。_
-なりま
-れた
-方分
-あり
-財政
-理
-な_
-した。
-年か
-約
-_て
-１年
-よう
-私
-・
-メ
-育
-セ
-ビ
-シ
-して、
-ナ
-カ
-ト
-生の
-着
-ほ
-流
-構造改
-んて
-バ
-ろ
-菌
-治
-時に
-％、
-気
-お
-ドレ
-なっ
-など
-たり
-何か
-るこ
-、そして
-てく
-たち
-では
-ては
-進め
-造改
-構造改革(
-の子
-率
-期
-度
-日
-部省
-計画
-く_
-族
-文
-構造改革
-という
-します
-なった
-局
-踊り
-なんて
-正
-夫
-増
-多
-食
-使
-だった
-戻
-くな
-いま
-体
-スを
-題
-たが、
-いる
-いう
-身
-もな
-い。
-中部
-かけ
-踊
-_す
-面
-_に
-だった。
-的に
-門
-ドレス
-レス
-２年
-ました
-制
-合
-します。
-まで
-まし
-ありま
-く、
-冬
-とを
-文部省
-を進め
-推進
-元
-そし
-頃
-農
-入
-域
-解
-ている
-ら、
-、そし
-と、
-造改革
-家族
-見
-規
-した。_
-要
-８
-５年
-あります。
-葉
-０％
-造改革(
-あります
-公
-はな
-にあ
-しな
-結果
-表
-めた
-そして
-だけ
-だっ
-_す。
-４
-第
-ことを
-います
-文部
-の目
-、そ
-を進
-効果
-ること
-のま
-ある
-３０
-、地
-自分
-組
-結
-　「
-にも
-たが
-造改革(_
-る限り
-く女性た
-ナ増強
-戻る。
-った。_
-現す
diff --git a/libtextcat/data/new_fingerprints/lm/korean.lm b/libtextcat/data/new_fingerprints/lm/korean.lm
deleted file mode 100644
index 1594932..0000000
--- a/libtextcat/data/new_fingerprints/lm/korean.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 11636
-À	 2659
-°	 1629
-Ç	 1578
-¸	 1458
-¿	 1397
-´	 1299
-µ	 1118
-Á	 1005
-±	 928
-»	 849
-¼	 840
-_À	 809
-¹	 808
-º	 780
-¡	 773
-Ã	 764
-³	 674
-¾	 640
-Ì	 591
-Î	 580
-ÀÌ	 538
-½	 526
-Ï	 519
-Â	 518
-_°	 518
-Ù	 506
-·	 483
-È	 464
-ö	 463
-	 454
-´Ù	 451
-ø	 404
-Æ	 395
-ë	 384
-_¿	 382
-í	 377
-.	 374
-Å	 373
-ç	 358
-._	 347
-_Ç	 344
-´Â	 338
-¡_	 333
-Â_	 329
-¿¡	 327
-_Á	 319
-´Â_	 317
-´Ù.	 313
-Ù.	 313
-â	 308
-¶	 308
-´Ù._	 301
-Ù._	 301
-»_	 299
-_¹	 291
-î	 288
-®	 282
-À»	 279
-Ö	 278
-¦	 274
-À»_	 271
-Î_	 269
-,	 266
-Ñ	 266
-°í	 261
-Áö	 258
-,_	 258
-°¡	 250
-ß	 248
-_¼	 246
-Ä	 245
-ÀÇ	 244
-Ì_	 243
-_¸	 243
-_µ	 242
-ü	 238
-é	 235
-¼	 234
-ÀÌ_	 234
-ÇÏ	 234
-_±	 233
-´ë	 228
-·Î	 227
-ÇÑ	 222
-½Ã	 222
-_³	 215
-±â	 212
-_Ã	 210
-í_	 208
-_´	 206
-¦_	 206
-Ç_	 205
-_¾	 205
-º_	 204
-÷	 198
-Àº	 198
-°í_	 194
-·Î_	 193
-ó	 193
-¿¡_	 193
-¸¦_	 192
-¸¦	 192
-_ÀÌ	 190
-_	 189
-Àº_	 189
-_½	 189
-µµ	 188
-ÀÏ	 188
-ÀÇ_	 188
-_º	 186
-Í	 177
-Ú	 175
-ú	 171
-»ç	 161
-Ô	 154
-_ÀÏ	 153
-Ø	 152
-¿ø	 151
-±¸	 150
-µ¿	 147
-Ò	 147
-¸¸	 145
-¼ö	 143
-¤	 142
-ºÎ	 142
-_»	 141
-ÀÖ	 140
-æ	 139
-Ð	 138
-ù	 138
-ª	 137
-µé	 136
-è	 134
-À¸	 134
-_ÀÖ	 133
-²	 132
-Ñ_	 127
-ÀÎ	 125
-°¡_	 123
-ÀÚ	 122
-ÇÑ_	 121
-Àü	 121
-¾Æ	 118
-ý	 117
-å	 116
-Ï_	 115
-¾î	 115
-µ_	 115
-¢	 114
-Ö´	 113
-°ú	 112
-¸·	 111
-¯	 109
-ÇØ	 109
-§	 108
-à	 108
-_È	 108
-±¹	 107
-¼_	 107
-×	 107
-£	 106
-ÀÖ´	 105
-È¸	 103
-¸®	 101
-ö_	 101
-û	 100
-_ÀÖ´	 100
-Ãµ	 100
-¸·Î	 100
-"	 98
-À¸·Î	 97
-ÁÖ	 97
-À¸·	 97
-Àå	 95
-_´ë	 94
-¡¼	 94
-³ª	 94
-_½Ã	 94
-¥	 94
-µî	 94
-Á¤	 92
-°ø	 92
-_Å	 91
-á	 91
-Ï°	 90
-ÇÐ	 90
-¸·Î_	 90
-Ê	 89
-©	 89
-Í_	 89
-¸_	 89
-À¸·Î_	 89
-éÀ	 89
-Þ	 88
-¡¼	 88
-¿¡¼	 88
-¿¡¼	 88
-ê	 87
-µµ_	 87
-±³	 85
-_Æ	 85
-î_	 84
-°æ	 84
-µéÀ	 84
-¸í	 84
-ëÇ	 83
-¿ù	 83
-_Áö	 82
-ÇÏ°	 82
-¿À	 81
-¶ó	 80
-¿¡¼_	 79
-¡¼_	 79
-ÀÏ_	 78
-Ý	 78
-Á¦	 78
-ç_	 78
-øÀ	 78
-'	 77
-Çß	 77
-ì	 77
-Ü	 77
-Áß	 77
-ú_	 76
-Áö_	 76
-Ó	 76
-â_	 75
-(	 74
-)	 74
-»ó	 74
-°ü	 74
-»ý	 73
-_¿ù	 72
-_°¡	 72
-_¼ö	 72
--	 72
-¿©	 72
-Ö´Ù	 72
-º¸	 71
-ÀÖ´Ù	 71
-»ê	 70
-°³	 70
-½º	 70
-¼±	 69
-¿ë	 69
-°ú_	 69
-_ÀÖ´Ù	 69
-_µî	 69
-ø_	 69
-ß´	 69
-°Í	 68
-³»	 68
-_¡	 68
-_ÇÑ	 68
-ù_	 67
-Ã¼	 67
-¸¿	 66
-_ÀÏ_	 66
-Çß´	 66
-°Ô	 65
-ñ	 65
-_¶	 65
-_°Í	 65
-Çß´Ù	 64
-ß´Ù	 64
-_ÇÏ	 63
-¹Î	 62
-«	 62
-Ï´	 62
-¼Ò	 62
-¿ù_	 62
-Á¶	 61
-³â	 61
-Ï°í	 61
-Ì´	 60
-¾È	 60
-ÇÏ°í	 60
-õ	 59
-_¿ù_	 59
-_¼	 59
-Åë	 59
-ÆÄ	 58
-®_	 58
-_¸¸	 58
-Ø_	 58
-´ç	 57
-ß´Ù.	 57
-¬	 57
-Õ	 57
-Çß´Ù.	 57
-¹°	 57
-¾÷	 57
-Ö´Ù.	 56
-ß_	 56
-ÀÖ´Ù.	 56
-¿Í	 56
-ß´Ù._	 56
-Áø	 56
-Àç	 55
-¸°	 55
-ÍÀ	 55
-Æ®	 55
-¹é	 55
-ÀÌ´	 55
-Ö´Ù._	 54
-_¹é	 54
-¿Í_	 53
-Àû	 53
-ð	 53
-¹®	 53
-_ÁÖ	 53
-´Ü	 53
-¼º	 53
-ÇØ_	 53
-°Ç	 53
-íÀ	 52
-_Àü	 52
-Ô_	 52
-¿¬	 52
-_°æ	 51
-°ÍÀ	 51
-°£	 51
-¿ì	 51
-È	 51
-ä	 50
-_¾Æ	 50
-´ëÇ	 50
-Ä¡	 50
-Ï°í_	 49
-ÇÏ°í_	 49
-_ÀÎ	 49
-Û	 49
-É	 49
-_"	 48
-öµ	 48
-À§	 48
-ÀÌ´Ù	 48
-ÀÔ	 48
-_°ÍÀ	 48
-Ì´Ù	 48
-¡	 47
-Ì´Ù.	 47
-_°ø	 47
-ÀÌ´Ù.	 47
-°Ô_	 47
-_»ç	 47
-¸ç	 47
-½Å	 47
-Ã_	 46
-ÅÍ	 46
-é_	 46
-Ò_	 46
-ï	 46
-ÇÏ´	 46
-_°³	 45
-_´Ù	 45
-_ÀÚ	 45
-¸¶	 45
-°è	 45
-Çà	 45
-Ì´Ù._	 45
-÷À	 44
-îÁ	 44
-ÈÄ	 44
-±â_	 43
-(_	 43
-¸é	 43
-¿	 43
-ü_	 43
-ºñ	 42
-´	 42
-ë_	 42
-ÀÎ_	 42
-_ÀÌ_	 42
-µî_	 42
-°	 42
-ÎÃ	 41
-µÇ	 41
-¿øÀ	 41
-¿µ	 41
-À½	 40
-ÎÃµ	 40
-±×	 40
-Ë	 40
-¿¹	 40
-_¿À	 40
-øÇ	 40
-¸»	 40
-_ÇÐ	 40
-¡_	 39
-_³â	 39
-³²	 39
-ÇÒ	 39
-¿_	 39
-_³ª	 39
-³	 38
-¸íÀ	 38
-âÀ	 38
-ª_	 38
diff --git a/libtextcat/data/new_fingerprints/lm/latin.lm b/libtextcat/data/new_fingerprints/lm/latin.lm
deleted file mode 100644
index 177cd35..0000000
--- a/libtextcat/data/new_fingerprints/lm/latin.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20136
-e	 6892
-i	 5604
-a	 5443
-u	 4581
-t	 4552
-s	 4354
-r	 3923
-n	 3375
-m	 3063
-o	 2921
-c	 2224
-l	 1805
-e_	 1625
-s_	 1503
-p	 1424
-d	 1397
-,	 1285
-,_	 1276
-er	 1077
-qu	 1028
-q	 1028
-a_	 1019
-t_	 1018
-is	 942
-_a	 921
-re	 902
-m_	 891
-v	 858
-b	 821
-um	 808
-_s	 773
-us	 772
-en	 766
-nt	 733
-in	 729
-ue	 727
-te	 720
-g	 718
-_i	 710
-_p	 679
-it	 676
-_c	 669
-et	 653
-que	 652
-_e	 643
-at	 643
-ue_	 616
-ra	 614
-que_	 611
-f	 601
-or	 598
-ri	 576
-ti	 572
-ta	 559
-tu	 552
-an	 551
-ae	 527
-_m	 513
-am	 501
-_t	 493
-us_	 488
-is_	 487
-es	 479
-em	 479
-_f	 451
-um_	 443
-_v	 442
-ia	 442
-li	 438
-_d	 436
-.	 432
-i_	 430
-et_	 429
-ni	 412
-ne	 409
-h	 406
-de	 404
-ur	 396
-._	 392
-ar	 388
-os	 388
-mi	 382
-pe	 382
-la	 376
-st	 371
-s,	 368
-di	 367
-_et	 366
-s,_	 365
-_in	 363
-on	 360
-o_	 359
-_n	 351
-_et_	 351
-as	 346
-im	 336
-na	 327
-se	 320
-ma	 315
-cu	 307
-vi	 306
-si	 303
-ro	 303
-r_	 302
-su	 299
-un	 295
-_l	 291
-to	 291
-ec	 290
-ci	 288
-co	 287
-_r	 287
-ere	 286
-ce	 284
-tr	 280
-re_	 278
-ent	 275
-x	 275
-ct	 274
-ve	 271
-ru	 259
-ul	 256
-me	 255
-ui	 255
-c_	 252
-_o	 250
-ic	 249
-ns	 247
-_qu	 242
-_q	 242
-no	 241
-ant	 235
-am_	 235
-_co	 233
-sa	 231
-ca	 230
-t,	 226
-mu	 225
-t,_	 225
-_re	 223
-el	 222
-ib	 222
-id	 218
-om	 212
-_te	 211
-al	 209
-le	 209
-it_	 208
-mo	 208
-ol	 206
-_u	 203
-;	 199
-_h	 199
-ac	 198
-;_	 198
-bu	 197
-nu	 196
-ua	 195
-n_	 195
-ll	 194
-tis	 191
-A	 189
-rt	 188
-ge	 188
-nd	 187
-au	 187
-lu	 186
-iu	 185
-squ	 185
-per	 185
-sq	 185
-ter	 185
-pa	 183
-_A	 183
-em_	 183
-ia_	 180
-ed	 179
-_pe	 178
-m,	 176
-sque	 175
-_su	 175
-ae_	 175
-m,_	 175
-pr	 175
-bi	 175
-bus	 174
-_vi	 174
-os_	 173
-ta_	 172
-mqu	 171
-mq	 171
-ss	 170
-sque_	 169
-ibu	 167
-ad	 166
-ibus	 165
-I	 164
-nte	 163
-ra_	 163
-mque	 162
-_de	 162
-po	 161
-_se	 160
-ere_	 160
-nc	 160
-qua	 159
-T	 159
-lo	 157
-oc	 156
-mque_	 156
-_T	 155
-_pa	 155
-_pr	 155
-tem	 154
-bus_	 152
-nti	 149
-rum	 149
-er_	 149
-ab	 148
-ir	 148
-da	 147
-_ve	 146
-ibus_	 146
-ex	 146
-ut	 145
-pi	 145
-tur	 145
-_ca	 143
-_me	 142
-es_	 142
-gi	 142
-te_	 141
-_I	 141
-vo	 141
-do	 141
-_si	 140
-tus	 139
-il	 137
-_ar	 136
-du	 133
-nt_	 133
-uc	 133
-fa	 132
-as_	 132
-rr	 131
-ba	 130
-_ad	 128
-ne_	 127
-_ma	 127
-ens	 127
-gn	 126
-s.	 126
-y	 126
-min	 125
-ris	 124
-in_	 123
-tum	 123
-P	 123
-_g	 123
-mp	 123
-e,	 122
-io	 122
-_P	 122
-ea	 122
-hi	 122
-e,_	 121
-era	 120
-sc	 120
-_la	 120
-qui	 120
-unt	 120
-fe	 119
-_in_	 118
-_no	 118
-ore	 118
-iam	 118
-va	 117
-tis_	 117
-s._	 117
-at_	 117
-eri	 116
-d_	 116
-con	 115
-fu	 115
-pu	 114
-cum	 114
-ub	 114
-ng	 114
-ine	 113
-_au	 113
-:	 113
-_di	 112
-ag	 111
-_con	 111
-ect	 111
-i,	 111
-equ	 111
-i,_	 111
-be	 111
-eq	 111
-_po	 110
-so	 110
-:_	 110
-nis	 109
-ha	 109
-uo	 109
-_fa	 108
-na_	 107
-ip	 107
-is,	 107
-_cu	 106
-cr	 106
-ate	 105
-is,_	 105
-ig	 105
-tor	 105
-rat	 104
-_qua	 103
-eg	 103
-a,	 103
-a,_	 102
-tra	 102
-_mo	 101
-sp	 101
-mis	 100
-itu	 100
-D	 99
-ali	 99
-eb	 99
-eni	 99
-_sa	 98
-ie	 98
-imu	 98
-_ex	 97
-_D	 96
-res	 95
-est	 94
-tri	 94
-ene	 94
-_mi	 94
-str	 94
-enti	 93
-t.	 92
-av	 92
-_per	 91
-ur_	 91
-ora	 91
-lt	 91
-umqu	 90
-_vo	 90
-umq	 90
-up	 89
-t._	 88
-quo	 88
-_ne	 88
-gen	 88
-rum_	 87
-tqu	 87
-tq	 87
-_fu	 86
-ep	 86
-ma_	 86
-umque	 86
-it,_	 85
-ine_	 85
-it,	 85
-men	 85
-mus	 84
-ort	 83
-ven	 83
-ina	 83
-us,_	 83
-us,	 83
-tque	 82
-_ge	 82
-per_	 82
-mor	 82
-inc	 82
-are	 81
-tus_	 81
-_an	 81
-rim	 81
-tque_	 81
-ot	 81
-ani	 80
-H	 80
-_tu	 80
-ho	 80
-tem_	 80
-u_	 80
-ser	 79
-um,_	 79
-um,	 79
-S	 79
-ten	 79
-ver	 79
-sti	 79
-ntu	 78
-fer	 78
diff --git a/libtextcat/data/new_fingerprints/lm/latvian.lm b/libtextcat/data/new_fingerprints/lm/latvian.lm
deleted file mode 100644
index bffdd30..0000000
--- a/libtextcat/data/new_fingerprints/lm/latvian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 24504
-a	 8735
-i	 7353
-s	 6064
-t	 5176
-e	 4390
-r	 4339
-u	 4200
-n	 3422
-â	 3055
-m	 2817
-p	 2755
-k	 2703
-o	 2643
-s_	 2595
-d	 2131
-l	 2035
-j	 1972
-î	 1958
-ie	 1887
-v	 1822
-as	 1530
-u_	 1396
-_p	 1380
-b	 1357
-z	 1311
-ç	 1267
-a_	 1261
-as_	 1217
-.	 1065
-,	 1048
-,_	 1033
-g	 1010
-ar	 970
-ð	 965
-ti	 962
-c	 922
-_a	 876
-ja	 838
-st	 828
-_i	 822
-_v	 805
-pa	 792
-_t	 775
-._	 774
-um	 760
-_k	 749
-â_	 734
-_n	 728
-es	 712
-i_	 706
-at	 703
-is	 695
-_s	 680
-ai	 649
-ta	 635
-an	 631
-ka	 621
-r_	 615
-îb	 586
-ij	 585
-_u	 568
-_pa	 548
-un	 541
-no	 539
-va	 537
-ma	 525
-ra	 522
-ri	 515
-iz	 512
-in	 509
-vi	 508
-pr	 506
-sa	 487
-ju	 486
-tâ	 483
-ik	 473
-n_	 472
-am	 454
-en	 452
-tie	 440
-na	 432
-ða	 430
-tu	 420
-ija	 420
-ir	 419
-o_	 415
-m_	 414
-li	 411
-ci	 409
-ku	 404
-mi	 401
-_no	 398
-ek	 398
-_un	 397
-t_	 395
-_l	 394
-un_	 393
-_d	 393
-ot	 392
-_un_	 392
-ies	 391
-ar_	 388
-nâ	 387
-da	 387
-ei	 385
-em	 382
-_ti	 382
-pi	 380
-al	 368
-ba	 356
-ts	 355
-_iz	 353
-ap	 350
-jas	 349
-ko	 346
-au	 345
-ðan	 339
-re	 339
-ni	 337
-kâ	 328
-ro	 327
-et	 326
-rî	 325
-ga	 323
-mu	 322
-jas_	 321
-tr	 317
-_va	 312
-te	 310
-_pr	 307
-sp	 298
-sk	 297
-ne	 295
-îba	 293
-âs	 289
-ijas	 287
-_ar	 283
-la	 283
-to	 282
-ad	 280
-dz	 278
-îg	 277
-tî	 277
-çj	 277
-_sa	 277
-jâ	 274
-_m	 273
-ties	 273
-lî	 272
-ijas_	 269
-_at	 269
-ed	 267
-_pi	 267
-ò	 267
-s,	 265
-s,_	 265
-çr	 261
-gu	 258
-f	 258
-si	 257
-mâ	 256
-nt	 254
-tu_	 254
-_r	 253
-ru	 252
-âj	 251
-jum	 251
-âs_	 250
-ât	 249
-iem	 248
-_b	 248
-_vi	 245
-par	 244
-pie	 244
-rt	 243
-vç	 242
-_ne	 240
-âr	 240
-ai_	 239
-_.	 239
-_j	 237
-us	 237
-_ka	 236
-er	 232
-bas	 232
-_tie	 232
-_par	 230
-di	 229
-û	 228
-ms	 228
-âd	 226
-îbas	 224
-om	 220
-bu	 219
-umu	 217
-iek	 216
-kt	 216
-it	 216
-râ	 215
-_ko	 214
-ana	 211
-âk	 211
-or	 210
-de	 210
-inâ	 207
-dî	 204
-ur	 203
-pri	 203
-_c	 202
-ta_	 202
-bas_	 201
-es_	 201
-_pie	 200
-il	 200
-os	 199
-ðana	 199
-id	 198
-L	 198
-_ie	 197
-bi	 194
-ak	 194
-ja_	 194
-îbas_	 193
-çt	 192
-îbu	 192
-_g	 191
-ï	 189
-ma_	 189
-ien	 188
-kum	 187
-	 187
-_ir	 186
-on	 186
-_ties	 185
-zî	 185
-ce	 185
-ied	 184
-ist	 183
-ts_	 183
-_	 183
-_	 182
-âm	 181
-vie	 180
-__	 180
-cij	 180
-ka_	 179
-_ap	 175
-sî	 174
-ir_	 174
-zi	 174
-uma	 173
-âl	 172
-_ir_	 172
-oð	 171
-_da	 169
-î_	 168
-arî	 168
-)	 167
-do	 166
-ve	 166
-(	 165
-ls	 165
-bu_	 164
-val	 164
-mu_	 164
-isk	 163
-uz	 161
-av	 160
-par_	 160
-_vç	 159
-_par_	 158
-vçr	 158
-_ar_	 157
-rie	 157
-_uz	 157
-aj	 156
-îbu_	 156
-oj	 155
-kâ_	 155
-ld	 154
-iet	 154
-iku	 154
-ks	 153
-du	 153
-ep	 153
-ms_	 152
-ec	 152
-V	 151
-ais	 150
-str	 150
-nie	 149
-am_	 149
-ums	 148
-_(	 147
-ju_	 146
-z_	 142
-ru_	 142
-îj	 142
-gum	 142
-u,_	 141
-u,	 141
-iò	 141
-uma_	 141
-çrt	 141
-îgu	 141
-me	 140
-dâ	 140
-ît	 140
-ent	 139
-ikum	 138
-pâ	 138
-em_	 138
-_L	 138
-lie	 136
-sta	 136
-rî_	 136
-lst	 136
-eik	 135
-se	 135
-s.	 134
-pro	 134
-rs	 134
-s._	 134
-tik	 134
-lç	 134
-ska	 133
-pap	 133
-kas	 133
-rm	 133
-âju	 133
-pî	 132
-nu	 132
-T	 132
-pç	 131
-tei	 131
-nas	 131
-_V	 131
-jo	 131
-lîg	 131
-ut	 131
-iem_	 130
-ras	 129
-pu	 129
-_li	 129
-_ga	 128
-dar	 128
-_kâ	 128
-umu_	 127
-îv	 126
-îgum	 126
-kas_	 126
-tîb	 125
-vai	 125
-lîgu	 125
-P	 125
-arî_	 125
-ev	 124
-lai	 124
-îr	 124
-lîgum	 124
-tv	 123
-að	 123
-_arî_	 122
-_arî	 122
-_vie	 121
-S	 121
-_T	 120
-îju	 120
-teik	 120
-cija	 119
-rb	 119
-_ð	 119
-jâ_	 119
-nas_	 118
-tâj	 118
-vçrt	 118
-iec	 118
-_la	 117
-îd	 116
-_vai	 116
-îjum	 116
-vien	 116
-als	 116
-_lî	 116
-apîr	 115
-rts	 115
-isi	 115
-pîr	 115
-papî	 115
-papîr	 115
-apî	 115
-tsp	 115
-mç	 114
-im	 114
-be	 114
-is_	 114
-alst	 114
-_ja	 114
-rtspa	 113
diff --git a/libtextcat/data/new_fingerprints/lm/lithuanian.lm b/libtextcat/data/new_fingerprints/lm/lithuanian.lm
deleted file mode 100644
index eca25a4..0000000
--- a/libtextcat/data/new_fingerprints/lm/lithuanian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 23070
-i	 8196
-a	 7763
-s	 5179
-e	 3458
-o	 3425
-u	 3371
-t	 3344
-r	 3240
-n	 3070
-k	 3019
-l	 2060
-p	 1889
-s_	 1756
-m	 1680
-d	 1640
-v	 1590
-,	 1501
-,_	 1497
-ó	 1400
-g	 1302
-j	 1200
-o_	 1138
-.	 1128
-ai	 1113
-÷	 1075
-_p	 1047
-_k	 1035
-i_	 990
-._	 984
-as	 975
-b	 937
-au	 903
-is	 863
-_n	 815
-ka	 811
-si	 804
-_s	 799
-ia	 796
-ý	 759
-ta	 735
-ie	 731
-ti	 728
-y	 721
-_t	 711
-in	 697
-_i	 686
-us	 675
-pa	 658
-ir	 640
-ar	 633
-ù	 620
-_a	 617
-r_	 609
-ne	 583
-a_	 578
-ri	 569
-_v	 558
-_pa	 541
-al	 540
-ra	 531
-li	 522
-Ý	 509
-u_	 493
-vi	 490
-_ka	 489
-da	 487
-_ne	 482
-_j	 481
-en	 478
-ù_	 445
-os	 444
-ki	 442
-õ	 441
-an	 440
-ik	 434
-ma	 433
-as_	 430
-st	 420
-_d	 420
-ai_	 417
-s,_	 396
-am	 396
-is_	 396
-s,	 396
-_ir	 390
-jo	 387
-ir_	 385
-at	 384
-_ir_	 383
-i÷	 381
-ni	 377
-ga	 376
-_b	 367
-na	 366
-e_	 365
-to	 352
-pr	 337
-_g	 332
-_m	 332
-û	 328
-ß	 326
-io	 323
-ei	 323
-Ý_	 321
-su	 320
-ßi	 320
-uo	 319
-la	 317
-er	 303
-va	 299
-vo	 298
-ýi	 293
-es	 291
--	 290
-ó_	 286
--_	 285
-_vi	 284
-_-	 283
-ko	 283
-_-_	 283
-iau	 281
-sa	 278
-s.	 278
-iu	 276
-et	 274
-nu	 265
-ja	 262
-õ_	 262
-_ta	 262
-s._	 259
-el	 258
-ój	 258
-os_	 256
-im	 255
-it	 254
-_pr	 253
-no	 252
-av	 251
-ur	 251
-_÷	 248
-mi	 246
-ve	 245
-ak	 245
-ku	 243
-ek	 241
-tu	 241
-_ý	 241
-ad	 241
-ñ	 238
-_l	 238
-_i÷	 236
-us_	 236
-_su	 232
-oj	 231
-au_	 231
-ba	 224
-nt	 218
-me	 214
-te	 210
-jo_	 208
-ro	 205
-ós	 204
-iù	 203
-tai	 203
-_õ	 201
-ló	 201
-pas	 200
-ip	 198
-iai	 197
-di	 195
-usi	 194
-vo_	 193
-kai	 190
-i,	 189
-i,_	 189
-sk	 187
-_r	 186
-aus	 184
-ap	 183
-gi	 182
-mo	 182
-uk	 181
-t_	 180
-_da	 177
-be	 176
-ien	 176
-o,	 174
-il	 174
-o,_	 173
-ti_	 173
-re	 172
-_nu	 171
-ßia	 171
-_pas	 169
-pri	 169
-÷_	 169
-ok	 168
-dó	 166
-ól	 162
-bu	 161
-÷i	 160
-on	 160
-asi	 159
-id	 158
-ul	 157
-ji	 157
-aip	 156
-ia_	 155
-_sa	 154
-ot	 154
-gal	 153
-nk	 153
-om	 152
-p_	 151
-_pri	 151
-od	 151
-vis	 150
-_at	 150
-vie	 150
-uv	 150
-ab	 150
-iù_	 149
-ama	 149
-nó	 149
-A	 149
-sta	 148
-kr	 148
-_A	 145
-ais	 144
-rt	 143
-J	 142
-_J	 142
-ójo	 142
-_õ_	 141
-K	 140
-_K	 139
-pi	 139
-avo	 139
-ng	 139
-mas	 138
-du	 138
-ug	 137
-_ga	 137
-ol	 136
-tik	 135
-ali	 135
-..	 135
-_vis	 135
-iek	 134
-ini	 133
-kad	 133
-a,	 133
-le	 133
-kó	 133
-T	 133
-tó	 132
-i.	 132
-_T	 131
-dý	 131
-a,_	 131
-go	 131
-ip_	 131
-aip_	 131
-ró	 129
-a÷	 129
-dýi	 129
-ke	 128
-k_	 128
-d_	 127
-ad_	 127
-_ti	 127
-_ma	 126
-_va	 125
-i._	 124
-z	 123
-÷k	 123
-iau_	 121
-m_	 120
-kar	 119
-um	 119
-tù	 119
-_kad	 118
-uý	 117
-tr	 117
-_kai	 117
-as,	 116
-og	 116
-kad_	 116
-as,_	 116
-_ji	 116
-rie	 115
-yt	 114
-_ja	 114
-_ko	 114
-vó	 114
-ys	 114
-jau	 113
-ar_	 113
-pra	 112
-aý	 112
-ant	 112
-kl	 111
-tas	 111
-gu	 111
-_ku	 110
-si_	 110
-pe	 109
-eb	 109
-N	 109
-ójo_	 108
-_kad_	 108
-se	 108
-_ki	 108
-or	 107
-ly	 107
-lo	 107
-iai_	 107
-_la	 106
-ts	 106
-ñs	 106
-ig	 105
-_N	 105
-ut	 105
-_u	 105
-ós_	 105
-avo_	 104
-ie_	 104
-a.	 104
-kt	 104
-em	 103
-do	 103
-je	 102
-ks	 102
-ats	 101
-_be	 101
-ris	 101
-l_	 101
-_vie	 101
-tin	 101
-ag	 100
-dam	 100
-_st	 100
-a._	 99
-_bu	 99
-?	 99
-V	 98
-io_	 98
-kas	 98
-_jo	 98
-vien	 97
-_gal	 97
-ót	 97
-kia	 97
-lia	 96
-c	 96
-uri	 96
-_V	 96
-?_	 96
-uvo	 95
-ru	 95
-ty	 95
-ep	 94
-nd	 94
-lai	 94
-_tai	 94
-ju	 93
-man	 92
-o.	 92
-buv	 92
-tÝ	 92
-_÷i	 91
-i÷_	 91
-_i÷_	 91
-i÷k	 90
-o._	 90
-_to	 90
-bi	 90
-up	 89
-po	 89
-rs	 89
-_prie	 88
-ù,_	 88
-aik	 88
-ui	 88
-_tik	 88
-ij	 88
-ù,	 88
-pat	 88
-prie	 88
-I	 87
-ies	 87
-tai_	 87
-n_	 87
-pasi	 87
-ius	 87
-÷t	 87
-eik	 86
-_me	 86
-ina	 86
diff --git a/libtextcat/data/new_fingerprints/lm/luxembourgish.lm b/libtextcat/data/new_fingerprints/lm/luxembourgish.lm
deleted file mode 100644
index 149c3d9..0000000
--- a/libtextcat/data/new_fingerprints/lm/luxembourgish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-e
-n
-r
-t
-i
-a
-s
-u
-er
-h
-d
-o
-l
-n_
-g
-en
-c
-ch
-_d
-m
-t_
-r_
-_a
-de
-e_
-en_
-er_
-an
-z
-é
-,
-un
-,_
-.
-ge
-b
-k
-w
-ë
-f
-._
-éi
-_de
-v
-p
-sc
-sch
-es
-nn
-ng
-te
-_v
-ne
-_g
-ue
-h_
-ie
-ch_
-m_
-ou
-i_
-ä
-s_
-_e
-ee
-el
-ze
-at
-re
-ss
-'
-vu
-_vu
-D
-le
-se
-st
-_an
-_s
-un_
-g_
-et
-_D
-_h
-he
-an_
-ec
-in
-rt
-_an_
-ro
-der
-ll
-is
-ht
-ech
-cht
-d'
-_d'
-S
-nt
-uer
-der_
-éi_
-em
-_o
-it
-L
-l_
-on
-esc
-A
-esch
-ti
-al
-us
-ier
-_z
-ra
-E
-we
-che
-_S
-ir
-ei
-ët
-äi
-vun
-_w
-me
-_m
-_A
-be
-ert
-vun_
-_vun
-_vun_
-nne
-tz
-ng_
-eb
-_der
-_E
-_der_
-ar
-_n
-rg
-n,_
-u_
-_L
-n,
-den
-eng
-um
-_b
-io
-ns
-erg
-au
-_en
-K
-M
-_ge
-dé
-as
-eg
-tze
-ung
-a_
-n.
-hu
-ner
-op
-n._
-ur
-et_
-B
-oun
-ën
-hi
-si
-bu
-nn_
-ëtz
-_dé
-déi
-_f
-inn
-de_
-_déi
-li
-tt
-ebu
-W
-ass
-uerg
-nd
-ebue
-bue
-rt_
-ëtze
-buer
-déi_
-ma
-ebuer
-_déi_
-_K
-_hu
-nge
-_M
-buerg
-ëtzeb
-zebue
-zeb
-zebu
-tzebu
-tzeb
-um_
-ioun
-ss_
-iou
-ges
-ere
-ha
-den_
-Lë
-éie
-F
-ke
-_a_
-t.
-ta
-Lëtz
-G
-Lëtze
-Lët
-t._
-en,_
-t,_
-en,
-t,
-at_
-ech_
-o_
-_de_
-ren
-ri
-ic
-ter
-_W
-_eng
-éier
-la
-ol
-rs
-scht
-ir_
-ru
-_B
-ert_
-_k
-oc
-P
-ten
-ht_
-_Lë
-nz
-em_
-p_
-ent
-wa
-cht_
-_den
-_Lët
-_Lëtz
-ich
-_G
-_den_
-tio
-il
-nner
-ger
-_as
-sse
-_op
-och
-ll_
-_ass
-R
-am
--
-_se
-_F
-sche
-d_
-sch_
-ati
-_be
-ts
-ik
-nen
-De
-ers
-_.
-_P
-_._
-fe
-ass_
-mm
-gi
-aa
-zu
-_De
-ve
-pe
-fi
-tr
-lt
-en.
-_ass_
-eng_
-op_
-ck
-en._
-sen
-na
-rge
-ës
-kt
-ed
-_al
-äit
-so
-uro
-_op_
-gesc
-_R
-gesch
-Eur
-tiou
-Euro
-aus
-Eu
-erge
-hen
-tioun
-lec
-no
-fir_
-chen
-fir
-V
-hue
-_si
-or
-ut
-ac
-uf
-Z
-gen
-tu
-ver
-lech
-da
-mat
-_V
-_Eur
-_Eu
-wer
-lle
-_Euro
-uerge
-_ze
-éis
-J
-est
-ger_
-tt_
-_hue
-go
-_fi
-dee
-_fir_
-uet
-vum
-_zu
-ni
-_vum
-_fir
-een
-_vum_
-vum_
-huet
-ann
-_huet
-T
-I
-el_
-_wa
diff --git a/libtextcat/data/new_fingerprints/lm/malay.lm b/libtextcat/data/new_fingerprints/lm/malay.lm
deleted file mode 100644
index 911d0cf..0000000
--- a/libtextcat/data/new_fingerprints/lm/malay.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 87128
-a	 50232
-n	 25424
-e	 18746
-i	 18605
-an	 14419
-u	 12470
-k	 11955
-t	 11875
-r	 11007
-d	 9856
-g	 9545
-m	 9390
-s	 8926
-l	 8631
-n_	 8004
-an_	 7095
-p	 6890
-a_	 6739
-b	 6645
-ng	 6630
-h	 5964
-da	 5153
-_d	 5107
-er	 4625
-ka	 4448
-la	 4339
-y	 4323
-i_	 4295
-en	 4159
-ya	 3800
-ang	 3778
-_m	 3750
-o	 3593
-.	 3539
-._	 3310
-at	 3288
-ah	 3216
-_b	 3199
-_s	 3177
-ta	 3076
-ra	 3036
-_k	 2949
-g_	 2939
-ng_	 2933
-ar	 2915
-_p	 2906
-me	 2884
-ga	 2781
-di	 2778
-ak	 2727
-al	 2705
-_me	 2671
-ang_	 2524
-h_	 2509
-ba	 2508
-pa	 2454
-kan	 2449
-in	 2437
-tu	 2411
-_t	 2376
-sa	 2338
-_da	 2276
-j	 2276
-pe	 2225
-,	 2150
-k_	 2147
-ma	 2143
-se	 2138
-am	 2131
-kan_	 2117
-_di	 2082
-,_	 2079
-ke	 2048
-un	 2004
-be	 1947
-_a	 1925
-na	 1871
-ti	 1868
-ri	 1861
-u_	 1857
-as	 1854
-ny	 1827
-ha	 1789
-te	 1788
-_pe	 1768
-em	 1750
-it	 1737
-_i	 1732
-_ke	 1711
-yan	 1706
-ad	 1698
-ia	 1673
-yang	 1673
-_y	 1668
-_ya	 1655
-yang_	 1653
-_se	 1648
-ah_	 1646
-_yan	 1639
-_yang	 1639
-ala	 1612
-nya	 1587
-el	 1576
-ik	 1571
-t_	 1568
-ai	 1549
-men	 1531
-eng	 1522
-_men	 1464
-nga	 1441
-dan	 1366
-_be	 1365
-si	 1343
-uk	 1328
-ada	 1299
-nt	 1291
-__	 1287
-ap	 1276
-ua	 1265
-___	 1238
--	 1213
-ja	 1211
-ber	 1204
-gan	 1203
-_ba	 1193
-____	 1189
-ni	 1181
-_te	 1169
-c	 1143
-ran	 1141
-_____	 1140
-m_	 1127
-ara	 1118
-per	 1099
-le	 1084
-_dan	 1083
-dan_	 1079
-ngan	 1060
-_dan_	 1050
-ya_	 1046
-at_	 1044
-da_	 1021
-li	 1016
-aka	 1013
-A	 999
-r_	 999
-w	 997
-eb	 995
-lah	 980
-ata	 980
-ak_	 978
-nd	 974
-_ber	 955
-gi	 936
-is	 933
-il	 931
-tu_	 923
-s_	 920
-gan_	 915
-mb	 913
-wa	 904
-ag	 903
-ngan_	 898
-ter	 887
-nya_	 877
-S	 873
-ek	 853
-ru	 852
-_l	 838
-ela	 828
-itu	 824
-ol	 822
-aha	 822
-ada_	 820
-pu	 812
-di_	 807
-bu	 807
-am_	 804
-ur	 801
-tan	 790
-mp	 790
-_per	 786
-_sa	 784
-M	 782
-ut	 781
-us	 779
-era	 779
-lam	 778
-lah_	 775
-asa	 767
-ki	 761
-ir	 759
-de	 756
-enga	 750
-su	 748
-du	 741
-id	 739
-"	 733
-akan	 732
-apa	 728
-_S	 724
-ul	 721
-lu	 717
-ari	 717
-dal	 704
-et	 698
-es	 698
-pad	 688
-_ma	 688
-_M	 685
-ana	 684
-bi	 679
-pada	 673
-dala	 673
-l_	 671
-ep	 664
-f	 662
-_di_	 658
-B	 655
-ing	 655
-_j	 654
-ika	 653
-ku	 650
-_.	 644
-akan_	 642
-ama	 637
-pen	 636
-alam	 634
-eh	 634
-pada_	 633
-ai_	 632
-_ter	 632
-K	 631
-mu	 628
-ju	 628
-P	 626
-mem	 625
-au	 622
-_mem	 614
-lan	 612
-_._	 611
-ntu	 608
-lam_	 605
-um	 601
-on	 600
-gk	 597
-_in	 597
-ngk	 597
-a.	 584
-meng	 582
-_meng	 578
-alam_	 577
-_A	 576
-aa	 575
-uk_	 572
-_pen	 569
-ban	 569
-or	 569
-st	 566
-ay	 566
-dar	 565
-_pa	 564
-a._	 564
-_h	 562
-bah	 562
-_P	 560
-D	 559
-ri_	 558
-ini	 552
-_de	 551
-rt	 550
-aan	 545
-_it	 542
-_itu	 542
-nda	 540
-eri	 540
-dalam	 537
-_B	 533
-_dal	 532
-ip	 532
-_dala	 532
-ta_	 528
-_u	 527
-ung	 525
-ih	 524
-aw	 520
-_n	 519
-atu	 517
-ila	 513
-mi	 513
-leh	 513
-ian	 512
-tuk	 509
-awa	 508
-gu	 506
-ert	 506
-engan	 505
-ole	 504
-_K	 501
-seb	 497
-ca	 496
-gg	 493
-_ta	 489
-ra_	 488
-ngg	 488
-itu_	 487
-emb	 482
-ni_	 482
-ida	 482
-nj	 482
-_ti	 479
-man	 478
-den	 477
-_D	 474
-_ka	 473
-aj	 470
-oleh	 468
-n.	 468
-n._	 464
-ngka	 464
-gka	 464
-dak	 464
-anga	 461
-ena	 459
-san	 458
-pat	 458
-rk	 458
-(	 455
-ent	 454
-agi	 453
-)	 451
-ia_	 450
-ge	 450
-ab	 449
-im	 447
-_ini	 446
-ntuk	 445
-I	 445
-ar_	 440
-N	 439
-aan_	 436
-_la	 433
-pi	 432
-baha	 431
-deng	 430
-han	 430
-bag	 429
-eh_	 429
-hu	 429
-denga	 428
-_o	 427
-na_	 427
-T	 425
-leh_	 422
-_den	 422
-ka_	 419
-any	 415
-ud	 415
-rang	 414
-anya	 413
-gi_	 412
-angan	 412
-a,	 411
-_deng	 410
-ita	 409
-kat	 408
-re	 408
-_(	 406
-tuk_	 403
-aga	 401
-ne	 400
-and	 399
-aya	 398
-_dar	 397
-a,_	 396
-ro	 396
-ntuk_	 393
-eba	 392
-aran	 390
-_"	 387
-ed	 385
-end	 384
-ko	 383
-sa_	 381
-p_	 381
-ara_	 380
-_seb	 379
-alah	 379
-oleh_	 379
-an.	 378
-dak_	 378
-eg	 378
-hi	 376
-dari	 375
-an._	 375
-au_	 373
-bo	 373
-ti_	 371
-ula	 371
diff --git a/libtextcat/data/new_fingerprints/lm/manx_gaelic.lm b/libtextcat/data/new_fingerprints/lm/manx_gaelic.lm
deleted file mode 100644
index e6eceeb..0000000
--- a/libtextcat/data/new_fingerprints/lm/manx_gaelic.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 36004
-e	 9455
-a	 8302
-y	 6395
-n	 6395
-h	 5736
-r	 4939
-s	 4799
-o	 4429
-i	 4129
-l	 3462
-y_	 2896
-g	 2731
-n_	 2549
-d	 2232
-t	 2160
-_a	 1836
-m	 1823
-sh	 1774
-e_	 1746
-h_	 1645
-yn	 1550
-c	 1531
-ee	 1515
-gh	 1461
-s_	 1460
-_s	 1388
-ey	 1345
-_e	 1316
-ag	 1312
-a_	 1201
-r_	 1173
-agh	 1165
-in	 1148
-as	 1136
-_d	 1136
-u	 1124
-he	 1060
-yn_	 1025
-oo	 1012
-ey_	 1005
-_m	 1002
-er	 965
-v	 949
-_y	 941
-_v	 895
-_c	 891
-_as	 880
-'	 869
-,	 866
-_n	 832
-ll	 828
-,_	 827
-_sh	 818
-.	 802
-hi	 797
-as_	 770
-ee_	 768
-ne	 767
-_as_	 764
-b	 762
-re	 735
-ay	 730
-._	 730
-an	 726
-ar	 725
-gh_	 722
-ny	 709
-en	 703
-_r	 697
-ch	 688
-agh_	 687
-dy	 686
-t_	 677
-le	 667
-k	 658
-er_	 616
-oi	 612
-ea	 607
-_t	 601
-yr	 596
-_er	 585
-ra	 574
-_dy	 572
-in_	 570
-l_	 564
-f	 557
-_l	 556
-ha	 551
-_g	 548
-_ny	 534
-nn	 530
-"	 528
-_ch	 527
-_y_	 524
-ie	 514
-dy_	 514
-_dy_	 513
-aa	 510
-_f	 509
-j	 504
-sh_	 487
-oa	 480
-is	 478
-_h	 470
-rr	 468
-ny_	 467
-_ny_	 463
-_er_	 454
-ish	 445
-ho	 442
-ai	 441
-d_	 435
-ro	 423
-ht	 418
-ei	 417
-shi	 416
-il	 409
-me	 408
-_ay	 403
-_b	 403
-la	 400
-_j	 400
-my	 394
-va	 391
-ns	 386
-on	 385
-_o	 381
-ys	 380
-_shi	 379
-ia	 377
-ayn	 373
-_va	 371
-hen	 362
-she	 356
-ri	 345
-lle	 342
-ooi	 342
-mee	 340
-ley	 335
-_me	 331
-el	 330
-rt	 328
-ie_	 327
-eh	 324
-w	 316
-_ayn	 313
-al	 311
-g_	 309
-ish_	 308
-lley	 307
-mee_	 305
-_mee	 304
-ill	 301
-es	 299
-na	 299
-je	 298
-yns	 296
-C	 294
-_my	 291
-_she	 290
-ley_	 282
-V	 280
-_yn	 278
-_"	 278
-_mee_	 277
-ta	 272
-_V	 271
-ys_	 268
--	 268
-lley_	 265
-hin	 264
-_ro	 259
-shin	 256
-_yn_	 255
-_je	 255
-do	 253
-va_	 253
-ne_	 253
-_va_	 252
-ns_	 252
-_shin	 251
-yns_	 250
-ayns	 248
-en_	 247
-che	 246
-_ayns	 246
-eh_	 246
-_do	 242
-ad	 241
-ney	 240
-o_	 240
-ym	 240
-ed	 239
-yr_	 239
-ayns_	 237
-ur	 237
-st	 234
-_C	 234
-rt_	 234
-'n	 232
-m_	 232
-p	 231
-li	 231
-or	 230
-ow	 228
-hin_	 225
-da	 225
-shen	 223
-"_	 223
-'n_	 223
-Va	 221
-ght	 220
-shin_	 219
-tr	 217
-_Va	 217
-ry	 216
-ve	 216
-_shen	 215
-ty	 214
-mo	 206
-_'	 205
-_ve	 205
-ma	 203
-be	 203
-te	 203
-hie	 203
-hey	 203
-nag	 202
-ll_	 201
-yl	 200
-w_	 200
-ss	 200
-aa_	 198
-nagh	 198
-an_	 197
-io	 195
-ow_	 194
-it	 194
-sy	 193
-ayr	 193
-ney_	 192
-E	 192
-sht	 192
-ni	 191
-_k	 190
-ha_	 190
-ain	 189
-u_	 189
-hy	 189
-aght	 188
-oo_	 188
-ree	 188
-lh	 187
-_tr	 186
-esh	 186
-_che	 183
-yrt	 182
-_da	 182
-oar	 182
-doo	 181
-k_	 181
-se	 180
-au	 180
-ille	 179
-ar_	 179
-_lh	 179
-ki	 177
-arr	 176
-ec	 176
-ol	 175
-_doo	 175
-T	 175
-row	 175
-_row	 174
-ge	 173
-so	 172
-oy	 171
-oil	 170
-_re	 170
-_ag	 170
-'e	 169
-rey	 169
-illey	 169
-ck	 168
-ad_	 168
-ann	 168
-n,	 166
-eea	 166
-_ta	 166
-ht_	 165
-ae	 162
-_row_	 162
-!	 162
-row_	 162
-ane	 161
-fe	 161
-dd	 160
-go	 159
-tyn	 159
-oin	 158
-ooa	 158
-n.	 158
-eg	 156
-_ec	 156
-_ma	 156
-_agh	 155
-n,_	 154
-_fe	 154
-Ch	 154
-nyn	 153
-fo	 152
-eay	 152
-nagh_	 152
-n._	 152
-_go	 151
-S	 150
-ke	 150
-hey_	 150
-enn	 150
-cha	 149
-rre	 149
-_fo	 149
-ghe	 149
-raa	 149
-G	 148
-lan	 148
-mm	 147
-ym_	 147
-A	 146
-c_	 146
-oill	 145
-hee	 144
-ooar	 144
-_E	 144
-nne	 143
-tey	 142
-ir	 141
-de	 141
-hyn	 140
-_he	 140
-nyn_	 140
-'s	 139
-_gh	 139
-_cha	 138
-L	 138
-yrt_	 138
-_Ch	 137
-e,	 137
-lla	 136
-Va_	 136
-ooin	 136
-ell	 135
-a'	 135
-os	 135
-_oo	 134
-am	 134
-rish	 133
-th	 133
-_mo	 133
-ris	 133
-iag	 133
-gg	 133
-_Va_	 132
-iagh	 132
-_G	 132
-e,_	 132
-ass	 132
-!_	 132
-my_	 132
-hoo	 131
-_T	 131
-nee	 130
-a'n_	 129
-rag	 129
-a'n	 129
-_'s	 129
-_so	 128
-co	 128
-rey_	 128
-_eh	 126
-_my_	 126
-nni	 126
-ou	 126
-_'sy	 125
-'sy	 125
-_p	 125
-vo	 125
-_S	 125
-H	 125
-_agh_	 125
-tra	 124
-moo	 124
-hu	 123
-ooy	 123
-ragh	 123
-al_	 123
-it_	 123
-hia	 122
-id	 122
diff --git a/libtextcat/data/new_fingerprints/lm/marathi.lm b/libtextcat/data/new_fingerprints/lm/marathi.lm
deleted file mode 100644
index 479f4fd..0000000
--- a/libtextcat/data/new_fingerprints/lm/marathi.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-�	 17815
-_	 14534
-��	 4035
-�_	 3087
-�	 2180
-�	 1762
-��	 1669
-�	 1654
-�	 1534
-�	 1480
-��	 1433
-�	 1342
-�	 1289
-�	 1237
-�	 1163
-�	 1158
-�	 1153
-��_	 1133
-�	 1099
-�	 1084
-�	 1062
-�	 1059
-�_	 1054
-��	 1054
-��	 1050
-���	 1039
-��	 989
-�	 983
-��	 968
-�	 965
-�	 949
-_�	 936
-.	 936
-��	 915
-��	 859
-��	 842
-��	 838
-��	 836
-��	 769
-��	 764
-�	 710
-��	 710
-��	 684
-���	 681
-._	 670
-��_	 637
-�	 609
-��	 578
-_�	 578
-_��	 569
-_�	 543
-��	 530
-_�	 530
-��	 524
-_�	 523
-�	 511
-�	 504
-�_	 495
-��_	 477
-���	 476
-��	 474
-_�	 474
-_�	 457
-_��	 447
-_��	 447
-���_	 446
-��	 444
-�	 438
-��	 423
-���	 422
-��	 409
-��	 388
-��	 387
-���	 381
-�_	 366
-���	 359
-�	 339
-���	 334
-_��	 332
-��	 331
-��	 324
-���	 320
-_��	 320
-���	 318
-�	 315
-_�	 315
-��_	 314
-�	 313
-��	 306
-��_	 303
-��	 301
-��	 297
-�	 297
-���	 295
-��	 284
-��	 280
-�	 274
-�_	 272
-���	 270
-���	 268
-���_	 268
-��	 264
-��	 264
-��	 263
-,	 258
-����	 256
-����	 256
-���_	 256
-,_	 255
-���	 255
-�	 249
-���	 247
-���	 243
-���	 241
-_�	 234
-_��	 233
-���	 232
-��	 232
-��	 231
-��_	 231
-���	 230
-���	 228
-�	 227
-�	 226
-���	 225
-�_	 223
-���	 221
-��	 220
-_�	 220
-��	 219
-��_	 218
-���	 217
-�.	 216
-��	 215
-_��	 213
-..	 209
-_���	 209
-����	 205
-���	 205
-����	 204
-�	 204
-���	 203
-����_	 202
-�_	 202
-���	 201
-�	 198
-_�	 198
-��	 193
-_�	 191
-���	 190
-�._	 189
-���	 188
-��	 188
-����	 187
-�	 186
-��	 186
-�	 185
-��_	 180
-��_	 180
-_��	 180
-��	 179
-�	 178
-_���	 176
-_���	 175
-_����	 175
-��	 175
-_��	 175
-���	 174
-���	 171
-��	 170
-_�	 170
-...	 168
-���	 167
-���	 166
-_�	 164
-���	 164
-���	 163
-����	 163
-��	 162
-���	 162
-_���	 162
-����_	 161
-��	 160
-��_	 159
-����	 159
-���	 157
-���	 154
-��	 154
-_��	 154
-_�	 154
-��	 153
-���	 153
-��	 151
-���	 151
-_�	 151
-����	 150
-��	 150
-��	 150
-�.	 149
-_����	 149
-��	 148
-���	 148
-��	 147
-��	 147
-ţ	 146
-���_	 146
-_��	 145
-�._	 145
-���	 144
-��	 143
-�	 142
-�	 140
-����	 140
-���	 139
-��	 139
-���	 137
-���	 136
-_��	 136
-��	 136
-_��	 135
-�.	 135
-���	 135
-'	 135
-�ţ	 134
-_��	 132
-����	 131
-����_	 131
-���	 129
-'_	 129
-_���	 129
-�._	 128
-��	 127
-....	 127
-�	 127
-��	 126
-���	 125
-_��	 124
-��_	 123
-����	 123
-�	 122
-;	 122
-_��	 121
-_���	 119
-�	 118
-���	 115
-���	 114
-��_	 114
-���	 113
-����	 113
-���	 113
-b	 113
-���	 112
-_'	 112
-s	 111
-&	 111
-���	 111
-���	 111
-����	 111
-p	 111
-�	 111
-_�	 110
-�����	 110
-bs	 109
-��	 109
-n	 109
-�	 109
-_���	 108
-&n	 107
-bsp;	 107
-nbsp;	 107
-sp;	 107
-nb	 107
-bsp	 107
-nbs	 107
-sp	 107
-nbsp	 107
-&nb	 107
-&nbsp	 107
-p;	 107
-&nbs	 107
-����	 106
-_'_	 106
-���	 106
-���	 106
-���	 106
-���_	 105
-���	 104
-���	 104
-��	 104
-��	 104
-_��	 103
-����	 103
-��	 103
-���	 102
-����	 101
-����	 100
-����	 99
-�,	 99
-_�	 98
-�,_	 98
-_�ţ	 98
-���	 98
-����_	 98
-_���	 97
-;&	 97
-_���	 97
-����	 97
-_����	 96
-��	 96
-�����	 96
-���	 96
-�	 96
-;&nb	 95
-p;&nb	 95
-;&n	 95
-p;&	 95
-;&nbs	 95
-bsp;&	 95
-.....	 95
-��_	 95
-sp;&n	 95
-sp;&	 95
-p;&n	 95
-�	 94
-_�	 94
-�	 94
-����_	 94
-����	 93
-���	 93
-���_	 93
-��_	 93
-���	 93
-_�	 92
-��	 92
-_���	 92
-���_	 92
-���	 92
-���_	 91
-��	 91
-��_	 90
-_���	 90
-_���	 90
-�����	 90
-�	 90
-����	 90
-��	 89
-��	 89
-����	 89
-���_	 89
-��	 89
-���	 89
-����	 89
-��	 89
-���	 89
-_��	 88
-��	 88
-�����	 88
-_��	 88
-_���	 88
-����	 87
-��	 87
-��	 87
-�����	 87
-_�	 87
-��	 87
-����	 87
-����	 86
-���_	 86
-_���	 85
-���	 85
-��	 85
-_�	 85
-���	 85
-_����	 84
-��	 84
-����	 83
-���	 83
-���	 83
-��	 83
-���	 83
-���_	 83
-_�	 82
-_����	 82
-����_	 82
-���_	 82
-�����	 82
-����	 82
-���_	 82
-_��	 82
-���_	 82
-���_	 81
-��	 81
-�._	 80
-���	 80
-_���	 80
-�.	 80
-��	 79
-_��	 79
-����_	 79
-�	 79
diff --git a/libtextcat/data/new_fingerprints/lm/middle_frisian.lm b/libtextcat/data/new_fingerprints/lm/middle_frisian.lm
deleted file mode 100644
index 17e4f14..0000000
--- a/libtextcat/data/new_fingerprints/lm/middle_frisian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 60524
-e	 20138
-n	 10664
-t	 8674
-i	 7833
-a	 7549
-o	 7278
-r	 6963
-n_	 5391
-s	 5087
-d	 4731
-t_	 4327
-l	 4306
-e_	 4271
-en	 4068
-k	 3483
-m	 3346
-g	 2990
-er	 2965
-en_	 2835
-y	 2597
-w	 2481
-h	 2475
-j	 2441
-_d	 2375
-r_	 2250
-u	 2059
-s_	 1921
-ie	 1780
-_h	 1725
-z	 1710
-de	 1666
-_m	 1652
-_w	 1629
-_i	 1611
-et	 1550
-te	 1540
-b	 1538
-.	 1517
-er_	 1481
-in	 1420
-an	 1408
-p	 1392
-f	 1311
-,	 1280
-,_	 1273
-k_	 1266
-._	 1258
-y_	 1238
-_z	 1230
-oe	 1162
-v	 1144
-et_	 1138
-ne	 1131
-ee	 1125
-st	 1120
-_o	 1107
-_s	 1107
-_e	 1076
-_n	 1068
-_b	 989
-_t	 988
-l_	 983
-oo	 981
-ge	 975
-je	 963
-_g	 952
-at	 949
-me	 946
-ij	 943
-is	 913
-he	 899
-'	 892
-aa	 882
-el	 870
-_v	 864
-re	 843
-ar	 837
-_de	 805
-on	 800
-ke	 796
-de_	 788
-ei	 782
-_a	 776
-_'	 770
-le	 744
-at_	 742
-it	 741
-_k	 738
-or	 734
-an_	 729
-in_	 723
-da	 715
-te_	 703
-_he	 680
-_l	 664
-H	 661
-al	 652
-_H	 652
-a_	 650
-_da	 648
-D	 648
-d_	 646
-_D	 643
-es	 617
-g_	 608
-is_	 606
-æ	 596
-_f	 594
-'t	 591
-_'t	 584
-'t_	 583
-_me	 580
-c	 576
-_'t_	 576
-ri	 571
-_en	 564
-yn	 563
-_en_	 559
-ze	 538
-m_	 535
-om	 535
-ik	 522
-_de_	 522
-ed	 521
-be	 517
-wi	 509
-ch	 509
-ol	 498
-ar_	 498
-ha	 496
-_ne	 495
-we	 494
-ou	 486
-nd	 474
-ma	 474
-ik_	 470
-J	 459
-_ik	 456
-_ik_	 451
-_J	 451
-ll	 450
-M	 446
-li	 443
-wa	 442
-_M	 442
-ien	 435
-ro	 432
-di	 421
-nn	 418
-ste	 415
-wo	 415
-yn_	 415
-_r	 413
-_ha	 411
-it_	 409
-tt	 408
-ve	 407
-S	 404
-_j	 399
-_S	 398
-_in	 395
-as	 395
-der	 395
-hi	 389
-_al	 388
-uw	 384
-tte	 384
-ng	 381
-_wi	 381
-nne	 381
-het	 380
-_het	 378
-lle	 376
-nt	 374
-ns	 373
-op	 373
-je_	 367
-E	 366
-ek	 363
-B	 363
-dat	 362
-_B	 362
-_ma	 362
-_in_	 361
-_dat	 359
-_wo	 359
-ier	 358
-og	 357
-_E	 354
-_ge	 352
-dat_	 349
-ne_	 349
-eer	 349
-het_	 348
-_het_	 348
-_is	 348
-_dat_	 348
-ey	 347
-W	 346
-_W	 343
-_te	 339
-eg	 337
-ra	 335
-rs	 335
-!	 332
-zi	 332
-gt	 329
-_He	 327
-He	 327
-_be	 324
-j_	 320
-ij_	 320
-u_	 319
-f_	 317
-_di	 316
-;	 315
-_we	 315
-_is_	 314
-rt	 313
-!_	 313
-;_	 312
-n.	 311
-p_	 310
-la	 310
-_wa	 310
-ea	 308
-_u	 308
-pe	 304
-ta	 304
-il	 301
-my	 300
-ig	 300
-n,	 300
-n,_	 298
-iet	 297
-sc	 297
-ter	 296
-sch	 296
-oor	 295
-no	 294
-_my	 293
-n._	 291
-ti	 290
-_zi	 289
-st_	 288
-el_	 283
-gen	 282
-se	 280
-K	 279
-_oo	 278
-ui	 278
-e,	 275
-ten	 274
-net	 274
-oon	 274
-ho	 274
-jn	 273
-e,_	 273
-ijn	 272
-ien_	 272
-ko	 272
-N	 271
-ni	 271
-_N	 269
-den	 269
-za	 268
-_net	 267
-i_	 266
-wol	 266
-een	 264
-va	 264
-am	 264
-do	 263
-ol_	 262
-le_	 261
-_te_	 260
-rd	 260
-ke_	 259
-ey_	 259
-ers	 258
-_K	 255
-_ie	 255
-ver	 254
-to	 254
-_hi	 253
-nde	 253
-:	 253
-der_	 252
-jo	 251
-net_	 251
-al_	 250
-_wol	 250
-_p	 250
-_no	 250
-aar	 248
-_za	 245
-_net_	 245
-nk	 242
-est	 241
-om_	 241
-_va	 241
-ak	 241
-tj	 239
-ae	 238
-_op	 237
-mo	 236
-tr	 236
-_st	 233
-ier_	 233
-_ve	 233
-mm	 232
-T	 231
-eu	 229
-_ze	 228
-:_	 228
-mi	 228
-ag	 227
-zo	 227
-_ko	 226
-vo	 225
-_T	 225
-nne_	 225
-F	 224
-..	 224
-fo	 224
-_F	 223
-en,	 223
-oe_	 222
-wie	 222
-en,_	 221
-kk	 221
-_ien	 220
-on_	 218
-wol_	 218
-_fo	 218
-I	 217
-_do	 216
-eit	 214
-ei_	 214
-mme	 214
-G	 213
-_I	 213
-as_	 213
-or_	 211
-A	 211
-_G	 210
-_A	 210
-lle_	 209
-Da	 208
-_Da	 207
-_wol_	 207
-ren	 206
-_ee	 206
-e.	 205
-van	 205
-jen	 205
-een_	 205
-_van	 204
-kke	 204
-en.	 204
-O	 204
-_vo	 204
-V	 203
-_O	 203
-_V	 203
-ken	 203
-_mo	 203
-ot	 202
-ie_	 201
-ou_	 201
-ur	 201
-tte_	 200
-em	 200
-_van_	 199
-L	 199
-van_	 199
-_zo	 199
-op_	 199
-_L	 197
-iet_	 196
-of	 194
-ten_	 194
-oer	 193
-_ien_	 193
-e._	 193
-oed	 192
-hie	 192
-zy	 191
-en._	 191
-De	 191
-_ver	 191
-_ho	 189
-_De	 189
-oa	 189
-den_	 188
-_zy	 188
-lo	 187
-dan	 187
-nt_	 186
diff --git a/libtextcat/data/new_fingerprints/lm/mingo.lm b/libtextcat/data/new_fingerprints/lm/mingo.lm
deleted file mode 100644
index 4d1947a..0000000
--- a/libtextcat/data/new_fingerprints/lm/mingo.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 3156
-'	 991
-a	 829
-t	 788
-k	 788
-n	 752
-e	 640
-h	 602
-ë	 551
-s	 495
-w	 466
-ö	 422
-y	 403
-u	 397
-'_	 368
-_n	 330
-i	 269
-.	 269
-._	 240
-e'	 238
-ô	 219
-a'	 209
-ne	 209
-e_	 194
-_ne	 184
-wa	 172
-_k	 164
-kw	 162
-á	 154
-e'_	 146
-_t	 145
-'t	 141
-"	 141
-ë'	 134
-ê	 132
-_h	 131
-é	 129
-ak	 129
-ne_	 126
-ta	 123
-_ne_	 123
-at	 121
-u'	 121
-hu	 118
-_u	 108
-ka	 107
-í	 106
-nö	 105
-N	 103
-ö'	 100
-hs	 95
-ha	 95
-te	 94
-ya	 93
-_ë	 92
-kh	 90
-'k	 86
-ú	 85
-æ	 84
-ni	 84
-'.	 84
-wë	 83
-ny	 83
-sh	 80
-_N	 80
-'._	 76
-ö_	 76
-kë	 72
-_"	 71
-ën	 70
-th	 69
-yu	 66
-_w	 66
-ëh	 66
-t_	 66
-ô_	 66
-Ne	 65
-Ne'	 65
-'s	 64
-ne'	 64
-"_	 64
-_.	 63
-_._	 61
-Ne'_	 61
-,	 60
-ne'_	 58
-në	 58
-kwa	 57
-_ne'	 57
-öt	 57
-a't	 57
-ek	 56
-s_	 56
-ët	 55
-i'	 55
-_hu	 54
-T	 54
-ë_	 54
-_s	 54
-_Ne	 53
-të	 53
-tö	 53
-_Ne'	 53
-_ne'_	 53
-ht	 53
--	 53
-ts	 52
-ya'	 52
-ë'_	 51
-_wa	 51
-_Ne'_	 51
-'ö	 50
-íy	 50
-_ka	 50
-as	 50
-ní	 49
-un	 49
-ê_	 49
-ty	 48
-hu_	 48
-ke	 48
-u_	 48
-,_	 47
-yô	 46
-he	 46
-ye	 46
-kê	 45
-si	 45
-nô	 44
-khu	 44
-a'k	 44
-_a	 43
-ák	 43
-wat	 42
-'ë	 42
-nö'	 42
-wá	 42
-aw	 41
-an	 41
-we	 41
-ôt	 41
-i_	 41
-_kh	 41
-tak	 41
-_te	 41
-ik	 41
-_khu	 40
-ës	 40
-yö	 40
-k_	 39
-khu_	 39
-yu'	 38
-hö	 38
-wën	 38
-n-	 38
-ëhs	 38
-_ha	 38
-wa'	 38
-_n-	 37
-sa	 37
-?	 37
-_T	 37
-æ'	 37
-_un	 36
-hô	 36
-wé	 36
-ah	 36
-_khu_	 35
-iy	 35
-ëk	 35
-ut	 35
-ök	 35
-öh	 35
-te'	 35
-u'_	 35
-_kë	 34
-yô_	 34
-ha'	 34
-st	 34
-ti	 34
-ta'	 34
-u't	 33
-ya't	 33
-'t_	 33
-'ö_	 33
-akw	 33
-ôk	 33
-níy	 32
-'ta	 32
-ku	 32
-ui	 32
-_sh	 32
-aa	 31
-én	 31
-ay	 31
-ënö	 31
-â	 30
-se	 30
-tw	 30
-yë	 30
-(_	 29
-_(_	 29
-_)_	 29
-us	 29
-_ëhs	 29
-(	 29
-kö	 29
-_ëh	 29
-ae	 29
-hë	 29
-_)	 29
-)_	 29
-_(	 29
-sy	 29
-)	 29
-ëë	 28
-ôn	 28
-sk	 28
-tá	 28
-té	 28
-tk	 28
-ên	 28
-kê_	 28
-a_	 28
-án	 27
-_huik	 27
-ön	 27
-_hui	 27
-kwé	 27
-huik	 27
-ék	 27
-hui	 27
-uik	 27
-_na	 27
-na	 27
-a'_	 26
-uikê	 26
-_ni	 26
-."	 26
-ææ	 26
-wi	 26
-huikê	 26
-ikê	 26
-nya	 25
-."_	 25
-?"	 25
-të'	 25
-íyu	 25
-awë	 25
-sn	 25
-në_	 24
-ö'_	 24
-ikê_	 24
-ekh	 24
-'ke	 24
-uikê_	 24
-?"_	 24
-tek	 24
-êt	 24
-',	 24
-"N	 23
-_ta	 23
-'a	 23
-hk	 23
-tê	 23
-tsi	 23
-wö	 23
-yu'_	 23
-_"N	 23
-íyu'	 23
-níyu	 23
-a'ta	 23
-é'	 23
-níyu'	 23
-shô	 22
-wëní	 22
-kwa'	 22
-ëní	 22
-kwë	 22
-_u'	 22
-ey	 22
-ëníyu	 22
-K	 22
-ai	 22
-_shô	 22
-úw	 22
-aö	 22
-ëht	 22
-ëníy	 22
-kwe	 22
-wëníy	 22
-_he	 22
-_te'	 21
-ún	 21
-s.	 21
-nöh	 21
-ëö	 21
-_ëk	 21
-'sh	 21
-kë'	 21
-htö	 21
-H	 21
-ata	 21
-U	 20
-'h	 20
-_ha'	 20
-ææ'	 20
-ae_	 20
-a'ke	 20
-ény	 20
-unö	 20
-we'	 20
-wë'	 20
-i'_	 20
-kës	 20
-ya'ta	 19
-es	 19
-awëní	 19
-hô_	 19
-uk	 19
-awën	 19
-hw	 19
-ë'.	 19
-ô'	 19
-tö'	 19
-sé	 19
-ë'ë	 19
-ë'._	 19
-'ëë	 19
-hkw	 19
--a	 19
-twa	 19
-'kw	 18
-he_	 18
-_K	 18
-nöt	 18
-hsa	 18
-hsi	 18
-ôni	 18
-aya	 18
-is	 18
-ëë'	 18
-kæ	 18
-skw	 18
-uw	 18
-',_	 18
-e't	 18
-kææ	 18
-ka'	 18
-nae	 17
-shô_	 17
-sat	 17
-niy	 17
-ëts	 17
-ath	 17
-ye'	 17
-í_	 17
-'ëë'	 17
-'u	 17
-_ët	 17
-ës_	 17
-_kës	 17
-_y	 17
-kak	 17
-ö'ö	 17
-kat	 17
-_th	 17
-'ë_	 17
-út	 17
-u'k	 17
-_H	 17
-tekh	 17
-s._	 17
-wê	 17
-_nae	 17
-kwá	 17
-_shô_	 17
-yê	 17
-öte	 16
-sha	 16
-ke_	 16
-k.	 16
-si'	 16
-hö'	 16
-yá	 16
-hta	 16
-kn	 16
-_nae_	 16
-hse	 16
-ké	 16
-ë'ë_	 16
-unë	 16
-nya'	 16
-nae_	 16
-nê	 16
-á'	 16
-ás	 16
-tô	 16
-a's	 16
-a'u	 16
diff --git a/libtextcat/data/new_fingerprints/lm/mongolian_cyrillic.lm b/libtextcat/data/new_fingerprints/lm/mongolian_cyrillic.lm
deleted file mode 100644
index 7ac690c..0000000
--- a/libtextcat/data/new_fingerprints/lm/mongolian_cyrillic.lm
+++ /dev/null
@@ -1,363 +0,0 @@
-_	77671
-о	60289
-г	57097
-ө	51540
-л	41421
-а	40332
-р	35484
-х	31764
-н	31695
-д	30802
-э	29381
-и	28336
-ү	26898
-й	25901
-у	21671
-т	21639
-с	21118
-ч	19759
-оо	12185
-м	12159
-өө	11964
-ц	11468
-гү	10443
-үй	10090
-чи	9604
-н_	9584
-гүй	9529
-в	9133
-_х	8958
-й_	8712
-ор	8462
-з	8134
-г_	8106
-ий	8078
-өр	7638
-б	7524
-ол	7372
-ээ	6997
-_т	6942
-уу	6908
-их	6787
-йг	6584
-ог	6380
-го	6337
-чих	6301
-өл	6221
-_о	6219
-д_	6092
-_ө	6085
-үү	5978
-р_	5841
-гө	5674
-ш	5656
-өг	5647
-_б	5547
-аа	5471
-он	5259
-_з	5115
-гэ	5047
-нг	5025
-хө	4840
-хо	4806
-ж	4794
-ар	4704
-л_	4687
-до	4578
-ал	4489
-йн	4345
-е	4326
-өн	4232
-э_	4191
-дө	4122
-лг	4089
-то	4085
-ан	4062
-чх	4039
-а_	3970
-о_	3935
-үйг	3903
-ул	3888
-гүйг	3887
-га	3756
-_с	3746
-_ц	3600
-ээ_	3567
-гээ	3545
-аг	3529
-гч	3515
-со	3502
-ы	3455
-цг	3441
-ө_	3396
-лд	3389
-ха	3367
-ла	3290
-оо_	3290
-ло	3281
-ги	3278
-с_	3252
-х_	3249
-ийн	3227
-эр	3212
-ро	3204
-_д	3176
-_м	3157
-өө_	3138
-рч	3048
-йгэ	3033
-йн_	3031
-йгээ	3027
-сө	3006
-үл	2995
-үйгэ	2931
-үйгээ	2931
-гүйгэ	2929
-та	2922
-үй_	2876
-йг_	2861
-_г	2851
-гүй_	2831
-тэ	2816
-ай	2795
-гоо	2759
-да	2724
-уул	2723
-рд	2687
-ос	2650
-аа_	2642
-гөө	2602
-рг	2598
-эг	2567
-эй	2566
-гий	2547
-эл	2546
-_ш	2543
-дг	2513
-рө	2478
-ли	2469
-лө	2462
-_а	2461
-ох	2455
-эй_	2448
-к	2440
-ийг	2425
-тө	2423
-ур	2418
-үүл	2406
-оро	2401
-_хо	2378
-өх	2370
-лч	2367
-_хө	2359
-од	2253
-өс	2252
-ра	2246
-_то	2227
-_н	2215
-лэ	2177
-т_	2162
-лц	2141
-өрө	2123
-онг	2044
-өөр	2037
-ийн_	2022
-_ор	2015
-са	2014
-зо	1998
-хг	1989
-_өр	1989
-ин	1981
-нх	1972
-ов	1970
-я	1960
-гд	1959
-дог	1959
-хгү	1951
-хгүй	1948
-цо	1931
-ма	1925
-үр	1920
-лт	1919
-өнг	1896
-нд	1895
-дөг	1882
-ил	1878
-оол	1876
-оор	1871
-уд	1867
-ийг_	1864
-ба	1859
-на	1852
-_у	1850
-мо	1818
-зө	1816
-өөл	1813
-хи	1810
-өд	1804
-мө	1794
-хд	1790
-өв	1772
-_ү	1767
-эн	1758
-в_	1757
-дэ	1757
-сон	1745
-_зо	1734
-_тө	1728
-цө	1726
-тэй	1722
-но	1719
-ам	1716
-эр_	1707
-оос	1697
-ц_	1696
-ав	1681
-дч	1680
-дчи	1668
-_зө	1665
-өөс	1645
-нгү	1634
-сөн	1631
-дчих	1631
-тэй_	1623
-хөө	1610
-йл	1600
-ээр	1583
-рл	1572
-гу	1569
-хэ	1565
-рчи	1555
-эс	1543
-ши	1514
-жи	1503
-ь	1492
-гээ_	1481
-_ха	1478
-гийн	1477
-ихд	1476
-цго	1474
-_цо	1470
-оог	1470
-цгоо	1466
-өөг	1465
-чихд	1464
-хоо	1463
-ри	1457
-ан_	1447
-ай_	1440
-ой	1438
-ни	1428
-ээр_	1427
-лий	1417
-нгүй	1410
-үд	1402
-цгө	1402
-цгөө	1400
-_цө	1396
-ын	1383
-_ба	1378
-гг	1372
-оч	1372
-ггү	1368
-ггүй	1368
-өгч	1353
-ом	1350
-иг	1335
-огч	1320
-нө	1313
-ууд	1312
-хс	1300
-сэ	1298
-йд	1296
-ар_	1289
-рэ	1288
-ас	1287
-ад	1282
-ч_	1280
-ж_	1278
-аг_	1271
-өч	1269
-_э	1268
-сн	1268
-ху	1267
-роо	1266
-ыг	1260
-ыг_	1253
-лгү	1251
-гт	1249
-эс_	1246
-_ол	1238
-чд	1230
-рөө	1223
-бу	1220
-йнх	1203
-ээс	1203
-ын_	1201
-бо	1196
-ид	1194
-ийнх	1188
-гчи	1184
-ороо	1181
-рс	1179
-ат	1174
-осо	1170
-ихс	1168
-дги	1166
-дгий	1166
-чихс	1158
-ах	1155
-ээс_	1154
-ту	1153
-уг	1152
-лгүй	1150
-_бу	1139
-тү	1129
-_өл	1129
-өрч	1124
-цоо	1121
-лз	1119
-нго	1119
-гц	1110
-өрөө	1100
-йгээ_	1098
-нэ	1096
-ор_	1094
-онго	1090
-за	1089
-оло	1087
-от	1085
-лчи	1079
-ал_	1066
-өлг	1066
-гээр	1063
-олг	1062
-хү	1060
-цөө	1059
-тл	1054
-_ху	1054
-_мө	1052
-чхө	1050
-он_	1047
-үүд	1046
-гээр_	1046
-лу	1040
-аар	1036
-п	1026
-рх	1025
-рчих	1024
-лс	1021
-йгээр	1020
-гчд	1019
-эв	1016
-вл	1014
-лчх	1014
-орд	1013
-орч	1013
-ихг	1012
-ихгү	1012
-ихгүй	1012
-йт	1010
-нгө	1008
-йд_	1005
-өнгө	1004
diff --git a/libtextcat/data/new_fingerprints/lm/nepali.lm b/libtextcat/data/new_fingerprints/lm/nepali.lm
deleted file mode 100644
index 5d35076..0000000
--- a/libtextcat/data/new_fingerprints/lm/nepali.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 7044
-f	 2698
-]	 1196
-g	 933
-s	 815
-l	 781
-/	 698
-;	 662
-k	 645
-d	 635
-]_	 630
-f_	 611
-sf	 549
-f]	 541
-n	 526
-t	 460
-o	 412
-j	 399
-f]_	 374
-L	 365
-_;	 364
-x	 356
-_k	 353
-{	 337
-b	 323
-u	 321
-'	 303
-df	 299
-sf]	 290
-_l	 283
-sf]_	 265
-g]	 245
-G	 232
-e	 231
-|	 227
-a	 222
-/_	 222
-L_	 211
-_g	 210
-c	 207
-df_	 207
-{_	 207
-_c	 201
-g_	 201
-kf	 184
-f/	 177
-_u	 171
-/f	 168
-P	 163
-_/	 162
-k|	 161
-_s	 161
-}	 159
-+	 158
-h	 151
-fn	 150
-n]	 145
-of	 141
-tf	 140
-:	 136
-p	 136
-t_	 134
-.	 133
-_k|	 133
-._	 133
-_e	 131
-_d	 131
-_f	 129
-_._	 127
-_.	 127
-n]_	 123
-;f	 119
-lj	 118
-O	 118
-?	 118
-q	 118
-nf	 118
-y	 116
-_a	 113
-m	 111
-Ps	 110
-r	 110
-fg	 106
-w	 105
-sf_	 103
-lg	 102
-g]_	 100
-gf	 94
-_g]	 91
-Psf	 90
-x?	 89
-fd	 88
-fO	 88
-_lj	 85
-]s	 85
-z	 85
-s_	 84
-_p	 82
-_sf	 80
-D	 79
-kl	 78
-_;f	 78
-f/_	 77
-cf	 77
-}_	 76
-Psf]	 76
-jf	 76
-,	 75
-fl	 75
-\	 75
-_x	 74
-kfn	 74
-f{	 74
-_/f	 74
-]k	 73
-of]	 73
-,_	 72
-v	 72
-lt	 72
-_cf	 72
-_b	 71
-O{	 70
-i	 69
-xf	 68
-]kf	 68
-_/_	 68
-Psf]_	 68
-_h	 67
-g]kfn	 67
-g]k	 67
-d_	 67
-g]kf	 67
-O{_	 67
-]kfn	 67
-_g]k	 66
-g'	 66
-_g]kf	 66
-o_	 64
-"	 64
-;b	 63
-Gq	 63
-f+	 63
-n_	 63
-fk	 62
-sf/	 62
-/L	 62
-_kl	 62
-I	 61
-T	 61
-/s	 61
-If	 61
-dG	 60
-_j	 60
-]sf	 60
-;_	 59
-u_	 59
-yf	 59
-dGq	 58
-fO{	 58
-af	 57
-eP	 57
-fs	 57
-fO{_	 57
-fj	 56
-f;	 56
-qL	 56
-l/	 55
-\_	 55
-;D	 54
-dGqL	 54
-GqL	 54
-;+	 53
-g\	 53
-/sf	 52
-nfO	 51
-_kf	 51
-ug	 51
-pg	 51
-:t	 51
-fp	 50
-_ug	 50
-u/	 50
-lg_	 49
-ePs	 49
-fdf	 48
-cl	 48
-nfO{_	 48
-nfO{	 48
-;/	 48
-_cl	 47
-F	 47
-'/	 47
-g\_	 47
-_r	 47
-fo	 47
-_eP	 47
-]{	 46
-Z	 46
-/L_	 46
-_f_	 45
-ePsf	 45
-gd	 45
-_;D	 45
-if	 45
-Gb	 44
-lb	 44
-Q	 44
-_n	 44
-fsf	 44
-]sf]	 43
-+;	 43
-nL	 43
-lx	 43
-_t	 43
-_:	 42
-+;b	 42
-_o	 42
-fdf_	 42
-bf	 42
-hf	 42
-_lg	 42
-ePsf]	 41
-j_	 41
-ln	 41
-ef	 41
-/]	 41
-_df	 41
-To	 40
-klg_	 40
-_klg_	 40
-]sf]_	 40
-klg	 40
-_klg	 40
-_u/	 40
-f{_	 40
-_ePs	 40
-'g	 40
-Gg	 39
-:y	 39
-_g\	 39
-f}	 39
-kf_	 39
-:tf	 38
-]{_	 38
-fpg	 38
-b'	 38
-hg	 38
-g]{	 38
-jZ	 38
-_;+	 37
-gs	 37
-wf	 37
-o{	 37
-GqL_	 37
-l_	 37
-qL_	 37
-dGqL_	 37
-gf_	 37
-];	 37
-_ePsf	 36
-x'	 36
-?_	 36
-!	 36
-fx	 35
-u|	 34
-;d	 34
-_lb	 34
-fn_	 34
-_P	 34
-fg_	 34
-=	 34
-bn	 34
-Zj	 34
-o;	 34
-g]{_	 34
-_g\_	 34
-kIf	 33
-dl	 33
-kI	 33
-ljZj	 33
-jZj	 33
-rf	 33
-+u	 33
-]d	 33
-ljZ	 33
-nL_	 32
-f+;	 32
-fnL	 32
-gL	 32
-;/sf	 32
-tf_	 32
-wfg	 32
-_;/	 32
-Qm	 32
-fb	 32
-f;_	 32
-ld	 32
-;/sf/	 32
-/sf/	 32
-_x'	 32
-;/s	 32
-;f+	 32
-_;f+	 32
-fu	 32
-x?_	 32
-;f+;	 31
-_k|:t	 31
-s'	 31
-_kI	 31
-_k|:	 31
-of]_	 31
-_kIf	 31
-_;f+;	 31
-]l	 31
-k|:	 31
-bg	 31
-_;/s	 31
-|:	 31
-f+;b	 31
-_;/sf	 31
-|:t	 31
-|]	 31
-k|:t	 31
-m_	 31
-;f+;b	 31
-Jo	 30
-k|wf	 30
-|w	 30
-|wf	 30
-k|w	 30
-km	 30
-J	 30
-k|wfg	 30
-|wfg	 30
-]t	 30
-@	 30
-;f]	 30
-b_	 29
->	 29
-kfn_	 29
-fn]	 29
-gsf	 29
-sf+	 29
-Zjf	 29
-]kfn_	 29
-jif	 29
-ji	 29
-jf;	 29
-_k|w	 29
-fgd	 29
-_k|wf	 29
-Zjf;	 29
-ljZjf	 28
-jZjf;	 28
-]n	 28
-_z	 28
-_s'	 28
-_dG	 28
-|];	 28
-_;d	 28
-jZjf	 28
-u|]	 27
-gdGq	 27
-gdG	 27
-?n	 27
-x'g	 27
-|wfgd	 27
-wfgd	 27
-gdGqL	 27
-+u|]	 27
-f+u	 27
-fgdG	 27
-u|];	 27
-+u|];	 27
-wfgdG	 27
-dfg	 27
-a}	 27
-_dGq	 27
-f+u|	 27
-fgdGq	 27
-sf+u|	 27
-_sf+u	 27
-f+u|]	 27
-+u|	 27
-sf+u	 27
-_sf+	 27
-x?n	 27
-S	 26
-_To	 26
-]kfnL	 26
-_!	 26
-_T	 26
-ul	 26
-/f]	 26
-fsf]	 26
-af_	 26
-;s	 26
-kfnL	 26
-|:tf	 26
-k|:tf	 26
diff --git a/libtextcat/data/new_fingerprints/lm/norwegian.lm b/libtextcat/data/new_fingerprints/lm/norwegian.lm
deleted file mode 100644
index f2c3cec..0000000
--- a/libtextcat/data/new_fingerprints/lm/norwegian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 22970
-e	 6833
-n	 4206
-r	 3516
-t	 3112
-a	 2587
-s	 2440
-i	 2112
-l	 1901
-o	 1900
-n_	 1875
-r_	 1761
-k	 1713
-g	 1630
-en	 1615
-m	 1508
-e_	 1450
-d	 1444
-er	 1436
-h	 1306
-t_	 1300
-_h	 1180
-_s	 1148
-er_	 1105
-v	 982
-en_	 976
-an	 919
-.	 901
-._	 791
-_.	 781
-et	 770
-g_	 762
-_._	 726
-å	 725
-u	 719
-f	 709
-p	 702
-ha	 682
-_ha	 672
-de	 657
-te	 651
-_e	 621
-et_	 614
-re	 581
-ne	 565
-_o	 554
-an_	 544
-ke	 534
-_,	 522
-,_	 522
-,	 522
-_,_	 522
-_f	 519
-_m	 515
-or	 503
-_d	 483
-_i	 480
-å_	 479
-se	 476
-m_	 469
-nn	 454
-b	 449
-me	 441
-ø	 434
-_a	 413
-st	 404
-_t	 398
-og	 380
-_v	 377
-_og	 366
-ar	 364
-el	 364
-le	 361
-i_	 356
-om	 353
-og_	 351
-_og_	 351
-li	 350
-_k	 346
-_de	 339
-ge	 339
-han	 337
-y	 333
-_han	 332
-ve	 330
-kk	 323
-in	 311
-_b	 307
-fo	 301
-j	 301
-il	 298
-_H	 291
-H	 291
-han_	 288
-_han_	 288
-for	 287
-ik	 281
-l_	 278
-kke	 277
-tt	 276
-ti	 270
-ne_	 270
-d_	 269
-ed	 269
-om_	 268
-nne	 266
-_me	 264
-ng	 257
-_er	 257
-_fo	 256
-eg	 256
-_se	 256
-_g	 256
-un	 255
-ig	 255
-sk	 253
-_er_	 252
-_p	 252
-_for	 250
-ke_	 249
-_n	 238
-_l	 233
-al	 232
-ør	 222
-s_	 221
-ar_	 215
-at	 214
-_en	 211
-he	 211
-pe	 209
-_i_	 208
-am	 200
-es	 200
-si	 200
-enn	 197
-det	 195
-or_	 193
-vi	 190
-ns	 189
-ikk	 188
-det_	 185
-so	 185
-un_	 183
-il_	 181
-nd	 181
-te_	 181
-"_	 180
-"	 180
-_"_	 180
-_"	 180
-em	 179
-_ti	 176
-kke_	 176
-lig	 174
-ten	 174
-Ha	 173
-_Ha	 173
-re_	 172
-ikke	 168
-je	 165
-Han	 165
-ter	 165
-_Han	 165
-eg_	 164
-på	 164
-_på	 163
-_si	 163
-_å	 163
-_Han_	 162
-Han_	 162
-på_	 162
-_på_	 161
-til	 160
-som	 160
-_so	 159
-den	 159
-_det	 157
-ed_	 155
-ll	 155
-_ik	 155
-rt	 155
-som_	 153
-ra	 152
-a_	 152
-har	 152
-nt	 152
-de_	 152
-tr	 151
-v_	 151
-_har	 151
-ka	 151
-ig_	 150
-_som	 150
-for_	 150
-_som_	 150
-_en_	 149
-hu	 149
-_ikk	 148
-_ham	 148
-ham	 148
-ste	 148
-_det_	 148
-_ikke	 148
-enne	 148
-ikke_	 148
-har_	 147
-nge	 147
-D	 147
-_har_	 147
-_D	 147
-am_	 147
-ere	 147
-ham_	 146
-_ham_	 146
-it	 145
-_he	 144
-_til	 144
-av	 143
-va	 140
-men	 140
-år	 140
-_ve	 140
-_hu	 139
-ta	 139
-pen	 137
-sp	 137
-_st	 135
-tte	 135
-la	 135
-_E	 133
-E	 133
-den_	 130
-is	 130
-til_	 128
-_r	 128
-tt_	 128
-år_	 127
-k_	 124
-_å_	 124
-ri	 124
-_til_	 124
-at_	 123
-ene	 123
-seg	 123
-_av	 123
-med	 122
-_vi	 122
-_seg	 122
-seg_	 121
-_seg_	 121
-_for_	 120
-nne_	 120
-ut	 120
-_u	 119
-mm	 119
-mme	 119
-De	 118
-_De	 118
-_at	 118
-_hun	 117
-hun	 117
-ko	 117
-be	 116
-_at_	 115
-ter_	 115
-pen_	 114
-ker	 113
-hun_	 113
-_hun_	 113
-on	 111
-lig_	 111
-..	 110
-hen	 107
-_med	 107
-rs	 106
-ser	 106
-med_	 105
-_men	 104
-_hen	 104
-_sk	 104
-_med_	 104
-ak	 103
-ans	 103
-ker_	 102
-av_	 101
-_ka	 101
-no	 100
-ver	 100
-ler	 99
-J	 99
-spe	 99
-ten_	 99
-_J	 99
-ene_	 98
-ld	 98
-hv	 98
-_av_	 98
-ger	 97
-ni	 96
-gen	 96
-ie	 95
-ser_	 94
-_et	 94
-spen	 94
-_hv	 94
-men_	 93
-Espe	 92
-Es	 92
-_Esp	 92
-_Es	 92
-_Espe	 92
-Esp	 92
-_al	 92
-Espen	 92
-lle	 89
-rem	 89
-id	 89
-fø	 89
-ei	 88
-inn	 88
-rd	 88
-enne_	 88
-_henn	 87
-henne	 87
-henn	 87
-kt	 86
-spen_	 86
-_om	 86
-ler_	 86
-da	 86
-ett	 86
-itt	 86
-bl	 85
-to	 85
-_Je	 84
-ger_	 84
-Je	 84
-æ	 84
-ma	 83
-ing	 83
-ær	 83
-ns_	 83
-eli	 82
-ang	 82
-_be	 82
-så	 82
-_den	 82
-pp	 81
-rk	 81
-dr	 81
-oe	 81
-ss	 81
-_fø	 80
-ek	 80
-le_	 79
-_no	 79
-kj	 78
-elig	 78
-nes	 78
-nn_	 77
-nk	 77
-fr	 77
-sl	 77
-my	 77
-kan	 77
-så_	 76
-as	 76
-_om_	 76
-_kan	 75
-_ko	 75
-_bl	 73
-Hu	 73
-nen	 73
-_Hu	 73
-eng	 73
-gj	 73
-rt_	 72
-ge_	 72
-ba	 72
-lv	 71
-rer	 71
-nde	 71
-ls	 70
-lo	 70
-ga	 70
-_noe	 70
-ro	 70
-_den_	 70
-_ut	 70
-noe	 70
-Hun	 69
-Hun_	 69
-_in	 69
-_Hun	 69
-_Hun_	 69
-ren	 68
-øre	 68
-ør_	 68
-sen	 68
-sa	 67
diff --git a/libtextcat/data/new_fingerprints/lm/persian.lm b/libtextcat/data/new_fingerprints/lm/persian.lm
deleted file mode 100644
index 858f468..0000000
--- a/libtextcat/data/new_fingerprints/lm/persian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 12318
-?	 5938
-¤	 2613
-?_	 1815
-¢	 1745
-þ	 1569
-ø	 1546
-õ	 1422
--	 1333
-÷	 1155
-ù	 991
-¨	 841
-_ù	 778
-ö	 761
-î	 693
-ü	 664
-_ö	 663
-ª	 660
-¤?	 631
-õ_	 624
-_?	 601
-?¤	 598
-¥	 589
-_¤	 565
-??	 564
-ý	 513
-¢_	 486
-_ü	 473
-_ý	 469
-þ?	 459
-û	 428
-ø_	 427
-_¢	 398
-î_	 392
-ó	 390
-ê	 384
-ö?	 379
-÷?	 361
-_ø	 337
-_-	 334
->	 327
-ú	 324
-_ö?	 319
-ù?	 313
-_ø_	 308
-ð	 305
-¤¢	 303
-¤_	 297
-?õ	 290
-¨?	 285
-¢÷	 272
--_	 271
-S	 266
-_ù?	 265
-ô	 259
--¨	 255
-¡	 255
-??_	 255
-ý?	 254
-¥?	 250
-Y	 246
-¤¢_	 245
-ì	 243
-_ý?	 238
-?¢	 234
-_¥	 229
-ò	 229
-_S	 228
-¤ø	 216
-ø¤	 215
-?þ	 215
-?¨	 214
-_¤¢	 214
-ñ	 208
-þ?_	 207
-¢¤	 203
-?-	 202
-_ô	 199
-ù?_	 199
-öþ	 195
-¨_	 190
-¨?_	 190
-_??	 189
-õ?	 188
-.	 188
-_¤¢_	 185
-_ñ	 183
-?ø	 181
-_öþ	 180
-¢?	 177
-*	 176
-÷_	 176
-_ù?_	 174
-?û	 173
-¤þ	 172
-ª_	 170
-þõ	 164
-ä	 161
-¯	 158
--¨?	 156
-û_	 155
-¤?_	 155
-_¥?	 152
-üõ	 151
-ý¤	 150
-_¤?	 146
-¥?_	 144
-þ¤	 143
-¢ø	 141
-?¤_	 140
-*_	 138
-ü÷	 137
-?÷	 136
-¬	 133
-ùî	 132
-_ý¤	 131
--ª	 131
-ø?	 130
-?ú	 129
-_.	 129
-þó	 129
-¡_	 128
-ù¢	 124
-¤õ	 121
-¤-	 120
-ùî_	 120
-_ùî	 120
-_??_	 119
-ª?	 119
--¨?_	 119
-ã	 118
--?	 118
->_	 116
-öþ?	 114
-ê_	 111
-¢þ	 109
-_¥?_	 109
-_ü÷	 109
-_ùî_	 108
-_öþ?	 107
-ö?¤	 107
-©	 106
-_¢÷	 106
-.¢	 104
-?¥	 103
-_?¤	 103
-¤ê	 103
-ó?	 103
-þ¢	 103
-ñ?	 102
-ªî	 100
-?î	 100
-?¤?	 98
-ð_	 98
-ý?û	 96
-¤ú	 95
-öþ?_	 95
-_©	 94
-§	 94
-Y_	 94
-_ö?¤	 93
-_ý?û	 93
-¥ø	 92
-øª	 91
-_ñ?	 91
-_öþ?_	 91
-?¨_	 90
-÷?_	 90
-óþ	 90
-õ?_	 90
-ü-	 90
-øõ	 89
-:	 89
-ªî_	 88
-ü÷?	 88
-öø	 88
-_ù¢	 87
--ê	 86
-þ÷	 85
-_öø	 83
-,	 82
-þõ_	 82
-þ¨	 82
-?¢_	 80
-®	 80
-?¤þ	 79
-_ü÷?	 79
-¢ª	 77
-???	 77
-øþ	 76
-_-?	 75
-÷î	 75
-?ª	 75
-?ì	 75
-¤î	 74
-_¤ø	 73
-ä_	 73
-þóþ	 73
-û?	 73
-óþõ	 72
-þóþõ	 71
-ù¤	 71
-?>	 71
-ê?	 70
-_?¤_	 70
-_.¢	 70
-ø¡	 69
-à	 69
-_§	 68
-¥ø¤	 68
-þóþõ_	 67
-_ü-	 67
-¤øª	 67
-óþõ_	 67
-õû	 67
-¤ê_	 67
-¨õ	 67
-¤õ_	 66
-?-_	 65
-ù÷	 65
-ý?¤	 65
-öøþ	 64
-¤þ?	 64
-¬_	 64
-?ð	 63
-?-¨	 63
-ø-	 63
-_ý?¤	 62
-ø?_	 62
-ø¤_	 62
-_-¨	 61
-õþ	 61
-øþóþõ	 60
-øþóþ	 60
-øþó	 60
-?ù	 60
-øªî	 60
-_¢ø	 60
-¤øªî	 60
-_öøþ	 60
--ª?	 60
-ì_	 60
-¨¤	 60
-ý¤?	 60
-÷þ	 59
-öøþóþ	 59
-¯?	 59
-_¢?	 59
-öøþó	 59
-¢ª_	 59
-¤??	 58
-¤?¥	 58
-_üõ	 58
-.-	 58
-?¡	 58
-ø÷	 57
-í	 57
-¢¤î	 57
-?¤?_	 57
-þ?¤	 57
-ù-	 57
-üõ_	 56
-ñ?¨	 56
-øõ_	 56
-?¤þ?	 56
-ú?	 56
-î¤	 56
-¤?¢	 56
-õû_	 55
-ô?	 55
-ª?¢	 55
-_öøþó	 55
--ª?¢	 55
-þ_	 55
-ö?¤þ	 55
-¤î_	 55
-S¤	 55
-üþ	 54
-_S¤	 53
-øªî_	 53
-_ù¤	 53
-ò¢	 53
-¤ò	 53
-¤øªî_	 53
-ø¡_	 52
-¢÷?	 52
-û¤	 52
-üþ?	 52
-õ>	 52
--õ	 52
-¢¤?	 52
-üð	 52
-ì?	 52
-_í	 52
-î?	 52
-üó	 52
-??¤	 52
-ð÷	 51
-¤ò¢	 51
--þ	 51
-_ý¤?	 51
-¡?	 50
-_¢¤	 50
-¢¤î_	 50
-.-¨	 50
-ö?õ	 50
-ë	 50
-_ô?	 50
-ø¢	 50
-_ñ?¨	 49
-.¢÷	 49
-÷¤	 49
-ý?¤?	 49
-ú-	 48
-_üð	 48
-_ö?¤þ	 48
-¤þ?_	 48
-ò¢_	 48
-ûù	 48
-ú?_	 48
-¤ò¢_	 47
-ê¤	 47
-â	 47
-.-¨?	 47
-_¢þ	 47
->÷	 47
-úª	 47
-÷?õ	 47
-£	 47
-?¤þ?_	 47
-?ûù	 47
-¤¯	 46
-_.-	 46
-_ý?¤?	 46
-õ¤	 46
-õó	 46
--¤	 46
-_üþ	 46
-¥þ	 46
-¤ð	 45
-ôþ	 45
-_üó	 45
-ö?-	 45
-§þ	 45
-_ë	 45
-f	 45
-õ-	 44
-_ù-	 44
-úõ	 44
-_üþ?	 44
-ü-ª	 44
--î	 44
-ð¢	 44
-ö?¤þ?	 44
-õª	 44
-.-¨?_	 44
-¨õ_	 44
-¤ª	 44
-_-¨?	 44
-¤?î	 43
-ä?	 43
-é	 43
-?õ_	 43
-_¤øªî	 43
-þª	 43
-?ê	 43
-?î_	 43
-_¤øª	 43
-¯_	 43
-¤¨	 43
-þ??	 42
-Y?	 42
-¥_	 42
-÷÷	 42
-÷õ	 42
-_¥ø	 42
-þ¨?	 42
-¢õ	 42
-/	 42
-_â	 42
-???_	 42
-_¥ø¤	 42
-_ù÷	 42
-s	 42
-¢÷÷	 42
-ö?-¨	 41
-÷ø	 41
-ù÷?	 41
-?*	 41
-S¤ò¢	 41
-_ö?õ	 41
-ñþ	 41
-_.-¨	 41
-îþ	 41
-÷¢	 41
-ùõ	 41
-S¤ò	 41
-ªø	 41
-ý?¤?_	 40
-¤úª	 40
diff --git a/libtextcat/data/new_fingerprints/lm/polish.lm b/libtextcat/data/new_fingerprints/lm/polish.lm
deleted file mode 100644
index eac3b27..0000000
--- a/libtextcat/data/new_fingerprints/lm/polish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 31480
-a	 7945
-i	 7766
-e	 7462
-o	 6838
-z	 5104
-n	 5077
-r	 4178
-w	 4139
-s	 3596
-c	 3580
-y	 3569
-t	 3381
-d	 3027
-k	 2819
-p	 2639
-m	 2494
-ie	 2484
-u	 2016
-l	 1947
-j	 1932
-ni	 1930
-e_	 1746
-_p	 1712
-³	 1649
-a_	 1496
-o_	 1431
-,	 1368
-,_	 1366
-b	 1296
-_w	 1257
-g	 1249
-i_	 1140
-.	 1118
-_s	 1045
-ze	 1041
-._	 1035
-_n	 997
-nie	 958
-cz	 956
-rz	 952
-h	 950
-_z	 933
-ê	 918
-ow	 911
-ie_	 902
-y_	 899
-na	 885
-ch	 871
-po	 864
-pr	 863
-wi	 851
-st	 847
-¿	 835
-±	 832
-an	 814
-ó	 800
-ra	 778
-zy	 766
-ia	 726
-za	 718
-_t	 699
-wa	 692
-ro	 692
-_d	 683
-_pr	 675
-¶	 661
-w_	 658
-sz	 652
-_po	 649
-_o	 628
-m_	 613
-li	 613
-dz	 611
-ki	 611
-en	 609
-mi	 593
-ta	 571
-ci	 564
-ej	 562
-nie_	 558
-_m	 553
-_k	 549
-ar	 543
-go	 541
-_i	 540
-em	 532
-od	 525
-yc	 520
-a³	 511
-rze	 508
-do	 504
-eg	 503
-ko	 502
-ac	 482
-to	 478
-_na	 467
-_ni	 467
-h_	 466
-ch_	 466
-æ	 465
-iê	 461
-_b	 458
-on	 458
-u_	 458
-zi	 454
-ka	 450
-er	 448
-sk	 447
-si	 447
-wy	 444
-te	 437
-ak	 434
-ê_	 431
-_j	 429
-je	 429
-z_	 427
-ny	 422
-aw	 422
-ne	 420
-ów	 418
-_w_	 415
-_c	 414
-ego	 412
-prz	 412
-_r	 410
-al	 407
-³a	 405
-"	 405
-re	 405
-es	 401
-_nie	 396
-dzi	 394
-ty	 389
-j_	 380
-ic	 380
-_prz	 379
-ad	 367
-ej_	 364
-le	 359
-æ_	 358
-ed	 354
-ych	 346
-_za	 346
-_do	 344
-zn	 344
-go_	 344
-ani	 343
-_i_	 342
-no	 339
-or	 337
-³o	 336
-tr	 334
-P	 330
-os	 329
-am	 329
-da	 328
-ec	 327
-ol	 325
-±_	 325
-by	 322
-ego_	 321
-at	 321
-¿e	 319
-ym	 317
-wie	 314
-³_	 312
--	 310
-na_	 309
-_si	 303
-W	 301
-as	 301
-wo	 300
-pa	 299
-siê	 295
-nia	 293
-owa	 292
-o¶	 286
-_P	 283
-el	 282
-_siê	 279
-ja	 278
-rzy	 276
-prze	 276
-_wy	 275
-iê_	 269
-in	 267
-_-	 267
-de	 267
-kie	 267
-dn	 264
-ob	 262
-_u	 261
-ych_	 260
--_	 258
-ez	 257
-_-_	 256
-¶c	 255
-ws	 255
-¶ci	 254
-em_	 253
-_siê_	 253
-siê_	 253
-_nie_	 253
-kt	 252
-ski	 252
-we	 251
-_g	 251
-_W	 250
-t_	 249
-_prze	 249
-_je	 248
-aj	 247
-_a	 247
-¿e_	 246
-_¿	 244
-ia_	 243
-eni	 241
-om	 240
-la	 240
-k_	 235
-mo	 235
-f	 234
-pi	 232
-is	 231
-cze	 231
-_z_	 230
-ñ	 228
-nt	 227
-ce	 224
-sta	 221
-ry	 220
-ma	 219
-cj	 219
-zie	 218
-ek	 216
-oc	 213
-dy	 212
-owi	 208
-sp	 208
-K	 208
-tó	 205
-_"	 204
-ud	 203
-S	 202
-ier	 202
-pra	 202
-czn	 201
-ys	 200
-nia_	 199
-j±	 198
-_¿e	 196
-oz	 194
-N	 192
-zo	 191
-dzie	 190
-ku	 190
-ów_	 189
-czy	 189
-_mi	 188
-_¿e_	 187
-mie	 186
-do_	 186
-iej	 185
-ym_	 185
-_do_	 184
-cy	 184
-_pa	 183
-y³	 182
-_na_	 181
-zy_	 181
-ew	 180
-_l	 180
-_cz	 178
-_by	 178
-ru	 177
-to_	 175
-±c	 175
-_wi	 175
-ln	 174
-_K	 171
-ok	 170
-ot	 170
-raw	 169
-nych	 168
-nyc	 168
-az	 168
-ik	 167
-bi	 167
-i,_	 166
-i,	 166
-_te	 165
-tu	 163
-wan	 163
-et	 162
-J	 162
-ór	 161
-cie	 160
-_od	 160
-ba	 160
-oj	 159
-o¶c	 158
-i³	 158
-_ro	 158
-og	 158
-mu	 158
-A	 158
-o¶ci	 158
-d_	 157
-tw	 156
-io	 155
-gr	 155
-_J	 155
-_N	 155
-_to	 155
-us	 155
-¿_	 154
-aæ	 154
-ach	 154
-yd	 153
-_kt	 153
-_ko	 152
-_st	 152
-pow	 151
-yt	 150
-kr	 149
-_S	 149
-a³_	 149
-ak_	 149
-li_	 148
-T	 148
-ur	 148
-sa	 148
-op	 147
-yw	 147
-ent	 147
-bo	 146
-_sp	 145
-O	 145
-a,_	 144
-a,	 144
-iem	 144
-któ	 143
-praw	 143
-wn	 142
-tór	 142
-i±	 141
-³y	 141
-zu	 141
-dni	 140
-im	 139
-icz	 139
-ró	 139
-³e	 138
-któr	 137
-my	 137
-est	 136
-awi	 135
-przy	 134
-nych_	 134
-e,_	 132
-e,	 132
-ki_	 132
-pro	 131
-_któ	 131
-_któr	 131
-_przy	 130
-_ja	 129
-szy	 127
-ia³	 127
-Po	 127
-ania	 127
-M	 126
-ze_	 125
-ne_	 125
-ñs	 124
-_ty	 124
-sze	 124
-a¿	 124
-nn	 124
-pod	 124
-aæ_	 122
-B	 122
-za_	 122
-cza	 122
-³o_	 122
-Z	 122
-_to_	 121
-iu	 120
-zc	 119
-esz	 119
-skie	 118
-i.	 118
-_ka	 117
-so	 117
-trz	 117
-o¿	 116
-ieg	 116
-nik	 116
-ga	 116
diff --git a/libtextcat/data/new_fingerprints/lm/portuguese.lm b/libtextcat/data/new_fingerprints/lm/portuguese.lm
deleted file mode 100644
index 4e1a5d7..0000000
--- a/libtextcat/data/new_fingerprints/lm/portuguese.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 35328
-a	 10423
-e	 10132
-o	 8919
-s	 6795
-r	 6033
-i	 5443
-n	 4588
-d	 4531
-t	 4217
-m	 3476
-u	 3404
-o_	 3240
-a_	 3029
-e_	 2879
-c	 2756
-s_	 2461
-_d	 2379
-l	 2307
-p	 2242
-_a	 1753
-de	 1751
-,	 1660
-,_	 1658
-_e	 1454
-es	 1447
-os	 1412
-ra	 1343
-_p	 1328
-nt	 1302
-_de	 1248
-do	 1215
-en	 1176
-re	 1150
-as	 1123
-v	 1115
-m_	 1113
-de_	 1096
-er	 1082
-g	 1053
-_c	 1047
-da	 1008
-co	 986
-os_	 975
-te	 974
-ar	 950
-or	 943
-q	 938
-qu	 938
-_s	 908
-ta	 902
-_de_	 901
-_o	 858
-se	 841
-ue	 831
-to	 799
-ad	 777
-.	 761
-que	 752
-em	 751
-an	 748
-f	 746
-r_	 745
-b	 732
-st	 718
-is	 716
-al	 712
-_qu	 706
-_q	 706
-in	 701
-as_	 696
-ã	 695
-do_	 685
-ent	 678
-ão	 677
-_n	 671
-_co	 660
-_a_	 654
-_m	 646
-on	 645
-ç	 624
-ri	 623
-_que	 619
-ma	 602
-po	 581
-ia	 580
-ão_	 575
-._	 573
-na	 572
-me	 564
-ro	 554
-_t	 544
-pa	 533
-da_	 528
-h	 523
-ue_	 515
-ca	 511
-que_	 509
-nte	 503
-no	 499
-tr	 498
-am	 496
-em_	 491
-_que_	 487
-_se	 485
-om	 471
-io	 460
-_do	 459
-ti	 448
-ci	 445
-_da	 444
-nd	 442
-ei	 435
-ra_	 435
-pr	 427
-_r	 423
-_e_	 420
-_f	 420
-ss	 412
-es_	 412
-el	 407
-id	 406
-_o_	 399
-_pa	 390
-um	 379
-pe	 378
-_po	 376
-la	 374
-ir	 371
-á	 371
-ic	 362
-di	 362
-li	 359
-é	 359
-_re	 353
-ve	 353
-mo	 350
-s,	 349
-s,_	 349
-ou	 347
-com	 340
-sa	 338
-si	 338
-men	 337
-rt	 331
-_i	 330
-con	 330
-o,	 327
-_da_	 326
-o,_	 326
-se_	 325
-_com	 325
-ado	 323
-to_	 322
-ai	 322
-it	 320
-A	 319
-ec	 316
-dos	 316
-_em	 312
-ção	 310
-aç	 310
-çã	 310
-ara	 305
-so	 299
-tu	 299
-res	 297
-im	 296
-_pr	 295
-mi	 293
-ua	 292
-nto	 291
-ment	 290
-í	 290
-par	 288
-_do_	 287
-ce	 286
-est	 286
-u_	 284
-ente	 284
-S	 278
-l_	 278
-_u	 278
-"	 276
-ni	 276
-z	 274
-sta	 273
-nc	 272
-_em_	 270
-P	 269
-ção_	 267
-_v	 267
-at	 267
-dos_	 266
-_es	 262
-«	 259
-_«	 259
-te_	 258
-»	 257
-va	 255
-le	 252
-ur	 252
-_um	 252
-vi	 251
-_par	 250
-a,	 247
-a,_	 247
-_con	 247
-ant	 242
-lo	 240
-ia_	 240
-gu	 237
-ar_	 235
-ac	 235
-e,_	 234
-e,	 234
-no_	 232
-eg	 232
-il	 232
-ns	 232
-er_	 231
-_ma	 230
-por	 230
-_in	 228
-_l	 226
-ó	 225
-ont	 224
-_no	 223
-_P	 222
-tra	 220
-E	 219
-ida	 218
-is_	 217
-ol	 216
-açã	 215
-ter	 215
-ação	 215
-_A	 211
-un	 211
--	 210
-_te	 210
-or_	 209
-ma_	 208
-_pe	 208
-ara_	 208
-C	 206
-ist	 202
-para	 202
-nta	 201
-ais	 201
-ut	 198
-nte_	 198
-j	 197
-dad	 196
-_na	 195
-am_	 195
-ade	 193
-ica	 191
-x	 190
-al_	 189
-O	 188
-des	 187
-_para	 187
-ada	 187
-nh	 186
-_se_	 186
-mp	 185
-ndo	 184
-R	 183
-_por	 181
-ação_	 181
-para_	 179
-eir	 177
-ui	 177
-vo	 177
-ou_	 177
-ta_	 177
-M	 176
-ria	 175
-tos	 175
-rr	 174
-D	 174
-io_	 174
-br	 174
-_di	 173
-õ	 173
-õe	 173
-fo	 173
-I	 172
-ões	 172
-_C	 171
-mo_	 171
-ov	 170
-pro	 169
-_os_	 169
-_os	 169
-das	 167
-iv	 166
-uma	 165
-gr	 165
-su	 164
-fi	 164
-um_	 162
-na_	 162
-ga	 162
-ais_	 161
-_S	 161
-lh	 159
-ort	 159
-cia	 158
-..	 157
-_est	 156
-cont	 156
-ig	 155
-á_	 154
-ran	 154
-ça	 154
-om_	 153
-_en	 152
-dade	 152
-_as	 152
-ho	 152
-ntr	 151
-nto_	 151
-fe	 150
-N	 149
-das_	 149
-uma_	 149
-ess	 149
-é_	 148
-ndo_	 147
-ob	 147
-»_	 147
-ul	 146
-ente_	 146
-go	 146
-ento	 144
-ver	 144
-_des	 144
-gi	 144
-ha	 142
-cu	 142
-idad	 142
-av	 141
-ões_	 141
-_pro	 141
-ura	 141
-ap	 139
-_com_	 139
-_ca	 139
-com_	 139
-ao	 139
-ne	 138
-od	 138
-_"	 137
-_M	 137
-pre	 137
-ras	 136
-_me	 136
-_ao	 136
-_no_	 134
-oc	 134
-str	 133
-tes	 133
-_b	 133
-and	 133
-_g	 133
-ro_	 133
-omo	 133
-_dos	 132
-_fo	 132
-_dos_	 132
-rn	 132
-mento	 131
-ito	 131
-ev	 131
-rio	 130
-ass	 130
-eu	 130
-be	 128
-os,	 128
-os,_	 128
-sp	 127
-_uma	 127
-ep	 126
-tad	 125
-s.	 125
-_uma_	 125
-_E	 125
-idade	 124
-_um_	 124
-nã	 124
-não	 124
-ct	 123
-ram	 123
-ado_	 123
-ela	 123
-omo_	 121
-iz	 121
-_an	 121
diff --git a/libtextcat/data/new_fingerprints/lm/quechua.lm b/libtextcat/data/new_fingerprints/lm/quechua.lm
deleted file mode 100644
index e59992d..0000000
--- a/libtextcat/data/new_fingerprints/lm/quechua.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 5766
-a	 4900
-n	 1941
-i	 1666
-u	 1384
-s	 1032
-t	 995
-y	 939
-h	 929
-k	 915
-q	 909
-p	 882
-a_	 847
-an	 821
-r	 783
-m	 740
-c	 705
-l	 695
-ta	 637
-ch	 613
-ay	 587
-qa	 557
-pa	 490
-ha	 486
-e	 474
-ma	 457
-o	 441
-na	 434
-ku	 411
-j	 409
-un	 367
-w	 358
-in	 353
-,	 345
-,_	 344
-cha	 318
-ar	 317
-n_	 315
-as	 291
-wa	 289
-ta_	 269
-ll	 259
-man	 255
-_k	 248
-._	 243
-.	 243
-nt	 227
-am	 224
-pi	 222
-la	 222
-ka	 217
-ac	 214
-ni	 214
-at	 213
-aq	 213
-i_	 208
-ri	 207
-qa_	 204
-una	 204
-y_	 192
-aj	 192
-_p	 192
-is	 188
-_m	 181
-lla	 175
-ach	 174
-rq	 173
-us	 172
-an_	 171
-_ka	 171
-ata	 169
-rqa	 165
-sq	 163
-hu	 162
-sp	 161
-_w	 157
-nk	 157
-hay	 157
-_s	 156
-sqa	 155
-ki	 153
-kun	 152
-_c	 152
-al	 150
-nta	 149
-ap	 147
-ant	 146
-yk	 146
-ay_	 144
-spa	 141
-hi	 137
-_ch	 136
-_n	 136
-ya	 135
-'	 134
-j_	 133
-uy	 132
-ra	 132
-a,_	 132
-a,	 132
-ti	 130
-_a	 125
-nc	 125
-kuna	 122
-s_	 121
-su	 121
-ak	 121
-_ma	 118
-ana	 118
-ari	 115
-_t	 114
-ama	 114
-chi	 114
-ñ	 113
-a._	 111
-a.	 111
-nch	 111
-iy	 111
-all	 110
-aw	 110
-_r	 110
-anta	 109
-ayk	 109
-na_	 109
-chay	 108
-sa	 104
-_wa	 104
-si	 103
-chu	 102
-pa_	 101
-acha	 101
-_cha	 101
-pi_	 101
-qan	 100
-_pa	 99
-_q	 97
-aj_	 97
-awa	 97
-ank	 95
-nku	 95
-im	 94
-q_	 92
-uk	 92
-C	 92
-mu	 90
-tu	 89
-J	 89
-_ni	 88
-taj	 87
-_J	 87
-nin	 86
-_chay	 86
-u_	 86
-_C	 84
-wan	 83
-nta_	 81
-_j	 81
-mant	 80
-ut	 79
-in_	 79
-ik	 79
-manta	 79
-asq	 79
-yt	 78
-n,	 78
-asqa	 78
-n,_	 78
-pay	 78
-li	 77
-yn	 77
-nq	 76
-yta	 76
-ic	 76
-up	 76
-_Ch	 75
-yku	 75
-Ch	 75
-he	 75
-hay_	 74
-nan	 74
-ina	 74
-ur	 73
-er	 72
-S	 72
-arq	 72
-or	 72
-_l	 71
-_u	 71
-aq_	 70
-os	 70
-yp	 70
-anc	 69
-man_	 69
-mi	 69
-ich	 68
-_i	 68
-st	 67
-_S	 67
-arqa	 66
-it	 66
-anch	 66
-ru	 66
-aku	 65
-pu	 65
-ña	 65
-alla	 64
-mp	 64
-sqa_	 64
-'a	 64
-ayku	 63
-es	 63
-A	 63
-ia	 63
-_man	 63
-_Cha	 61
-Cha	 61
-taj_	 60
-api	 60
-_ll	 60
-wi	 60
-ayp	 60
-aman	 59
-g	 58
-anku	 58
-yki	 57
-ima	 57
-yni	 57
-oj	 57
-mana	 57
-anta_	 57
-_su	 57
-uc	 56
-isp	 56
-ispa	 56
-uch	 56
-M	 56
-ir	 56
-_h	 55
-nqa	 55
-kuy	 55
-ayt	 54
-_M	 54
-b	 54
-_y	 53
-_mana	 53
-:	 53
-uku	 53
-:_	 53
-nm	 53
-au	 52
-ayta	 52
-io	 52
-qo	 51
-an,_	 51
-apa	 51
-spa_	 51
-erq	 51
-_wi	 51
-erqa	 51
-_sa	 51
-an,	 51
-el	 50
-um	 50
-ana_	 50
-han	 50
-il	 50
-on	 49
-chay_	 49
-sta	 49
-_D	 49
-D	 49
-iku	 49
-aqa	 49
-che	 48
-en	 48
-yta_	 48
-Ma	 47
-P	 47
-_lla	 47
-_Je	 47
-yq	 47
-Je	 47
-ita	 47
-rqan	 47
-ypi	 46
-har	 46
-Jes	 46
-_Jes	 46
-ios	 46
-ayq	 46
-Dio	 46
-un_	 46
-kus	 46
-_Dio	 46
-taq	 46
-_Dios	 46
-_Ma	 46
-_Di	 46
-Dios	 46
-Di	 46
-d	 46
-kan	 45
-Chay	 45
-oq	 45
-_Chay	 45
-_pay	 45
-upa	 45
-mun	 45
-ata_	 44
-_tu	 44
-nis	 44
-re	 44
-paq	 44
-yo	 44
-ej	 44
-qay	 43
-ncha	 43
-ha_	 43
-_A	 43
-I	 43
-_kan	 43
-_nis	 43
-_P	 43
-nman	 43
-nma	 43
-ataj	 42
-ara	 42
-ku_	 42
-nata	 42
-nat	 42
-i,	 41
-tin	 41
-qh	 41
-t'	 41
-orq	 41
-nki	 41
-_ru	 41
-_ku	 41
-i,_	 41
-ip	 40
-ham	 40
-usq	 40
-_ya	 40
-qank	 39
-orqa	 39
-ayn	 39
-mana_	 39
-ray	 39
-ym	 39
-uma	 39
-_pu	 39
-par	 39
-kay	 39
-n.	 38
-qa,_	 38
-n._	 38
-sus	 38
-aypi	 38
-usqa	 38
-qanku	 38
-ill	 38
-qa,	 38
-was	 38
-pa,	 38
-pa,_	 38
-asp	 38
-qa._	 37
-_mu	 37
-paj	 37
-amp	 37
-hin	 37
-uti	 37
-rin	 37
-_im	 37
-_ima	 37
-ja	 37
-_ri	 37
-rqa_	 37
-taq_	 37
-qa.	 37
-sh	 36
-spa,_	 36
-cha_	 36
-spa,	 36
-achi	 36
-una_	 36
-rqank	 36
-jt	 36
-K	 36
-amu	 36
-aspa	 35
-_Jesu	 35
-Jesus	 35
-nispa	 35
-ki_	 35
-waw	 35
-ko	 35
-ne	 35
-esus	 35
-int	 35
diff --git a/libtextcat/data/new_fingerprints/lm/romanian.lm b/libtextcat/data/new_fingerprints/lm/romanian.lm
deleted file mode 100644
index 65b8e75..0000000
--- a/libtextcat/data/new_fingerprints/lm/romanian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20674
-a	 6376
-e	 5815
-i	 5746
-t	 3396
-r	 3280
-n	 3103
-u	 2835
-s	 2611
-c	 2582
-e_	 2235
-l	 2224
-o	 2149
-a_	 1974
-d	 1629
-m	 1528
-p	 1410
-i_	 1358
-in	 1308
-_c	 1167
-_s	 1118
-_d	 999
-re	 905
-ar	 898
-,	 791
-,_	 786
-_p	 785
-de	 771
-_a	 754
-te	 687
-_i	 667
-at	 654
-ti	 645
-ca	 639
-n_	 630
-ta	 617
-si	 614
-_de	 609
-f	 606
-st	 583
-ri	 581
-u_	 567
-nt	 553
-.	 542
-ra	 540
-_m	 534
-g	 528
-v	 516
-ul	 516
-de_	 513
-_in	 503
-b	 492
-_de_	 474
-._	 472
-le	 459
-l_	 444
-un	 443
-_si	 440
-es	 437
-tr	 426
-ea	 420
-t_	 412
-ce	 412
-ma	 407
-cu	 402
-er	 398
-_ca	 397
-si_	 388
-_f	 387
-_l	 383
-z	 382
-la	 381
-ne	 370
-sa	 364
-as	 360
-_e	 357
-in_	 356
-an	 352
-it	 351
-te_	 346
-or	 345
-el	 345
-ci	 339
-_si_	 333
-_n	 330
-are	 324
-pe	 319
-re_	 317
-al	 310
-_t	 309
-se	 304
-ic	 295
-ie	 290
-_u	 290
-ul_	 290
-ni	 289
-int	 285
-_o	 280
-en	 279
-ta_	 279
-ur	 261
-pa	 256
-co	 255
-_pe	 254
-ia	 252
-mi	 251
-pr	 249
-_ma	 249
-oa	 249
-me	 246
-lu	 246
-li	 241
-im	 238
-_in_	 237
-da	 237
-na	 237
-_sa	 235
-ac	 234
--	 234
-ii	 232
-est	 231
-r_	 231
-h	 230
-_cu	 230
-le_	 229
-ai	 229
-ca_	 227
-il	 226
-ru	 223
-sc	 223
-_v	 221
-nu	 220
-tu	 220
-_un	 220
-nd	 220
-di	 219
-are_	 216
-to	 215
-am	 214
-on	 213
-o_	 208
-is	 208
-sa_	 203
-la_	 200
-_b	 200
-ste	 195
-et	 194
-ec	 191
-_r	 186
-car	 185
-ui	 180
-un_	 179
-lo	 178
-cu_	 177
-ei	 176
-e,	 175
-e,_	 175
-pe_	 171
-m_	 167
-_la	 166
-a,	 165
-a,_	 164
-_ce	 164
-rt	 163
-_co	 163
-ent	 162
-ro	 162
-ele	 162
-_pe_	 160
-po	 160
-ea_	 159
-"	 158
-ntr	 158
-_cu_	 158
-_pr	 157
-ut	 157
-nc	 156
-ata	 155
-care	 154
-um	 153
-au	 151
-va	 151
-_o_	 150
-_car	 150
-ii_	 145
-ind	 145
-_un_	 144
-os	 144
-ad	 141
-_la_	 140
-I	 140
-este	 138
-ste_	 138
-care_	 138
-ir	 137
-ga	 136
-ap	 136
-ol	 136
-ra_	 136
-_di	 134
-D	 134
-_care	 133
-se_	 133
-om	 133
-ara	 133
-ati	 133
-fi	 133
-_sa_	 131
-zi	 130
-vi	 130
-_ca_	 129
-_se	 128
-_nu	 128
-ai_	 127
-ch	 127
-pi	 124
-ve	 123
-fa	 122
-ot	 121
-_a_	 120
-este_	 120
-du	 119
-ine	 119
-s_	 118
-fo	 118
-_ci	 118
-ui_	 118
-ba	 118
-i,	 117
-i,_	 116
-ne_	 115
-us	 115
-_g	 115
-a.	 115
-fe	 114
-A	 114
-pu	 114
-ce_	 113
-ar_	 113
-_pa	 113
-oc	 112
-sta	 112
-lui	 112
-ns	 112
-em	 112
-'	 112
-oar	 112
-din	 111
-iu	 111
-_int	 111
-ate	 111
-mu	 111
-hi	 110
-ele_	 110
-mp	 109
-_D	 109
-S	 109
-sti	 108
-bi	 108
-ata_	 107
-ti_	 107
-tra	 107
-C	 107
-c_	 106
-tre	 106
-_al	 105
-rea	 105
-mai	 105
-j	 104
-a._	 104
-gi	 104
-e.	 103
-d_	 103
-_fa	 103
-E	 102
-mo	 102
-at_	 101
-_e_	 101
-nte	 101
-lt	 101
-sp	 101
-za	 100
-mai_	 100
-su	 99
-na_	 98
-tat	 97
-sin	 97
-ez	 96
-tru	 96
-e._	 96
-ie_	 96
-ia_	 96
-_re	 96
-tul	 96
-_fo	 96
-ina	 95
-art	 95
-_C	 95
-no	 95
-nu_	 94
-_es	 94
-_po	 94
-cr	 94
-inc	 93
-_da	 92
-_mai	 92
-lui_	 92
-_din	 92
-_est	 92
-pre	 91
-_mai_	 91
-io	 91
-chi	 91
-ge	 90
-pri	 90
-eu	 90
-uri	 90
-az	 90
-_nu_	 89
-_me	 89
-ct	 89
-au_	 88
-esc	 88
-ev	 88
-ei_	 88
-min	 87
-ace	 87
-op	 86
-ng	 86
-ici	 86
-_lu	 85
-ari	 85
-_mi	 84
-ita	 84
-_S	 84
-_tr	 84
-ere	 83
-or_	 83
-ast	 83
-ist	 83
-nt_	 83
-_se_	 82
-ou	 82
-tin	 82
-intr	 82
-con	 82
-do	 81
-_fi	 81
-str	 81
-am_	 80
-rat	 80
-ru_	 80
-ri_	 80
-par	 80
-oi	 80
-uc	 79
-ze	 79
-pl	 79
-res	 78
-_ac	 77
-ulu	 77
-din_	 76
-va_	 76
-ada	 76
-ului	 75
-_con	 75
-id	 75
-inte	 74
-ile	 73
-cit	 73
-_din_	 73
-lor	 73
-_"	 72
-ig	 72
-rin	 72
-da_	 72
-_st	 72
--_	 71
-_-	 71
-it_	 71
-ani	 71
-nd_	 71
-ci_	 70
-ag	 70
-eri	 70
-i.	 70
-tru_	 70
-_ne	 70
-rm	 70
-P	 69
-_este	 69
-nta	 69
-bu	 69
-une	 69
-ma_	 69
-nti	 69
-imp	 68
-_-_	 68
-iv	 68
-ind_	 68
diff --git a/libtextcat/data/new_fingerprints/lm/romansh.lm b/libtextcat/data/new_fingerprints/lm/romansh.lm
deleted file mode 100644
index e65969c..0000000
--- a/libtextcat/data/new_fingerprints/lm/romansh.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 10888
-a	 3490
-e	 2268
-i	 2196
-s	 2169
-n	 1961
-t	 1555
-r	 1510
-l	 1281
-u	 1249
-a_	 1155
-c	 1060
-d	 954
-o	 815
-s_	 744
-g	 726
-m	 686
-h	 620
-p	 617
-n_	 559
-v	 493
-_s	 480
-er	 476
-ch	 469
-_d	 457
-in	 455
-da	 418
-_c	 404
-r_	 388
-_e	 377
-.	 358
-_p	 340
-as	 333
-l_	 328
-,	 327
-._	 320
-_i	 320
-,_	 315
-la	 313
-en	 312
-sc	 310
-an	 301
-ta	 300
-_da	 285
-f	 282
-_t	 268
-_a	 262
-nt	 259
-_m	 252
-un	 248
-ra	 247
-i_	 247
-na	 245
-ma	 245
-ia	 241
-ar	 234
-sch	 228
-b	 228
-da_	 217
-es	 214
-ai	 213
-st	 212
-'	 209
-e_	 208
-as_	 208
-er_	 200
-t_	 199
-re	 199
-_l	 195
-al	 193
-_n	 193
-el	 192
-tg	 192
-te	 188
-z	 187
-ha	 180
-_f	 180
-sa	 174
-_da_	 172
-ve	 169
-ei	 168
-_v	 165
-at	 165
-ss	 161
-is	 161
-_ch	 161
-on	 160
-la_	 158
-cu	 158
-ad	 158
-he	 156
-in_	 147
-va	 147
-_in	 146
-gl	 145
-ns	 141
-ur	 140
-ü	 140
-u_	 138
-ts	 138
-pe	 136
-li	 134
-gi	 133
-et	 133
-de	 132
-ig	 132
-or	 130
-ti	 129
-il	 127
-d_	 126
-che	 123
-ut	 122
-us	 122
-cha	 121
-di	 120
-ia_	 120
-_b	 118
-_la	 117
-na_	 116
-ain	 115
-per	 115
-to	 115
-_cu	 113
-_sc	 112
-se	 111
-ls	 109
--	 108
-iu	 108
-ca	 107
-si	 104
-ir	 102
-rt	 102
-ie	 102
-_g	 102
-un_	 102
-nd	 101
-av	 101
-ni	 100
-q	 99
-au	 97
-ls_	 97
-ll	 96
-qu	 96
-_pe	 96
-le	 96
-rs	 95
-pa	 95
-ri	 95
-_ma	 94
-_per	 93
-am	 93
-eg	 92
-_r	 92
-gn	 92
-me	 92
-pi	 91
-an_	 91
-en_	 91
-ga	 91
-ent	 90
-hi	 90
-_e_	 90
-it	 89
-ta_	 88
-ter	 87
-ns_	 86
-iv	 86
-igl	 86
-a.	 85
-em	 85
-I	 85
-chi	 84
-_en	 84
-int	 84
-ue	 83
-su	 82
-tt	 82
-a,	 82
-a,_	 82
-o_	 82
-_ve	 82
-a._	 82
-_q	 81
-_qu	 80
-ge	 80
-"	 80
-_la_	 80
-ar_	 80
-vi	 79
-gl_	 79
-tu	 78
-ng	 78
-ro	 76
-mi	 76
-sta	 75
-ed	 75
-lla	 74
-ei_	 73
-_o	 73
-ic	 73
-el_	 73
-_il	 73
-_in_	 72
-g_	 72
-pr	 71
-nu	 70
-ina	 70
-_h	 69
-scha	 68
-mai	 68
-pl	 68
-il_	 68
-os	 68
-ha_	 68
-be	 67
-uo	 67
-cun	 67
-ra_	 67
-_pa	 65
-ts_	 64
-s.	 64
-co	 64
-_u	 64
-fi	 64
-_I	 63
-sa_	 63
-s._	 63
-_re	 62
-ün	 62
-_nu	 62
-?	 62
-S	 62
-_se	 61
-no	 61
-nt_	 61
-E	 61
-tr	 61
-mp	 60
-igl_	 60
-_su	 60
-_st	 60
-ess	 60
-im	 60
-zi	 59
-?_	 59
-nc	 59
-_E	 58
-_-	 58
-_cun	 58
-_te	 58
-_sa	 58
-ant	 58
-main	 58
-eu	 57
-ssa	 57
--_	 57
-iun	 57
-_-_	 57
-aint	 56
-op	 56
-al_	 56
-dal	 56
-j	 56
-ama	 55
-_tg	 55
-ua	 55
-M	 55
-per_	 55
-tsc	 54
-nta	 54
-tsch	 54
-um	 54
-fa	 54
-za	 54
-_di	 54
-pia	 54
-_per_	 54
-T	 54
-_M	 53
-ne	 53
-era	 53
-A	 53
-que	 53
-_dal	 53
-cr	 53
-_de	 53
-lla_	 53
-_che	 52
-h'	 52
-_me	 51
-ot	 51
-_pr	 51
-_pl	 51
-_sch	 51
-ch'	 50
-_S	 50
-opi	 50
-ou	 50
-tta	 50
-mo	 50
-ada	 50
-ba	 50
-_an	 49
-top	 49
-id	 49
-è	 49
-he_	 49
-C	 49
-va_	 49
-uto	 49
-ins	 48
-topi	 48
-L	 48
-ir_	 48
-ist	 48
-c_	 48
-_il_	 48
-P	 48
-ss_	 48
-ag	 47
-_no	 47
-res	 47
-las	 47
-_vi	 46
-s,	 46
-schi	 46
-_en_	 46
-tg_	 46
-s,_	 46
-_si	 46
-_que	 45
-_T	 45
-az	 45
-'i	 45
-cun_	 44
-_fa	 44
-_mi	 44
-utop	 44
-utopi	 44
-sche	 44
-_C	 44
-ur_	 44
-tge	 44
-po	 44
-es_	 44
-x	 44
-nz	 44
-_L	 44
-_cun_	 44
-man	 44
-_ch'	 43
-_fi	 43
-pu	 43
-ell	 43
-opia	 43
-_igl	 43
-_ig	 43
-sp	 43
-topia	 43
-ava	 42
-egn	 42
-che_	 42
-on_	 42
-ci	 42
-_P	 42
-ev	 42
-ond	 41
-_"	 41
-à	 41
-us_	 41
-_ha	 41
-D	 40
-_co	 40
-etg	 40
-'e	 40
-las_	 40
-est	 40
-ura	 40
-uel	 39
-ed_	 39
-vo	 39
-gia	 39
-bu	 39
-mu	 39
-nn	 39
-gli	 39
-_A	 39
-lu	 39
-cha_	 39
-ul	 38
-mal	 38
-_ün	 38
-ina_	 38
-_bu	 38
-_ca	 38
-_ü	 38
-uc	 38
-nts	 38
-tra	 38
-_tu	 37
diff --git a/libtextcat/data/new_fingerprints/lm/russian.lm b/libtextcat/data/new_fingerprints/lm/russian.lm
deleted file mode 100644
index bddb685..0000000
--- a/libtextcat/data/new_fingerprints/lm/russian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 76249
-о	 19732
-е	 16714
-а	 14389
-и	 13942
-т	 13160
-н	 12444
-с	 9867
-р	 8461
-в	 7895
-л	 7330
-к	 6498
-м	 5935
-.	 5725
-у	 5287
-д	 5019
-п	 4877
-я	 4083
-,	 3899
-,_	 3878
-ы	 3656
-ь	 3376
-и_	 3167
-_п	 3144
-е_	 3135
-о_	 3098
--	 3019
-з	 2983
-_в	 2952
-._	 2930
-_с	 2919
-ч	 2887
-г	 2876
-б	 2797
-ст	 2672
-_н	 2631
-то	 2585
-..	 2407
-_и	 2316
-но	 2300
--_	 2294
-й	 2281
-а_	 2249
-на	 2057
-я_	 2029
-ов	 1981
-ни	 1950
-_т	 1944
-х	 1874
-ен	 1856
-_о	 1774
-...	 1744
-ра	 1709
-не	 1685
-по	 1636
-_-	 1625
-ко	 1616
-те	 1595
-ро	 1584
-_к	 1558
-_-_	 1531
-й_	 1521
-ет	 1518
-ж	 1509
-_и_	 1454
-та	 1433
-ан	 1419
-ер	 1396
-от	 1389
-ь_	 1381
-го	 1375
-ал	 1370
-_по	 1364
-ре	 1345
-ка	 1338
-пр	 1337
-ва	 1329
-ти	 1306
-ли	 1300
-_д	 1297
-_м	 1290
-ес	 1284
-во	 1271
-че	 1256
-ор	 1245
-....	 1232
-ть	 1219
-ос	 1212
-ш	 1192
-ю	 1187
-в_	 1168
-.....	 1167
-он	 1147
-ак	 1144
-ц	 1109
-ог	 1101
-ло	 1099
-т_	 1093
-ри	 1076
-м_	 1074
-_пр	 1063
-ол	 1062
-ль	 1045
-_не	 1034
-ел	 1029
-_б	 1026
-ин	 1000
-од	 998
-ом	 996
-ме	 993
-ы_	 975
-ве	 968
-ск	 968
-_на	 966
-де	 946
-ны	 943
-_р	 931
-_ч	 923
-ат	 913
-ем	 910
-у_	 907
-за	 898
-х_	 898
-ле	 889
-то_	 881
-ит	 878
-ой	 875
-се	 862
-_в_	 833
-_з	 816
-ки	 816
-тр	 807
-"	 786
-ть_	 769
-ед	 767
-не_	 762
-ся	 754
-ла	 748
-об	 747
-мо	 741
-да	 730
-го_	 715
-к_	 713
-ис	 711
-_у	 702
-ой_	 697
-ил	 694
-ма	 692
-нн	 687
-до	 662
-ас	 660
-ам	 656
-ия	 649
-же	 646
-аз	 638
-со	 629
-на_	 619
-_г	 615
-ми	 612
-_а	 610
-э	 609
-вс	 608
-.._	 605
-вы	 604
-ого	 604
-им	 604
-_ко	 600
-ав	 597
-сл	 594
-ие	 593
-_не_	 589
-_е	 587
-_те	 583
-ту	 583
-ич	 583
-ру	 575
-ост	 571
-щ	 571
-л_	 570
-_э	 569
-_я	 559
-А	 556
-ени	 544
-из	 540
-ек	 536
-ова	 533
-ф	 525
-:	 519
-В	 513
-ани	 511
-_вс	 510
-ий	 510
-Н	 508
-_ка	 508
-!	 503
-?	 501
-ди	 498
-ли_	 489
-П	 488
-про	 486
-_ра	 485
-си	 484
-ир	 484
-_ст	 484
-ьн	 484
-льн	 484
-:_	 484
-ся_	 480
-_за	 477
-бо	 470
-_л	 469
-..._	 465
-бы	 464
-их	 464
-И	 462
-ег	 461
-тв	 459
-ния	 458
-ят	 454
-чт	 454
-эт	 445
-чес	 442
-_то	 442
-ия_	 441
-ик	 440
-ви	 437
-ак_	 436
-ста	 436
-ого_	 435
-_В	 434
-иче	 433
-ци	 431
-что	 431
-ых	 429
-_эт	 429
-С	 425
-_чт	 424
-_А	 424
-ю_	 423
-пе	 422
-ня	 422
-_что	 422
-ля	 419
-все	 418
-ду	 418
-еск	 415
-нт	 413
-как	 411
-сто	 411
-_вы	 409
-ну	 408
-тс	 406
-н_	 406
-_П	 401
-М	 401
-но_	 399
-_про	 398
-_.	 397
-ров	 396
-це	 396
-кт	 394
-ест	 394
-_"	 393
-ше	 393
-с_	 392
-_от	 392
-О	 391
-_на_	 391
-ред	 391
-ческ	 390
-о-	 390
-ван	 388
-а,	 385
-ад	 384
-ая	 384
-_я_	 383
-а,_	 383
-ты	 383
-?_	 383
-_об	 380
-_все	 380
-_та	 378
-_как	 376
-хо	 375
-так	 375
-аль	 374
-ож	 373
-ых_	 372
-ово	 372
-ив	 371
-_во	 369
-му	 369
-_Н	 369
-ей	 368
-пре	 368
-зн	 366
-ичес	 365
-пи	 365
-его	 362
-_со	 360
-ое	 360
-!_	 360
-ать	 360
-сти	 358
-их_	 358
-тн	 358
-мен	 358
-тся	 356
-ие_	 356
-ическ	 354
-бе	 352
-_бы	 352
-стр	 349
-ку	 349
-_мо	 348
-ет_	 348
-Т	 346
-_ме	 344
-ев	 344
-при	 343
-чи	 342
-мн	 341
-ния_	 339
-ар	 338
-нно	 337
-ован	 334
-кс	 334
-ур	 328
-_че	 328
-оль	 328
-ут	 327
-что_	 324
-ом_	 323
-оп	 323
-рм	 322
-А_	 322
-_что_	 322
-это	 322
-оч	 321
-о,_	 320
-о,	 320
-ско	 319
-кон	 319
-лов	 318
-ый	 318
-ус	 317
-от_	 316
-иро	 315
-ств	 314
-и,	 314
-ий_	 313
-сс	 313
-и,_	 313
-том	 312
-ае	 312
-енн	 311
-ез	 311
-ной	 311
-_это	 310
-К	 309
-са	 309
-раз	 309
-еп	 309
-_до	 308
-оло	 308
-сть	 308
-уд	 307
-дел	 307
-_И	 305
-аб	 305
-сь	 303
-альн	 302
-ок	 300
-ски	 300
-ных	 300
-_при	 298
-ча	 297
-_ж	 297
-е,	 297
-е,_	 297
-_А_	 296
-_ни	 296
-_._	 295
-тся_	 295
-ии	 294
-зна	 293
-я,	 292
-я,_	 292
-_пре	 291
-_С	 290
-ной_	 290
-ая_	 288
-_О	 288
-али	 286
-же_	 285
-сп	 285
-ист	 285
-ных_	 285
-з_	 283
-_М	 283
diff --git a/libtextcat/data/new_fingerprints/lm/sanskrit.lm b/libtextcat/data/new_fingerprints/lm/sanskrit.lm
deleted file mode 100644
index e21b871..0000000
--- a/libtextcat/data/new_fingerprints/lm/sanskrit.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-a	 15017
-_	 14975
-h	 5028
-i	 3820
-t	 2976
-s	 2788
-r	 2599
-|	 2437
-n	 2432
-aa	 2276
-ha	 2007
-m	 1982
-a_	 1802
-v	 1799
-d	 1768
-u	 1629
-y	 1599
-_|	 1470
-|_	 1470
-e	 1403
-k	 1371
-sh	 1330
-ra	 1243
-p	 1213
-va	 1152
-A	 1134
-ya	 1120
-ma	 1097
-na	 1091
-ar	 1080
-ta	 1054
-M	 1050
-.	 1047
-am	 1037
-an	 1006
-||	 967
-||_	 965
-_||	 965
-_||_	 963
-at	 962
-M_	 946
-as	 910
-_s	 882
-o	 848
-b	 844
-i_	 827
-aM	 764
-aM_	 685
-c	 630
-ch	 629
-sa	 623
-N	 616
-ad	 612
-H	 601
-pa	 595
-H_	 584
-g	 580
-_n	 579
-l	 554
-bh	 552
-hi	 547
-ka	 542
-it	 536
-ii	 535
-ama	 519
-_|_	 505
-e_	 477
-_p	 475
-dh	 475
-av	 469
-ak	 445
-aH	 444
-da	 440
-aH_	 439
-ay	 437
-j	 437
-_na	 432
-ana	 430
-hh	 428
-ti	 426
-ara	 425
-aa_	 410
-_k	 394
-shh	 389
-_v	 388
-_sa	 381
-.h	 379
-ah	 369
-_b	 368
-h_	 363
-.h_	 363
-cha	 362
-haa	 361
-_t	 358
-ri	 352
-sha	 345
-ap	 333
-vi	 330
-is	 329
-^	 321
-o_	 321
-_m	 320
-ai	 311
-_d	 311
-la	 302
-na_	 301
-.n	 298
-ava	 295
-al	 294
-_sh	 291
-ja	 288
-a.	 280
-aan	 277
-ish	 274
-aN	 273
-aya	 273
-ash	 266
-ha_	 265
-ga	 264
-st	 255
-ni	 255
-ii_	 254
-hu	 253
-Na	 253
-R	 248
-R^	 248
-^i	 247
-R^i	 247
-a.n	 243
-th	 241
-_c	 240
-_ch	 239
-maa	 238
-bha	 237
-vaa	 233
-ab	 228
-ir	 226
-\	 226
-ita	 223
-uu	 222
-dha	 220
-har	 218
-_a	 216
-_bh	 216
-nam	 212
-u_	 212
-he	 212
-m.h_	 211
-m.	 211
-m.h	 211
-ur	 210
-es	 209
-ata	 208
-te	 206
-yaa	 205
-_ma	 204
-esh	 202
-aka	 200
-id	 199
-pr	 199
-aha	 198
-hy	 198
-T	 197
-aat	 197
-_OM_	 196
-OM	 196
-_O	 196
-_OM	 196
-OM_	 196
-O	 196
-ti_	 195
-ari	 194
-raa	 193
-ag	 192
-_y	 192
-aas	 190
-_ta	 190
-_j	 189
-I	 189
-_na_	 187
-am.h_	 185
-am.h	 185
-am.	 185
-_pa	 183
-iv	 182
-de	 182
-ada	 178
-nd	 178
-_cha	 177
-_h	 176
-ati	 175
-taa	 173
-ev	 172
-nt	 171
-rii	 171
-ishh	 170
-ya_	 168
-_vi	 166
-ast	 165
-tr	 164
-abh	 164
-kh	 162
-ala	 160
-tha	 160
-apa	 160
-asa	 158
-naa	 158
-_nam	 156
-ru	 156
-A_	 155
-_ka	 154
-aar	 153
-_pr	 152
-_g	 151
-pra	 150
-ham	 150
-hha	 149
-aana	 149
-di	 149
-ra_	 147
-ik	 146
-.a	 144
-yat	 143
-ks	 143
-hA	 143
-hya	 143
-ksh	 143
-ut	 142
-sy	 141
-nama	 140
-_va	 140
-.\	 140
-paa	 140
-han	 139
-eva	 138
-U	 138
-mi	 138
-_r	 136
-_ja	 136
-asy	 135
-hr	 135
-sya	 134
-cha_	 132
-rv	 132
-tv	 130
-asya	 130
-kar	 130
-ho	 129
-yo	 129
-in	 128
-adh	 127
-yA	 127
-va_	 126
-su	 125
-_ya	 125
-shha	 124
-pu	 124
-R^it	 123
-sta	 123
-mu	 123
-^it	 123
-ty	 123
-_nama	 121
-ac	 120
-rii_	 120
-ach	 120
-aNa	 119
-tas	 119
-shi	 119
-iva	 119
-hav	 119
-tra	 118
-var	 118
-par	 118
-haM	 117
-aad	 117
-kaa	 117
-hch	 117
-mas	 117
-ai_	 117
-hc	 117
-sar	 116
-aam	 116
-_bha	 115
-_pra	 114
-et	 114
-haM_	 113
-aay	 113
-aj	 113
-ye	 113
-o.	 113
-An	 111
-arii	 111
-t.h	 110
-t.	 110
-ath	 110
-t.h_	 109
-man	 109
-te_	 108
-o.a	 108
-hara	 108
-rA	 108
-rva	 108
-tva	 108
-asta	 108
-up	 108
-shr	 107
-daa	 104
-me	 104
-dr	 104
-ram	 104
-arii_	 102
-_ni	 102
-arv	 102
-iH	 102
-hit	 101
-ras	 101
-aga	 101
-Am	 101
-mA	 101
-ba	 101
-amas	 100
-tu	 100
-yaM	 100
-ant	 99
-ud	 99
-uk	 98
-iH_	 98
-yaM_	 98
-kha	 98
-au	 98
-ira	 97
-shhT	 97
-rah	 97
-hT	 97
-hhT	 97
-D	 96
-_sar	 96
-re	 96
-eshh	 95
-sarv	 94
-amaa	 94
-and	 94
-arva	 94
-_ra	 93
-_dh	 93
-tt	 92
-tad	 92
-hm	 92
-raM_	 91
-dev	 91
-raM	 91
-C	 91
-ani	 91
-_sarv	 90
-atha	 89
-Ad	 89
-chi	 89
-tA	 88
-sarva	 88
-avi	 88
-taM	 87
-hava	 87
-anaa	 86
-vA	 86
-dd	 86
-nA	 85
-Ar	 85
-hv	 85
-taM_	 85
-dhi	 84
-ksha	 84
-ip	 84
-ma_	 84
-_sha	 84
-ati_	 83
-yai	 83
-vat	 83
-At	 83
-kR	 82
-kR^	 82
-bhi	 82
-_shr	 82
-to	 82
-ta_	 82
-br	 82
-ek	 82
-kR^i	 82
-tat	 81
-nta	 81
-hma	 81
-aaya	 80
-tam	 80
-en	 80
-us	 79
-bra	 79
-ke	 79
-kt	 79
-ddh	 79
-mo	 79
diff --git a/libtextcat/data/new_fingerprints/lm/scots.lm b/libtextcat/data/new_fingerprints/lm/scots.lm
deleted file mode 100644
index 7aac457..0000000
--- a/libtextcat/data/new_fingerprints/lm/scots.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 11688
-e	 3223
-a	 2469
-t	 2269
-i	 1928
-n	 1903
-r	 1414
-o	 1406
-h	 1369
-s	 1249
-l	 929
-n_	 890
-_t	 862
-_a	 843
-d	 818
-e_	 798
-th	 704
-w	 661
-he	 625
-an	 612
-t_	 606
-u	 592
-_th	 575
-c	 508
-s_	 471
-the	 470
-,	 469
--	 458
-in	 455
-m	 445
-,_	 440
-b	 434
-g	 429
-er	 409
-ee	 408
-_the	 407
-k	 402
-an_	 402
-f	 385
-_w	 378
-he_	 376
-the_	 364
-_an	 362
-_o	 360
-y	 358
-_the_	 354
-_s	 353
-_an_	 342
-a_	 335
-r_	 327
-_b	 316
-d_	 303
-i_	 278
-en	 277
-p	 270
-ei	 245
-A	 236
-wa	 232
-_A	 231
-re	 229
-in_	 229
-ui	 218
-oo	 217
-le	 217
-ai	 216
-et	 212
-ti	 209
-it	 209
-_f	 206
-te	 204
-_a_	 203
-_m	 202
-ha	 200
-as	 193
-on	 188
-at	 184
-_i	 183
-_wa	 183
-_c	 182
-o_	 180
-or	 178
-_h	 176
-_g	 169
-ch	 165
-A_	 159
-_l	 158
-_A_	 157
-st	 156
-_d	 155
-_ti	 148
-.	 148
-._	 146
-ke	 144
-ti_	 143
---	 143
-_o_	 142
-ow	 142
----	 140
-ed	 138
-----	 138
-_r	 137
-as_	 137
-y_	 136
-er_	 136
------	 136
-ir	 135
-aa	 135
-la	 131
-een	 130
-ae	 129
-_ti_	 128
-ra	 126
-es	 125
-nd	 124
-de	 120
-h_	 120
-ie	 120
-ar	 119
-ll	 119
-nt	 118
-ot	 118
-en_	 115
-ma	 115
-eet	 113
-her	 112
-el	 112
-is	 112
-'	 112
-at_	 111
-ic	 109
-se	 108
-or_	 106
-wu	 104
-me	 104
-ne	 103
-fo	 102
-on_	 101
-was	 99
-_was	 98
-et_	 98
-ri	 98
-_e	 97
-_ma	 97
-v	 97
-_n	 97
-!	 97
-li	 97
-ht	 93
-hi	 92
-_wu	 92
-ng	 91
-ro	 91
-it_	 90
-ck	 90
-_fo	 90
-tha	 90
-k_	 89
-il	 89
-cht	 86
-eet_	 86
-_p	 86
-we	 86
-_was_	 85
-was_	 85
-rt	 84
-ed_	 83
-ter	 83
-id	 83
-ga	 82
-;	 82
-;_	 81
-ther	 79
-tt	 76
-air	 76
-e,	 75
-un	 75
-ho	 75
-for	 74
-ge	 74
-_st	 73
-_y	 72
-_he	 72
-wh	 71
-_on	 71
-sh	 70
-z	 70
-e,_	 69
-bi	 68
-_tha	 68
-wui	 67
-!_	 67
-ad	 67
-een_	 66
-l_	 66
-ts	 66
-_for	 66
-n,	 66
-_wh	 65
-re_	 65
-be	 65
-eh	 64
-hat	 64
-ns	 64
-br	 64
-g_	 64
-ui_	 64
-rr	 64
-wui_	 63
-ni	 63
-_wui	 62
-ay	 62
-s,	 62
-pe	 61
-n,_	 61
-bo	 61
-al	 61
-ye	 61
-_bi	 60
-oot	 60
-na	 60
-ang	 60
-s,_	 59
-es_	 59
-ill	 58
-that	 58
-_wui_	 58
-nn	 58
-eh_	 58
-oa	 57
-han	 57
-_that	 56
-_br	 56
-ca	 56
-_ga	 56
-ng_	 56
-um	 55
-hat_	 55
-oon	 55
-od	 55
-for_	 55
-no	 55
-ree	 55
-_for_	 54
-_le	 54
-ht_	 54
-ot_	 54
-_k	 53
-rd	 53
-ki	 53
-aw	 53
-nd_	 53
-_on_	 53
-_it	 53
-ik	 53
-t,	 53
-_be	 52
-that_	 52
-ve	 52
-rn	 52
-'s	 51
-au	 51
-co	 51
-ich	 51
-to	 51
-lo	 51
-t,_	 51
-ea	 51
-tee	 51
-lan	 50
-fi	 50
-_at	 50
-am	 50
-_in	 50
-ere	 50
-ur	 50
-le_	 50
-nt_	 49
-'s_	 49
-hin	 49
-yi	 49
-hr	 49
-ts_	 49
-_ca	 48
-"	 48
-ta	 48
-cht_	 48
--_	 48
-_as	 47
-T	 47
-ang_	 47
-lei	 46
-_ma_	 46
-tr	 46
-_ro	 46
-fe	 46
-ma_	 46
-icht	 46
-_as_	 46
-der	 46
-cl	 46
-e-	 45
-n-	 45
-thr	 45
-ba	 45
-m_	 45
-st_	 45
-rt_	 45
-_u	 45
-do	 45
-_T	 45
-im	 44
-_se	 44
-sk	 44
-_la	 44
-eik	 44
-bit	 43
-ike	 43
-B	 43
-kee	 43
-tte	 43
-di	 43
-eed	 43
-_B	 42
-_aa	 42
-her_	 42
-da	 42
-ff	 42
-tu	 42
-ie_	 42
-_cl	 42
-_ba	 42
-oot_	 42
-bu	 41
-eike	 41
-oc	 41
-hu	 41
-_thr	 41
-ther_	 41
-_co	 41
-aa_	 41
-so	 41
-_me	 41
-H	 41
-_H	 40
-ke_	 40
-ert	 40
-lu	 40
-ist	 40
-si	 40
-iz	 40
-ar_	 39
-uc	 39
-thi	 39
-ad_	 39
-ru	 39
-owe	 39
-gi	 38
-_bit	 38
-_do	 38
-int	 38
-bl	 38
-ld	 38
-_at_	 38
-lt	 38
-ac	 38
-_ha	 38
-ae_	 38
-rs	 37
-here	 37
-ei_	 37
-han_	 37
-p_	 37
-is_	 37
-eth	 37
-fa	 37
-_sk	 37
-ll_	 37
-ss	 36
-bra	 36
-wha	 36
-gl	 36
-ck_	 36
-pl	 36
-lin	 36
-ir_	 36
-ab	 36
-_ther	 36
-_da	 35
-ce	 35
-rin	 35
-_oo	 35
-rl	 35
-wee	 35
-and	 35
-sa	 35
-_yi	 35
-_bra	 35
-'d	 35
-ds	 35
-_bo	 35
diff --git a/libtextcat/data/new_fingerprints/lm/scots_gaelic.lm b/libtextcat/data/new_fingerprints/lm/scots_gaelic.lm
deleted file mode 100644
index 491862a..0000000
--- a/libtextcat/data/new_fingerprints/lm/scots_gaelic.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 12634
-a	 5353
-h	 3268
-i	 2898
-n	 2792
-e	 1651
-r	 1563
-d	 1455
-_a	 1425
-c	 1245
-n_	 1236
-s	 1165
-l	 1152
-an	 1121
-t	 980
-ai	 979
-g	 962
-u	 905
-ch	 902
-ha	 836
-h_	 833
-a_	 829
-ea	 821
-o	 794
-dh	 726
-an_	 711
-b	 639
-m	 585
-na	 514
-nn	 506
-ac	 498
-r_	 495
-s_	 482
-ir	 480
-ach	 466
-id	 458
-_an	 450
-_c	 427
-th	 403
-à	 388
-he	 383
-in	 379
-bh	 367
-idh	 358
-ad	 342
-_n	 341
-il	 332
-nn_	 323
-_t	 322
-_d	 319
-ar	 317
-e_	 311
-dh_	 307
-_an_	 303
-_b	 302
-_na	 294
-air	 289
-ig	 279
-.	 275
-ir_	 272
-ag	 272
-_ai	 272
-,	 270
-gu	 269
-,_	 269
-._	 265
-ean	 264
-ch_	 261
-f	 259
-?	 258
-_s	 255
-ann	 250
-ra	 241
-ei	 241
-_a_	 241
-ha_	 241
-d_	 238
--	 235
-_m	 231
-gh	 230
-hea	 228
-le	 226
-_f	 224
-ui	 223
-is	 223
-as	 218
-adh	 218
-l_	 216
-g_	 208
-ài	 207
-ò	 207
-hai	 205
-cha	 205
-air_	 204
-na_	 201
-inn	 198
-tha	 190
-C	 189
-G	 188
-ann_	 187
-_ag	 186
-_air	 186
-eac	 185
-_g	 185
-_na_	 184
-ach_	 184
-_C	 183
-us	 183
-_ch	 183
-la	 182
-_G	 182
-each	 181
-us_	 178
-al	 178
-gus	 176
-gus_	 176
-_th	 169
-_air_	 168
-_agus	 167
-agus_	 167
-_agu	 167
-agus	 167
-agu	 167
-ta	 164
-aid	 163
-hi	 163
-hd	 163
-chd	 160
-T	 157
-A	 156
-ic	 152
-_T	 152
-adh_	 150
-idh_	 148
-mh	 147
-?_	 146
-ar_	 145
-oi	 144
-da	 143
-aidh	 143
-_bh	 139
-ean_	 138
-sa	 138
-ig_	 138
-_r	 136
-_A	 134
-ì	 134
-te	 134
-achd	 131
-hu	 131
-_e	 130
-aig	 130
-_l	 130
-_ann	 129
-ain	 127
-ne	 127
-dhe	 125
-_dh	 125
-àid	 123
-o_	 121
-hl	 119
-acha	 119
-ga	 118
-àidh	 118
-on	 118
-it	 117
-aidh_	 116
-de	 115
-nan	 115
-ua	 115
-_ann_	 115
-ich	 115
-il_	 114
-m_	 114
-eil	 114
-ri	 112
-at	 112
-ma	 111
-li	 109
-ao	 109
-re	 109
-inn_	 108
-_tha	 107
-fh	 106
-as_	 106
-bh_	 106
-nan_	 103
-lea	 103
-lt	 103
-S	 103
-a?	 103
-a?_	 102
-io	 102
-E	 101
-am	 101
-'	 100
-_a?	 100
-igh	 100
-_a?_	 99
-_gu	 99
-idhe	 99
-t_	 99
-se	 99
-si	 98
-ba	 97
-ù	 97
-tha_	 96
-bha	 95
-B	 94
-is_	 94
-u_	 94
-_B	 94
-_i	 93
-ile	 92
-aic	 91
-hei	 91
-ia	 90
-ho	 89
-Th	 88
-ath	 88
-_Th	 88
-rt	 87
-ib	 87
-Gàid	 86
-_Gài	 86
-_Gà	 86
-Gài	 86
-òr	 86
-Gà	 86
-Gàidh	 86
-_Gàid	 86
-had	 85
-ibh	 85
-_fh	 85
-p	 84
-ad_	 83
-_?	 83
-_E	 83
-hd_	 82
-dhea	 82
-chd_	 82
-ear	 81
-ith	 81
-_tha_	 80
-h-	 79
-eal	 78
-hean	 78
-sg	 77
-rea	 77
-_S	 76
-ais	 75
-ll	 75
-han	 74
-hà	 74
-achd_	 74
-ead	 74
-idhea	 73
-am_	 72
-dha	 72
-_nan	 71
-_nan_	 71
-hadh	 71
-gh_	 71
-ail	 70
-hui	 70
-Ch	 69
-eachd	 69
-h.	 69
-aich	 69
-hli	 69
-chai	 69
-om	 68
-fa	 68
-chad	 68
-I	 67
-h._	 67
-_Ch	 67
-tea	 67
-nea	 66
-chadh	 66
-achad	 66
-rai	 66
-lig	 66
-haid	 66
-dea	 66
-rt_	 65
-àr	 65
-dhl	 65
-ana	 64
-eann	 64
-Ei	 64
-le_	 64
-hn	 64
-ilt	 64
-uid	 64
-_fa	 63
-_Tha	 63
-Tha	 63
-ob	 63
-_si	 62
-ro	 62
-cu	 62
-ainn	 62
-un	 62
-dhli	 61
-idhli	 61
-lean	 61
-idhl	 61
-àidhl	 61
-hlig	 61
-dhlig	 61
-in_	 60
-_à	 60
-st	 60
-rr	 60
-_cu	 60
-hr	 60
-_aig	 60
-bhe	 59
-i_	 59
-aigh	 59
-Tha_	 59
-è	 59
-_ri	 59
-_Tha_	 59
-lb	 58
-che	 58
-ran	 58
-nac	 58
-haidh	 58
-hadh_	 58
-aig_	 58
-Gh	 58
-ilea	 58
-_Gh	 58
-lte	 58
-_le	 58
-ru	 58
-àidhe	 57
-_I	 57
-ilte	 57
-eadh	 57
-M	 56
-hlig_	 56
-L	 56
-chu	 56
-nach	 56
-_ma	 56
-lig_	 56
-h,_	 55
-th_	 55
-ibh_	 55
-_aig_	 55
-D	 55
-atha	 55
-_Ei	 55
-h,	 55
-gu_	 54
-_gu_	 54
-im	 54
-eil_	 54
-eu	 53
-_M	 53
-Al	 53
-irt	 53
-_L	 53
-iad	 53
-sea	 52
-lba	 52
-Alba	 52
-F	 52
-Alb	 52
-uai	 52
-ich_	 52
-_F	 51
-ilean	 51
-has	 51
-tai	 51
-each_	 50
-eacha	 50
-har	 50
-ni	 50
-_de	 50
-irt_	 50
-n,_	 50
-mha	 50
-n,	 50
-_e_	 50
-ide	 49
-neach	 49
-neac	 49
-ur	 49
-rd	 49
-_h	 49
-hean_	 49
-oc	 49
-eò	 49
-te_	 49
-han_	 49
-on_	 49
diff --git a/libtextcat/data/new_fingerprints/lm/serbian-latin.lm b/libtextcat/data/new_fingerprints/lm/serbian-latin.lm
deleted file mode 100644
index 0a02831..0000000
--- a/libtextcat/data/new_fingerprints/lm/serbian-latin.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 56298
-a	 17374
-i	 15500
-e	 13745
-o	 13087
-n	 9704
-r	 8535
-s	 7383
-t	 6692
-j	 6664
-u	 6390
-k	 6060
-a_	 5221
-v	 5177
-l	 5082
-d	 4923
-e_	 4729
-m	 4663
-p	 4121
-i_	 3992
-_s	 2964
-je	 2847
-g	 2703
-z	 2575
-u_	 2521
-_p	 2491
-ra	 2430
-_i	 2355
-na	 2337
-.	 2169
-,	 2142
-,_	 2134
-._	 2112
-st	 2091
-o_	 2004
-ni	 1971
-b	 1933
-ko	 1894
-je_	 1700
-an	 1671
-ij	 1628
-no	 1559
-č	 1550
-_n	 1522
-_u	 1516
-re	 1465
-ti	 1409
-_o	 1368
-en	 1365
-_k	 1353
-_j	 1346
-_d	 1341
-ja	 1325
-li	 1314
-ta	 1309
-pr	 1303
-c	 1287
-ka	 1269
-_je	 1233
-po	 1224
-ne	 1221
-_i_	 1220
-ri	 1198
-va	 1197
-ov	 1151
-od	 1146
-la	 1139
-sk	 1132
-m_	 1124
-_pr	 1120
-os	 1086
-in	 1060
-š	 1053
-ve	 1048
-oj	 1035
-ma	 1029
-om	 1027
-og	 1024
-im	 1006
-av	 1002
-al	 982
-me	 976
-vi	 971
-_po	 966
-_na	 963
-na_	 944
-da	 928
-ro	 905
-nj	 900
-ik	 891
-_je_	 889
-to	 884
-ad	 881
-ar	 873
-h	 862
-or	 858
-se	 840
-_m	 836
-te	 819
-is	 816
-_u_	 810
-aj	 809
-ed	 800
-_t	 791
-et	 772
-at	 740
-vo	 735
-ju	 731
-gr	 723
-di	 722
-lo	 722
-za	 709
-il	 709
-ak	 707
-_r	 704
-ja_	 703
-ji	 700
-ne_	 694
-_ko	 691
-ki	 689
-er	 681
-ci	 680
-ć	 673
-_se	 670
-_v	 664
-ž	 663
-el	 662
-on	 658
-_z	 656
-S	 638
-iz	 635
-bi	 622
-ek	 616
-_S	 612
-su	 607
-gra	 606
-sa	 603
-a,	 601
-a,_	 598
-_b	 598
-ih	 597
-om_	 591
-_g	 588
-ost	 587
-ije	 586
-d_	 579
-tr	 574
-se_	 567
-ija	 561
-de	 559
-em	 552
-_se_	 552
-le	 549
-a.	 548
-lj	 548
-a._	 542
-do	 540
-_su	 533
-zi	 529
-ič	 525
-sta	 520
-h_	 520
-ke	 517
-ih_	 511
-f	 507
-go	 505
-ol	 504
-dn	 498
-sti	 496
-ka_	 493
-_.	 489
-_._	 473
-rad	 472
-_a	 468
-g_	 463
-ic	 461
-as	 461
-_za	 461
-it	 456
-koj	 454
-ob	 448
-iv	 442
-da_	 442
-az	 441
-su_	 436
-ku	 433
-ma_	 430
-mo	 429
-ju_	 429
-_sa	 427
-ke_	 421
-ni_	 421
-ist	 421
-og_	 418
-_od	 417
-am	 416
-anj	 412
-đ	 407
-_su_	 407
-ru	 400
-nje	 398
-sl	 397
-ok	 392
-op	 391
-_koj	 391
-_na_	 389
-tn	 388
-ji_	 384
-e,	 383
-_do	 381
-e,_	 380
-ima	 379
-ač	 378
-nos	 378
-vn	 377
-B	 377
-_ka	 373
-ti_	 372
-li_	 370
-eo	 370
-pre	 367
-_iz	 364
-P	 361
-sko	 361
-io	 360
-n_	 360
-"	 356
-vr	 354
-_st	 354
-mi	 352
-čk	 351
-ao	 350
-im_	 347
-es	 346
-_B	 346
-ev	 344
-ski	 343
-ez	 343
-j_	 341
-ije_	 341
-ig	 339
-_ra	 338
-ko_	 336
-tv	 336
-grad	 335
-no_	 335
-la_	 334
-_P	 333
-_da	 333
-št	 332
-od_	 330
--	 326
-dr	 323
-va_	 322
-tu	 320
-_l	 316
-pro	 315
-ori	 315
-N	 314
-ika	 311
-ija_	 311
-sto	 309
-e.	 307
-ir	 303
-e._	 302
-_pro	 301
-_pre	 300
-ki_	 300
-ot	 299
-_N	 297
-sv	 294
-pe	 291
-ns	 291
-sn	 291
-met	 290
-t_	 289
-pri	 289
-ba	 288
-ili	 288
-pa	 288
-ut	 287
-ao_	 286
-oji	 285
-_ne	 285
-če	 284
-ova	 283
-kom	 282
-um	 281
-ičk	 279
-nost	 279
-k_	 279
-si	 279
-ada	 278
-van	 278
-cij	 276
-Sr	 276
-lik	 275
-_Sr	 275
-nt	 275
-ogr	 274
-ug	 274
-_ve	 274
-ran	 273
-br	 273
-ani	 272
-ine	 272
-ac	 271
-edn	 271
-red	 268
-_bi	 266
-_pri	 266
-ud	 266
-ogra	 265
-nja	 265
-odi	 264
-_f	 263
-_re	 262
-ga	 258
-ati	 258
-zn	 257
-ovi	 255
-rij	 254
-_sv	 254
-ako	 252
-nu	 252
-nij	 251
-ana	 251
-ča	 251
-rav	 250
-din	 248
-kr	 247
-iš	 247
-či	 245
-up	 245
-ce	 245
-ta_	 244
-rv	 244
-men	 244
-un	 243
-rb	 243
-aju	 241
-ava	 241
-ra_	 241
-etn	 239
-oj_	 239
-ln	 238
-T	 238
-pos	 237
-eni	 237
-M	 234
-_go	 233
-_od_	 232
-du	 231
-ali	 231
-ini	 229
-ima_	 229
-_da_	 228
-nov	 227
-_te	 227
-ps	 225
-_e	 225
-Srb	 223
-ca	 223
-_M	 223
-_Srb	 222
-ara	 222
-_mo	 221
-Be	 221
-_de	 221
-i.	 220
-bij	 220
-K	 220
-jed	 219
-sa_	 219
-oji_	 218
-čn	 218
-_ob	 218
-pi	 218
-ur	 218
-eogr	 217
-ove	 217
-avi	 217
-tno	 217
-eog	 217
-eogra	 217
-stv	 216
-zv	 216
-_Be	 216
-i._	 216
-nik	 215
-bo	 214
-_koji	 214
-nic	 214
-koji	 214
-_pos	 214
-_K	 213
-ume	 213
-za_	 211
-i,	 211
-i,_	 211
diff --git a/libtextcat/data/new_fingerprints/lm/serbian.lm b/libtextcat/data/new_fingerprints/lm/serbian.lm
deleted file mode 100644
index 55b5906..0000000
--- a/libtextcat/data/new_fingerprints/lm/serbian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 56294
-а	 17374
-и	 15500
-е	 13745
-о	 13087
-н	 8809
-р	 8535
-с	 7383
-т	 6692
-у	 6390
-к	 6060
-а_	 5221
-ј	 5197
-в	 5177
-д	 4882
-е_	 4729
-м	 4663
-л	 4534
-п	 4121
-и_	 3992
-_с	 2964
-г	 2703
-з	 2575
-у_	 2521
-_п	 2491
-ра	 2430
-_и	 2355
-на	 2337
-је	 2281
-.	 2169
-,	 2142
-,_	 2134
-._	 2112
-ст	 2091
-о_	 2004
-ни	 1971
-б	 1933
-ко	 1894
-иј	 1628
-но	 1559
-ч	 1550
-_у	 1516
-је_	 1465
-ре	 1465
-_н	 1437
-ти	 1409
-_о	 1368
-_к	 1353
-_ј	 1346
-_д	 1315
-ли	 1314
-та	 1309
-пр	 1303
-ц	 1287
-ка	 1269
-ан	 1260
-_је	 1233
-по	 1224
-не	 1221
-_и_	 1220
-ен	 1198
-ри	 1198
-ва	 1197
-ов	 1151
-од	 1146
-ла	 1139
-ск	 1132
-м_	 1124
-_пр	 1120
-ос	 1086
-ш	 1053
-ве	 1048
-ој	 1035
-ма	 1029
-ом	 1027
-ин	 1025
-ог	 1024
-им	 1006
-ав	 1002
-ме	 976
-ви	 971
-_по	 966
-_на	 963
-на_	 944
-да	 928
-ја	 906
-ро	 905
-њ	 895
-ал	 893
-ик	 891
-_је_	 889
-то	 884
-ад	 876
-ар	 873
-х	 862
-ор	 858
-се	 840
-_м	 836
-те	 819
-ис	 816
-_у_	 810
-ај	 809
-ед	 800
-_т	 791
-ет	 772
-ат	 740
-во	 735
-гр	 723
-ди	 722
-ло	 722
-за	 709
-ак	 707
-_р	 704
-не_	 694
-_ко	 691
-ки	 689
-ер	 681
-ил	 681
-ци	 680
-ћ	 673
-_се	 670
-_в	 664
-_з	 656
-он	 651
-С	 638
-из	 635
-би	 622
-ж	 617
-ек	 616
-_С	 612
-ел	 611
-су	 607
-гра	 606
-са	 603
-а,	 601
-а,_	 598
-_б	 598
-их	 597
-ом_	 591
-_г	 588
-ост	 587
-ије	 586
-д_	 579
-тр	 574
-се_	 567
-ија	 561
-де	 559
-_се_	 552
-ем	 552
-ле	 549
-а.	 548
-љ	 548
-а._	 542
-до	 540
-_су	 533
-ју	 529
-зи	 529
-ји	 525
-ич	 525
-ста	 520
-х_	 520
-ке	 517
-их_	 511
-ф	 507
-го	 505
-сти	 496
-ка_	 493
-_.	 489
-_._	 473
-_а	 468
-рад	 467
-ја_	 467
-г_	 463
-иц	 461
-ас	 461
-_за	 461
-ит	 456
-кој	 454
-об	 448
-да_	 442
-ив	 442
-аз	 441
-су_	 436
-ку	 433
-ма_	 430
-мо	 429
-_са	 427
-ке_	 421
-ол	 421
-ни_	 421
-ист	 421
-дн	 421
-ог_	 418
-_од	 417
-ам	 416
-ањ	 411
-ђ	 407
-_су_	 407
-ру	 400
-ње	 398
-сл	 397
-ок	 392
-оп	 391
-_кој	 391
-_на_	 389
-е,	 383
-тн	 381
-_до	 381
-е,_	 380
-има	 379
-нос	 378
-ач	 378
-вн	 377
-Б	 377
-_ка	 373
-ти_	 372
-ео	 370
-ли_	 370
-пре	 367
-_из	 364
-ско	 361
-ио	 360
-н_	 360
-П	 359
-ју_	 359
-"	 356
-вр	 354
-_ст	 354
-ји_	 354
-ми	 352
-чк	 351
-ао	 350
-им_	 347
-_Б	 346
-ес	 346
-ев	 344
-ски	 343
-ез	 343
-ије_	 341
-иг	 339
-_ра	 338
-тв	 336
-ко_	 336
-град	 335
-но_	 335
-ла_	 334
-_да	 333
-_П	 333
-шт	 332
-од_	 330
--	 326
-ј_	 326
-др	 323
-ва_	 322
-ту	 320
-ори	 315
-про	 315
-ија_	 311
-ика	 311
-сто	 309
-е.	 307
-ир	 303
-е._	 302
-_про	 301
-_пре	 300
-ки_	 300
-от	 299
-Н	 296
-св	 294
-пе	 291
-сн	 291
-нс	 291
-мет	 290
-т_	 289
-при	 289
-ба	 288
-па	 288
-или	 288
-ут	 287
-ао_	 286
-оји	 285
-_не	 285
-че	 284
-ова	 283
-ком	 282
-ум	 281
-_Н	 280
-си	 279
-ичк	 279
-ност	 279
-к_	 279
-ада	 278
-Ср	 276
-циј	 276
-лик	 275
-_Ср	 275
-нт	 275
-огр	 274
-_ве	 274
-уг	 274
-бр	 273
-ани	 272
-ине	 272
-ац	 271
-ред	 268
-_би	 266
-_при	 266
-уд	 265
-ња	 265
-огра	 265
-оди	 264
-_ф	 263
-_ре	 262
-_л	 259
-ати	 258
-га	 258
-зн	 257
-ови	 255
-риј	 254
-_св	 254
-ну	 252
-ако	 252
-ча	 251
-ниј	 251
-ана	 251
-рав	 250
-иш	 247
-кр	 247
-чи	 245
-уп	 245
-це	 245
-дин	 244
-та_	 244
-рв	 244
-рб	 243
-ра_	 241
-ају	 241
-ава	 241
-ун	 240
-ој_	 239
-Т	 238
-лн	 238
-пос	 237
-ени	 237
-етн	 234
-М	 234
-_го	 233
-_од_	 232
-али	 231
-ду	 231
-ини	 229
-има_	 229
-_да_	 228
-_те	 227
-нов	 227
-пс	 225
-_е	 225
-_М	 223
-Срб	 223
-ца	 223
-_Срб	 222
-ара	 222
-ран	 221
-_мо	 221
-Бе	 221
-_де	 221
-биј	 220
-и.	 220
-јед	 219
-К	 219
-едн	 219
-са_	 219
-пи	 218
-оји_	 218
-ур	 218
-_об	 218
-ове	 217
-чн	 217
-тно	 217
-ави	 217
-еогр	 217
-еогра	 217
-еог	 217
-и._	 216
-ств	 216
-зв	 216
-_Бе	 216
-ник	 215
-_који	 214
-ниц	 214
-бо	 214
-који	 214
-_пос	 214
-уме	 213
-_К	 212
-за_	 211
-и,_	 211
-и,	 211
-тра	 209
-сп	 209
diff --git a/libtextcat/data/new_fingerprints/lm/slovak_ascii.lm b/libtextcat/data/new_fingerprints/lm/slovak_ascii.lm
deleted file mode 100644
index 29c8736..0000000
--- a/libtextcat/data/new_fingerprints/lm/slovak_ascii.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20064
-a	 4991
-o	 4983
-e	 3838
-n	 3342
-i	 3317
-r	 2583
-s	 2501
-v	 2383
-t	 2325
-c	 1918
-k	 1912
-l	 1888
-d	 1736
-u	 1725
-p	 1543
-a_	 1527
-y	 1371
-m	 1339
-z	 1227
-h	 1194
-e_	 956
-_p	 881
-_s	 828
-o_	 814
-na	 809
-b	 808
-_v	 798
-j	 797
-.	 796
-ov	 795
-._	 785
-st	 687
-i_	 665
-,	 657
-,_	 657
-_n	 625
-ch	 623
-u_	 618
-ro	 617
-po	 598
-_o	 546
-ne	 529
-en	 520
-v_	 519
-_a	 516
-ra	 506
-pr	 488
-y_	 481
-od	 476
-_z	 467
-ie	 462
-ni	 448
-an	 447
-vy	 434
-to	 433
-h_	 431
-_na	 429
-re	 416
-ch_	 404
-ho	 401
-al	 399
-ci	 394
-va	 387
-na_	 386
-_pr	 385
-_d	 384
-_k	 378
-la	 377
-ko	 375
-do	 374
-_po	 373
-si	 353
-_t	 346
-_r	 337
-os	 336
-no	 334
-in	 328
-tr	 324
-om	 321
-_v_	 320
-ny	 319
-m_	 319
-ri	 317
-S	 306
-ac	 302
-sa	 300
-ti	 300
-_m	 298
-za	 298
-er	 291
-ia	 290
-ce	 290
-li	 289
-yc	 286
-ych	 285
-ed	 284
-at	 281
-ob	 281
-ak	 280
-_na_	 280
-il	 279
-_,	 279
-_,_	 279
-ok	 277
-sk	 268
-ych_	 265
-_c	 262
-mi	 261
-ol	 260
-me	 260
-l_	 259
-t_	 259
-ku	 258
-ta	 256
-le	 256
-_b	 254
-or	 252
-_a_	 250
-lo	 247
-oc	 246
-vo	 246
-es	 244
-ve	 242
-_vy	 240
-on	 238
-_sa	 231
-as	 231
-da	 230
-aj	 228
-av	 218
-el	 216
-ova	 216
-ic	 215
-ne_	 209
-_do	 208
-sa_	 207
-ka	 205
-_sa_	 204
-te	 203
-j_	 201
-_ro	 199
-P	 198
-_za	 196
-ky	 196
-_S	 195
-je	 194
-ar	 193
-_.	 193
-it	 192
-s_	 192
-em	 191
-ej	 191
-ur	 190
-ad	 189
-_o_	 187
-_._	 187
-ov_	 185
-de	 180
-_%	 179
-om_	 179
-%	 179
-_u	 174
-pre	 173
-dn	 173
-D	 172
-rok	 170
-ie_	 170
-sp	 169
-pri	 167
-_pre	 167
-am	 165
--	 164
-ke	 164
-eh	 162
-oz	 161
-k_	 160
-ost	 160
-_j	 156
-f	 155
-zn	 153
-g	 152
-kt	 152
-ho_	 151
-eho	 151
-hod	 150
-ku_	 148
-is	 148
-zi	 147
-cn	 147
-eho_	 146
-ej_	 145
-az	 145
-tu	 145
-_pri	 144
-cen	 144
-_st	 143
-ma	 142
-ast	 141
-_ce	 140
-rov	 140
-la_	 138
-ot	 138
-nych	 135
-nyc	 135
-_ob	 133
-z_	 133
-nych_	 131
-N	 130
-li_	 129
-ani	 129
-co	 128
-nt	 128
-ny_	 127
-E	 125
-_ne	 124
-)	 123
-_(	 123
-sti	 123
-A	 123
-(	 123
-cho	 122
-vi	 122
-_sp	 122
-di	 120
-pa	 120
-n_	 119
-ju	 118
-ys	 117
-bo	 117
-_P	 116
-_tr	 115
-V	 114
-je_	 114
-ln	 114
-_i	 113
-ze	 113
-spo	 112
-_N	 112
-nd	 111
-nu	 111
-so	 111
-red	 110
-vn	 110
-kl	 110
-kov	 110
-_cen	 110
-_rok	 109
-tn	 109
-du	 109
-nc	 109
-ap	 109
-d_	 108
-van	 108
-ca	 108
-M	 108
-chod	 107
-ti_	 107
-U	 106
-_ak	 106
-ru	 105
-sta	 105
-ym	 105
-_-	 104
-et	 103
-_h	 102
-est	 102
-_je	 102
-nos	 101
-aci	 101
-us	 100
-dov	 100
-pod	 100
-_to	 100
-tor	 99
-uc	 99
-ras	 98
-ky_	 98
-_s_	 98
-_mi	 97
-*	 97
-uj	 97
-nost	 97
-vys	 97
-ovy	 97
-ez	 97
-oku	 96
-_V	 96
-op	 96
-bc	 96
-rast	 96
-se	 95
-B	 95
-roku	 95
-kto	 94
-ove	 94
-by	 94
--_	 94
-_ko	 93
-obc	 92
-nie	 91
-ia_	 91
-ka_	 91
-*_	 90
-ali	 90
-lo_	 89
-ovan	 89
-to_	 88
-iz	 88
-_bo	 88
-_l	 88
-odo	 87
-bch	 87
-bchod	 87
-bcho	 87
-sl	 86
-st_	 86
-pred	 86
-C	 86
-pol	 85
-_pred	 85
-R	 85
-ik	 84
-uro	 84
-pi	 84
-ek	 84
-zo	 83
-eni	 83
-obch	 83
-cie	 83
-oku_	 83
-obcho	 83
-ns	 83
-roku_	 82
-ii	 82
-tv	 82
-ba	 82
-ent	 82
-_spo	 81
-tov	 81
-pe	 81
-kon	 80
-kc	 80
-ec	 80
-kci	 80
-ck	 80
-x	 79
-osti	 79
-_Sk	 79
-mi_	 79
-_in	 79
-Sk	 79
-sia	 79
-br	 78
-rh	 78
-val	 78
-olo	 77
-_pod	 77
-%_	 77
-_%_	 77
-bu	 77
-_f	 77
-iv	 77
-_obc	 77
-_obch	 77
-eb	 76
-str	 76
-nej	 76
-_D	 76
-ni_	 75
-ou	 75
-im	 75
-ena	 74
-tre	 74
-_A	 74
-mo	 74
-su	 74
-rz	 73
-_trh	 73
-trh	 73
-_U	 73
-al_	 73
-_ra	 73
-_e	 72
-_C	 72
-sti_	 72
-zv	 72
-te_	 72
-cno	 72
-oj	 72
-ktor	 71
-_roku	 71
-ocn	 71
-ina	 71
-sil	 71
-nov	 71
-alo	 71
-odn	 70
-nan	 70
-oh	 70
diff --git a/libtextcat/data/new_fingerprints/lm/slovenian.lm b/libtextcat/data/new_fingerprints/lm/slovenian.lm
deleted file mode 100644
index 0fb3f18..0000000
--- a/libtextcat/data/new_fingerprints/lm/slovenian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 10406
-a	 2828
-e	 2676
-i	 2458
-o	 2418
-n	 1814
-r	 1484
-v	 1253
-l	 1248
-s	 1228
-t	 1172
-j	 1107
-d	 1085
-k	 911
-p	 880
-a_	 823
-m	 763
-i_	 681
-e_	 678
-_p	 603
-o_	 566
-u	 521
-z	 516
-b	 456
-_s	 435
-je	 434
-,	 416
-,_	 411
-ni	 399
-č	 383
-_v	 372
-_d	 356
-pr	 355
-g	 345
-ra	 336
-_n	 332
-st	 323
-an	 313
-po	 303
-re	 301
-na	 295
-h	 287
-ov	 276
-_pr	 276
-li	 275
-al	 274
-_z	 270
-je_	 259
-la	 255
-š	 253
-ne	 248
-en	 246
-ko	 244
-in	 237
-c	 234
-ti	 234
-v_	 234
-_po	 232
-no	 230
-ve	 230
-_k	 227
-_i	 224
-da	 224
-.	 221
-_j	 221
-ri	 220
-ja	 216
-_t	 214
-se	 213
-ed	 212
-._	 211
-em	 206
-te	 205
-za	 201
-od	 201
-av	 200
-lo	 196
-nj	 194
-_o	 194
-_je	 193
-il	 190
-or	 183
-ka	 181
-sk	 179
-_b	 178
-_je_	 178
-ih	 178
-n_	 177
-_za	 173
-h_	 171
-er	 171
-os	 171
-_na	 168
-va	 168
-ta	 164
-le	 163
-m_	 161
-ev	 157
-ij	 157
-ar	 157
-do	 155
-to	 155
-ž	 154
-A	 153
-el	 150
-_m	 148
-ro	 147
-ol	 146
-_v_	 145
-aj	 145
-di	 143
-N	 142
-S	 142
-at	 140
-ih_	 139
-ki	 138
-de	 137
-_in	 135
-vo	 135
-ga	 134
-me	 131
-in_	 129
-vi	 129
-om	 127
-_in_	 125
-et	 124
-pre	 124
-O	 123
-bi	 120
-I	 119
-da_	 117
-ik	 117
-ma	 115
-E	 114
-so	 113
-bo	 112
-it	 112
-anj	 112
-eg	 110
-ni_	 109
-mi	 108
-ke	 108
-na_	 108
-u_	 108
-lj	 106
-iz	 105
-ob	 105
-_da	 103
-li_	 103
-is	 103
-im	 102
-red	 102
-_pre	 102
-dr	 100
-mo	 99
-P	 99
-_se	 99
-ji	 98
-r_	 97
-ad	 97
-pri	 97
-K	 97
-_l	 97
-tr	 95
-pa	 94
-no_	 94
-j_	 92
-ki_	 91
-ti_	 91
-_pri	 91
-dn	 89
-_P	 88
-ej	 88
-_da_	 87
-ne_	 86
-ega	 86
-_r	 86
-_bi	 86
-l_	 86
-em_	 86
-go	 86
-"	 85
-sl	 85
-ek	 84
-ali	 84
-ove	 84
-ač	 84
-ak	 84
-ci	 83
-ga_	 83
-ko_	 83
-se_	 82
-_S	 82
-jo	 81
-ot	 81
-ja_	 81
-_so	 80
-lov	 80
-L	 80
-D	 79
-V	 79
-as	 78
-_do	 78
-am	 78
-nje	 77
-es	 77
-za_	 77
-_pa	 76
-T	 75
-tu	 75
-_za_	 74
-sti	 74
-_dr	 74
-la_	 74
-_N	 74
-_de	 74
-ega_	 73
-_ko	 73
-og	 73
-ns	 72
-če	 72
-ds	 72
-_bo	 71
-ora	 71
-vn	 71
-ost	 71
-_ne	 71
-ič	 70
-ven	 69
-z_	 69
-či	 69
-_te	 68
-ce	 68
-_se_	 67
-ča	 67
-oč	 67
-M	 66
-_u	 66
-un	 65
-ln	 65
-pos	 64
-ju	 64
-sta	 64
-op	 64
-di_	 63
-ud	 63
-vs	 63
-t_	 62
-nsk	 62
-tv	 62
-on	 62
-ski	 62
-R	 62
-pa_	 62
-_ka	 62
-i,	 61
-so_	 61
-_iz	 60
-_pa_	 60
-s_	 60
-i,_	 60
-pro	 59
-del	 59
-rav	 59
-eni	 59
-oli	 58
-rj	 58
-e,	 57
-še	 57
-ili	 57
-vr	 57
-d_	 57
-_le	 57
-pred	 57
-jo_	 56
-e,_	 56
-nik	 56
-love	 56
-_pred	 56
-ske	 56
-er_	 55
-str	 55
-čn	 54
-pra	 54
-J	 54
-_š	 54
-oven	 53
-_ra	 53
-tn	 53
-_na_	 53
-_so_	 53
-nih	 53
-loven	 53
-si	 52
-ke_	 52
-_g	 52
-ic	 52
-udi	 51
-bi_	 51
-eds	 51
-oj	 51
-ru	 51
-a,	 51
-_pro	 50
-_pos	 50
-nc	 50
-nih_	 50
-ču	 50
-a,_	 50
-_a	 50
-az	 50
-ok	 50
-B	 50
-let	 49
-udi_	 49
-_od	 49
-_K	 49
-aj_	 48
-_bi_	 48
-_ve	 48
-rač	 48
-o,	 47
-_tu	 47
-ija	 47
-ter	 47
-ist	 47
-Z	 47
-reds	 46
-nd	 46
-ali_	 46
-A_	 46
-iti	 46
-bil	 46
-_ob	 46
-o,_	 46
-ati	 46
-tud	 45
-tudi	 45
-_ki	 45
-k_	 45
-be	 45
-aš	 45
-ir	 45
-ža	 45
-do_	 45
-sp	 45
-_ki_	 45
-_st	 45
-ep	 44
-_del	 44
-tudi_	 44
-rž	 44
-aču	 44
-_ni	 44
-ah	 43
-raču	 43
-račun	 43
-iš	 43
-_mo	 43
-avn	 43
-_tud	 43
-čun	 43
-ačun	 43
-_tudi	 43
-_to	 42
-raz	 42
-kr	 42
-ova	 42
-_e	 42
-ogo	 42
-ani	 42
-_"	 42
-ev_	 42
-br	 42
-eb	 42
-sa	 42
-mi_	 42
-tem	 42
-ta_	 41
-prav	 41
-i.	 41
-slov	 41
-ens	 41
-bo_	 41
-že	 41
-_T	 41
-_let	 41
-odo	 41
-slo	 41
-ensk	 40
-ka_	 40
-neg	 40
-ez	 40
-nos	 40
-eč	 40
-_sl	 40
-_V	 40
-rža	 40
-nega	 40
-ili_	 39
diff --git a/libtextcat/data/new_fingerprints/lm/spanish.lm b/libtextcat/data/new_fingerprints/lm/spanish.lm
deleted file mode 100644
index e40317f..0000000
--- a/libtextcat/data/new_fingerprints/lm/spanish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 25044
-e	 7830
-a	 7437
-o	 5102
-s	 4394
-n	 4358
-i	 4065
-r	 3998
-l	 3634
-d	 3118
-c	 2931
-t	 2834
-u	 2316
-a_	 2269
-e_	 2211
-s_	 1862
-de	 1679
-p	 1673
-_d	 1644
-m	 1447
-_de	 1443
-n_	 1332
-o_	 1301
-en	 1295
-_e	 1216
-es	 1177
-_l	 1132
-de_	 1080
-la	 1060
-os	 1028
-_de_	 1027
-_p	 963
-l_	 910
-ci	 890
-_c	 866
-_a	 866
-os_	 801
-ar	 777
-er	 775
-as	 768
-ra	 746
-nt	 736
-_la	 727
-re	 726
-,_	 724
-,	 724
-el	 722
-ta	 708
-ue	 701
-g	 678
-on	 674
-al	 670
-_s	 666
-co	 653
-b	 637
-an	 622
-v	 616
-la_	 616
-or	 612
-te	 599
-st	 596
-el_	 580
-_la_	 573
-y	 545
-to	 543
-r_	 517
-ad	 512
-ó	 511
-do	 504
-ro	 504
-se	 488
-as_	 488
-q	 487
-qu	 487
-.	 479
-._	 478
-en_	 475
-ca	 460
-in	 459
-un	 456
-_co	 450
-es_	 449
-ic	 449
-_en	 440
-ac	 440
-que	 439
-na	 439
-lo	 430
-_m	 430
-f	 429
-ent	 428
-da	 412
-ue_	 411
-po	 405
-le	 399
-_q	 399
-_qu	 399
-que_	 393
-_que	 388
-ie	 386
-h	 385
-pa	 382
-y_	 371
-ti	 367
-_que_	 365
-_en_	 365
-_y	 361
-tr	 358
-_el	 353
-ri	 349
-ia	 342
-_el_	 333
-_se	 330
-ió	 330
-_y_	 330
-io	 329
-pr	 320
-ón	 317
-ec	 317
-no	 314
-id	 301
-í	 300
-mi	 299
-_t	 299
-ión	 292
-nte	 292
-me	 286
-aci	 283
-do_	 279
-li	 276
-con	 276
-nd	 273
-est	 272
-ni	 272
-á	 271
-di	 270
-_es	 268
-_lo	 267
-ció	 265
-ma	 265
-ón_	 264
-_pr	 263
-_r	 261
-ción	 255
-z	 254
-ra_	 251
-si	 247
-ión_	 246
-oc	 245
-nc	 244
-_u	 244
-_po	 243
-los	 243
-or_	 242
-_con	 241
-is	 239
-del	 238
-_del	 237
-ado	 236
-se_	 233
-_i	 233
-los_	 231
-_re	 231
-por	 229
-_del_	 228
-sta	 228
-del_	 228
-al_	 228
-ne	 226
-_h	 226
-cu	 225
-_n	 225
-_a_	 224
-_v	 224
-_un	 223
-ce	 222
-so	 220
-ción_	 218
-res	 218
-vi	 217
-om	 216
-te_	 212
-_pa	 211
-ien	 210
-j	 209
-E	 208
-_los	 207
-_los_	 207
-to_	 206
-ol	 204
-it	 203
-am	 202
-ació	 201
-rt	 201
-ación	 201
-pe	 197
-ha	 190
-_se_	 189
-nto	 188
-_o	 184
-_E	 184
-on_	 184
-sa	 183
-na_	 182
-ta_	 181
-su	 180
-cia	 180
-mo	 180
-ct	 178
-par	 178
-_f	 177
-_por	 176
-eg	 172
-_in	 172
-ur	 170
-L	 168
-ve	 166
-im	 164
-ga	 163
-_est	 161
-ar_	 161
-ab	 160
-_L	 159
-tu	 158
-at	 158
-no_	 157
-s,	 157
-s,_	 157
-_por_	 156
-por_	 156
-las	 156
-ba	 154
-o,_	 154
-o,	 154
-ento	 151
-et	 150
-C	 150
-_ha	 149
-A	 149
-tra	 148
-ient	 148
-_al	 147
-a,_	 146
-ica	 146
-a,	 146
-pro	 146
-ado_	 145
-ici	 144
-_ca	 144
-an_	 144
-las_	 143
-ara	 143
-nci	 143
-ente	 142
-ú	 142
-rr	 142
-ir	 142
-da_	 141
-em	 141
-ll	 140
-il	 139
-ía	 138
-iv	 138
-_su	 138
-_par	 136
-ul	 136
-ant	 136
-_A	 135
-mp	 135
-_las_	 134
-_las	 134
-_C	 134
-_pro	 133
-men	 132
-P	 132
-des	 131
-com	 130
-ion	 130
-era	 130
-ed	 129
-ida	 129
-sp	 128
-gu	 127
-nte_	 127
-ns	 127
-za	 126
-dos	 125
-M	 125
-cio	 125
-les	 125
-_P	 124
-bl	 124
-_com	 122
-s._	 122
-s.	 122
-_M	 121
-ua	 120
-nta	 120
-mu	 119
-_no	 118
-dad	 118
-ñ	 117
-é	 116
-un_	 116
-va	 116
-ist	 116
-nes	 116
-iento	 115
-one	 114
-ara_	 113
-S	 113
-ada	 113
-_un_	 113
-fi	 111
-pre	 110
-tos	 110
-ter	 109
-ot	 109
-esta	 108
-_me	 107
-ido	 107
-ob	 107
-_g	 105
-br	 105
-go	 105
-ea	 104
-nto_	 104
-ona	 103
-pu	 103
-dos_	 103
-tro	 103
-ier	 103
-para	 102
-ment	 101
-ag	 101
-ero	 101
-gr	 101
-rec	 101
-bi	 101
-ia_	 100
-una	 100
-nic	 99
-ncia	 99
-ía_	 98
-a._	 98
-tos_	 98
-a.	 98
-ran	 98
-lo_	 97
-ones	 97
-rm	 96
-lu	 96
-ron	 95
-con_	 95
-ó_	 95
-nes_	 95
-_ci	 95
-ante	 94
-ch	 94
-_con_	 94
-_para	 94
-ntr	 93
-una_	 93
-para_	 93
-mie	 92
-ico	 92
-fe	 92
-les_	 92
-uc	 92
-ip	 91
-sto	 91
-_ma	 91
-ui	 91
-sta_	 91
-_ve	 90
-cion	 90
-"	 90
-op	 90
-cal	 89
-_mu	 89
-_S	 89
-ro_	 89
-_pe	 88
-ste	 88
-ras	 88
-pl	 88
-_una	 88
-_di	 87
-ento_	 86
-ita	 86
-ione	 85
-ect	 85
-_una_	 85
-mien	 85
-tan	 85
-du	 84
-den	 84
-ndo	 84
-per	 84
-eri	 84
diff --git a/libtextcat/data/new_fingerprints/lm/swahili.lm b/libtextcat/data/new_fingerprints/lm/swahili.lm
deleted file mode 100644
index 56090b4..0000000
--- a/libtextcat/data/new_fingerprints/lm/swahili.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 16483
-a	 9342
-i	 5293
-a_	 4071
-u	 2730
-k	 2609
-n	 2351
-w	 2076
-m	 1928
-e	 1866
-h	 1800
-o	 1775
-wa	 1743
-l	 1486
-s	 1419
-i_	 1401
-t	 1399
-_k	 1306
-y	 1100
-_w	 969
-li	 945
-wa_	 911
-z	 891
-_wa	 890
-ka	 834
-ku	 799
-r	 770
-b	 733
-an	 727
-ma	 723
-o_	 711
-_m	 707
-na	 698
-ya	 675
-ha	 672
-g	 602
-al	 580
-d	 570
-at	 560
-am	 554
-_n	 549
-_ku	 549
-ik	 543
-_h	 515
-ya_	 514
-A	 494
-is	 487
-_y	 485
-hi	 474
-na_	 471
-_ya	 471
-ta	 468
-sh	 456
-ali	 449
-j	 426
-u_	 423
-ki	 418
-e_	 402
-p	 401
-ti	 401
-_wa_	 399
-f	 392
-_ya_	 390
-ba	 390
-ri	 385
-ng	 385
-il	 380
-c	 358
-hu	 356
-_na	 356
-ni	 355
-za	 354
-zi	 351
-ia	 344
-_na_	 343
-_a	 336
-in	 327
-_ma	 326
-ch	 322
-mb	 317
-ika	 314
-.	 311
-._	 309
-_ka	 307
-as	 306
-ak	 306
-ati	 301
-,	 300
-ka_	 296
-,_	 294
-_u	 292
-kw	 286
-ili	 278
-K	 274
-en	 271
-si	 266
-_kw	 262
-la	 261
-ni_	 261
-ma_	 261
-_s	 258
-kwa	 258
-ar	 256
-ut	 245
-za_	 245
-nd	 242
-mba	 241
-_kwa	 239
-_z	 234
-li_	 233
-un	 233
-ny	 230
-it	 229
-se	 229
-yo	 227
-ia_	 222
-M	 221
-sa	 221
-kat	 217
-_K	 214
-_i	 213
-ika_	 213
-ana	 212
-ish	 212
-kati	 206
-_ha	 204
-on	 201
-ai	 200
-I	 198
-aa	 196
-um	 195
-im	 190
-v	 188
-mu	 187
-amb	 187
-sha	 185
-em	 183
-fa	 181
-zi_	 180
-di	 179
-mi	 178
-_M	 178
-us	 176
-_ki	 176
-ha_	 175
-iw	 172
-ama	 172
-_kat	 168
-_kati	 168
-_hi	 166
-_l	 166
-ra	 166
-kwa_	 165
-la_	 164
-W	 164
-ja	 163
-U	 163
-N	 163
-amba	 161
-ao	 161
-_za	 160
-ji	 160
-B	 157
-iwa	 155
-tik	 155
-wal	 155
-le	 155
-tika	 154
-ge	 153
-lis	 153
-tu	 152
-atika	 152
-to	 152
-atik	 152
-uw	 152
-_kwa_	 151
-A_	 151
-ke	 150
-S	 147
-tika_	 145
-aj	 145
-we	 144
-cha	 144
-bi	 141
-az	 140
-er	 139
-ek	 138
-katik	 138
-ez	 138
-uwa	 137
-kut	 135
-_al	 134
-_B	 134
-ad	 134
-mu_	 133
-_ali	 133
-rik	 132
-_W	 131
-ba_	 131
-kuw	 131
-me	 130
-ali_	 128
-kuwa	 128
-ema	 127
-wan	 127
-bu	 126
-sem	 126
-_A	 125
-ir	 125
-ata	 125
-iz	 124
-_hu	 124
-ay	 124
-ul	 124
-af	 123
-iki	 122
-ema_	 121
-da	 120
-ti_	 120
-sema	 119
-aka	 118
-sema_	 118
-te	 118
-uz	 117
-yo_	 117
-_v	 117
-io	 116
-iy	 115
-uta	 115
-ani	 115
-_wal	 115
-he	 115
-if	 114
-_la	 114
-ab	 114
-go	 112
-_za_	 111
-ama_	 111
-sa_	 111
-pa	 110
-_t	 110
-zo	 110
-nge	 110
-wam	 109
-wali	 108
-ua	 107
-ur	 106
-_c	 106
-ise	 105
-_ch	 105
-isem	 105
-ho	 105
-ye	 104
-iyo	 104
-E	 104
-el	 104
-mo	 103
-ung	 103
-eri	 103
-_wali	 103
-_b	 102
-mba_	 102
-ari	 101
-ita	 101
-isema	 100
-ot	 99
-_la_	 99
-uk	 99
-ao_	 99
-di_	 99
-sha_	 99
-ini	 99
-kuwa_	 98
-uwa_	 98
-ana_	 98
-lise	 98
-lisem	 98
-uli	 97
-shi	 97
-ga	 96
-iwa_	 96
-fu	 96
-T	 96
-R	 95
-_il	 95
-wak	 94
-aw	 94
-isha	 94
-ri_	 93
-_am	 93
-ara	 92
-_cha	 92
-aji	 92
-_ili	 91
-ifa	 91
-O	 90
-_p	 90
-uh	 90
-iri	 90
-chi	 90
-asi	 89
-po	 89
-a.	 89
-ong	 89
-azi	 88
-_j	 88
-_kut	 88
-eny	 88
-nc	 88
-a._	 88
-ko	 87
-uu	 87
-id	 87
-w_	 87
-no	 87
-P	 86
-ah	 86
-ina	 86
-rika	 86
-_Bw	 85
-H	 85
-gu	 85
-uo	 85
-Bw_	 85
-_Bw_	 85
-_se	 85
-Bw	 85
-ib	 84
-_S	 84
-kam	 84
-hi_	 84
-nya	 84
-si_	 83
-a,	 82
-no_	 81
-pi	 81
-ok	 81
-i.	 81
-ip	 81
-kwam	 81
-i._	 81
-amba_	 80
-dh	 80
-end	 80
-ani_	 80
-a,_	 79
-wamb	 79
-kwamb	 79
-_sh	 79
-eza	 79
-nz	 79
-wi	 79
-_kwam	 79
-wamba	 79
-alis	 78
-_kuw	 78
-ngo	 78
-ap	 77
-_N	 77
-any	 77
-ili_	 77
-C	 77
-WA	 76
-vy	 76
-wana	 76
-_hiy	 75
-Wa	 75
-hiyo	 75
-nch	 75
-_hiyo	 75
-de	 75
-_kuwa	 75
-ing	 75
-hiy	 75
-vi	 75
-isha_	 74
-es	 74
-atu	 74
-_Wa	 74
-nchi	 74
-aki	 74
-lim	 73
-da_	 73
-ini_	 73
-ash	 73
-ala	 73
-i,	 73
-ano	 73
-i,_	 72
-_kam	 71
-_wan	 71
-ano_	 71
-mw	 71
-nde	 71
-ji_	 71
-ion	 70
-_amb	 70
-ndi	 70
-_Ka	 70
-eza_	 70
diff --git a/libtextcat/data/new_fingerprints/lm/swedish.lm b/libtextcat/data/new_fingerprints/lm/swedish.lm
deleted file mode 100644
index 1c02124..0000000
--- a/libtextcat/data/new_fingerprints/lm/swedish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 33494
-e	 8992
-n	 7900
-t	 7859
-a	 7781
-r	 7251
-s	 6435
-i	 5649
-l	 4541
-d	 4079
-o	 3724
-m	 3203
-k	 3058
-g	 2478
-en	 2403
-n_	 2389
-t_	 2073
-de	 1939
-r_	 1910
-v	 1890
-h	 1789
-u	 1782
-_s	 1768
-ä	 1724
-er	 1709
-f	 1597
-en_	 1537
-a_	 1526
-an	 1357
-p	 1320
-et	 1317
-ö	 1278
-å	 1261
-st	 1236
-ar	 1226
-c	 1191
-_d	 1158
-e_	 1116
-in	 1045
-_f	 1027
-te	 1000
-b	 997
-_a	 978
-s_	 974
-ra	 958
-.	 956
-tt	 935
-_i	 898
-_m	 890
-._	 886
-ll	 870
-ta	 844
-_o	 842
-_e	 839
-nd	 820
-ti	 804
-sk	 798
-re	 779
-at	 769
-_de	 754
-om	 743
-m_	 739
-ör	 720
-,	 697
-,_	 695
-ng	 686
-li	 673
-ka	 666
-oc	 662
-_h	 654
-on	 652
-et_	 647
-ch	 645
-ns	 643
-is	 642
-er_	 630
-är	 625
-_v	 614
-_t	 614
-ni	 611
-i_	 609
-_oc	 592
-tt_	 587
-na	 586
-y	 586
-la	 579
-_b	 579
-h_	 577
-kt	 575
-ch_	 568
-ig	 564
-fö	 563
-och	 555
-or	 555
-_och	 554
-och_	 554
-_och_	 553
-me	 548
-den	 548
-om_	 535
-_i_	 531
-d_	 530
-j	 529
-ik	 520
-de_	 520
-för	 518
-ge	 498
-ad	 497
-_k	 491
-_fö	 487
-ri	 484
-el	 482
-il	 481
-so	 480
-al	 474
-g_	 469
-le	 464
-an_	 461
-_för	 447
-si	 437
-ar_	 437
-att	 435
-_p	 434
-es	 420
-ing	 413
-se	 407
-to	 404
-_u	 403
-_en	 403
-and	 398
-den_	 395
-nde	 393
-nn	 393
-_l	 391
-å_	 391
-D	 385
-än	 383
-nt	 382
-l_	 381
-tr	 378
-_D	 372
-va	 370
-am	 369
-sa	 367
-_so	 365
-ga	 364
-_en_	 361
-är_	 358
-ck	 357
-av	 354
-v_	 351
-ed	 347
-ma	 346
-da	 346
-som	 346
-rs	 344
-som_	 344
-ve	 342
-ter	 341
-att_	 341
-ha	 338
-ne	 337
-ut	 335
-as	 332
-ska	 329
-_at	 327
-_att	 326
-_som	 324
-_att_	 324
-_som_	 323
-vi	 322
-ikt	 317
-_av	 316
-det	 316
-_den	 315
-he	 315
-ss	 314
-un	 307
-ke	 304
-_g	 303
-us	 302
-di	 302
-_st	 300
-rn	 297
-_me	 296
-_ä	 295
-ade	 294
-"	 290
-_ha	 290
-av_	 289
-ill	 288
-_n	 286
-_in	 279
-io	 275
-_r	 275
-der	 275
-it	 274
-_av_	 274
-sta	 274
-gen	 272
-isk	 270
-_ti	 269
-id	 265
-na_	 265
-ns_	 264
-ko	 262
-_den_	 261
-ag	 258
-det_	 257
-lig	 257
-era	 256
-ll_	 255
-_det	 252
-_är	 251
-be	 249
-_är_	 248
-ra_	 247
-ion	 244
--	 241
-pr	 240
-oni	 233
-til	 231
-ten	 228
-_si	 225
-k_	 222
-på	 222
-fr	 221
-ro	 219
-till	 219
-iv	 216
-ls	 216
-ande	 215
-ör_	 214
-_det_	 213
-äl	 212
-_på	 211
-ts	 210
-ens	 209
-med	 209
-mm	 208
-rt	 208
-_till	 208
-_til	 208
-_va	 207
-_fr	 205
-_sk	 205
-var	 205
-nin	 204
-ning	 203
-ol	 201
-ka_	 200
-lle	 198
-ett	 198
-rd	 197
-em	 196
-på_	 195
-x	 195
-rk	 194
-_ut	 194
-ste	 194
-ds	 193
-_vi	 192
-år	 192
-S	 192
-nde_	 191
-are	 191
-ver	 190
-_på_	 190
-nis	 189
-kr	 189
-_med	 188
-all	 188
-ån	 187
-nge	 185
-mo	 184
-os	 183
-ld	 182
-ade_	 181
-_S	 181
-ed_	 180
-rä	 176
-De	 175
-_-	 175
-kan	 174
-ta_	 173
-ng_	 172
-vä	 171
-för_	 170
-ill_	 170
-han	 170
-_De	 170
-pp	 169
-lt	 169
-sam	 168
-nte	 167
-ans	 167
-ton	 166
-ur	 165
-mi	 165
-ess	 165
-kl	 164
-ig_	 164
-ks	 164
-as_	 163
-und	 163
-men	 162
-med_	 161
-_med_	 161
-ak	 161
-Di	 160
-ot	 159
-rna	 159
-ul	 159
-_var	 159
-te_	 158
-gen_	 158
-het	 157
-kto	 157
-str	 156
-_Di	 155
-tad	 155
-lan	 154
-ga_	 154
-iska	 154
-fa	 154
-fi	 154
-så	 154
-Dikt	 153
-Dik	 153
-pe	 153
-ska_	 152
-ja	 152
-H	 151
-res	 151
-ku	 151
-iu	 150
-ande_	 150
-till_	 150
-t.	 150
-ern	 150
-rm	 149
-_Dikt	 149
-_Dik	 149
-ie	 149
-bl	 148
--_	 147
-od	 147
-_H	 147
-n.	 147
-ist	 147
-_di	 146
-ius	 146
-_"	 145
-la_	 145
-sl	 145
-man	 145
-ren	 145
-_för_	 145
-toni	 144
-kton	 144
-n._	 144
-ktoni	 144
-ikton	 144
-I	 144
-ikto	 144
-nius	 143
-ten_	 143
-onius	 143
-oniu	 143
-toniu	 143
-ing_	 143
-Dikto	 143
-niu	 143
-_ko	 143
-ic	 142
-_sa	 142
-_han	 142
-ett_	 142
-sm	 141
-ba	 141
-M	 141
-gr	 140
-lä	 140
-ex	 138
-t._	 138
-sp	 137
-lla	 137
-_et	 137
-_M	 137
-dr	 137
-rö	 136
-rad	 136
-ek	 136
-_be	 135
-tar	 135
-_-_	 135
-_om	 134
-rl	 134
-E	 134
-mä	 133
diff --git a/libtextcat/data/new_fingerprints/lm/tagalog.lm b/libtextcat/data/new_fingerprints/lm/tagalog.lm
deleted file mode 100644
index bc87d38..0000000
--- a/libtextcat/data/new_fingerprints/lm/tagalog.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 10664
-a	 6092
-n	 3421
-i	 2332
-g	 2149
-ng	 1488
-an	 1332
-g_	 1308
-ng_	 1243
-t	 1155
-a_	 1138
-o	 1137
-l	 1105
-s	 1067
-k	 1035
-_n	 957
-m	 909
-y	 801
-ang	 787
-u	 767
-ang_	 683
-p	 682
-na	 670
-_a	 634
-la	 596
-.	 572
-in	 561
-r	 559
-sa	 545
-_s	 502
-._	 487
-ma	 476
-ka	 473
-_na	 464
-b	 462
-_m	 458
-al	 448
-d	 445
-pa	 414
-n_	 412
-at	 394
-ak	 393
-h	 378
-ya	 358
-_k	 356
-ag	 350
-ni	 344
-_p	 339
-_sa	 335
-o_	 328
-ta	 308
-_an	 307
-iy	 300
-sa_	 296
-_ang	 294
-_ang_	 293
-t_	 290
-ay	 286
-ga	 283
-on	 280
-it	 275
-_sa_	 265
-ala	 258
-_ng	 256
-am	 252
-_i	 248
-_pa	 248
-i_	 243
-na_	 243
-an_	 240
-e	 239
-_ma	 237
-_ka	 235
-iya	 231
-y_	 229
-il	 228
-li	 228
-w	 226
-_ni	 225
-_na_	 224
-_ng_	 220
-as	 214
-ba	 207
-si	 206
-"	 195
-ti	 195
-ha	 186
-,	 179
-ar	 178
-ing	 173
-ra	 173
-A	 172
-ki	 168
-ong	 167
-_b	 167
-ap	 166
-,_	 162
-ong_	 161
-ko	 159
-ay_	 159
-un	 157
-ul	 155
-yo	 154
-to	 152
-_l	 150
-ah	 148
-is	 147
-hi	 147
-_t	 146
-lan	 145
-ama	 142
-niy	 139
-at_	 138
-_niy	 138
-aka	 136
-wa	 136
-niya	 135
-_niya	 135
-ab	 134
--	 134
-di	 133
-_si	 132
-"_	 131
-aw	 129
-_d	 126
-_A	 126
-yan	 123
-ya_	 122
-ata	 120
-a.	 120
-gi	 120
-P	 120
-ing_	 118
-um	 115
-o.	 113
-aki	 113
-ri	 113
-ik	 112
-nd	 112
-ila	 111
-mo	 110
-da	 110
-a._	 110
-in_	 109
-la_	 107
-ali	 106
-S	 106
-man	 105
-ig	 105
-iya_	 105
-s_	 104
-_ak	 104
-_at	 103
-_h	 102
-yon	 102
-asa	 101
-ina	 101
-_P	 101
-n.	 99
-N	 98
-aa	 98
-ga_	 97
-_mo	 97
-_ba	 97
-_"	 95
-ito	 94
-bi	 94
-yang	 94
-n._	 93
-pag	 92
-lang	 92
-yang_	 92
-_la	 92
-o._	 90
-K	 90
-_at_	 90
-tu	 88
-_S	 88
-ara	 87
-nga	 87
-ro	 85
-apa	 83
-rr	 82
-lam	 82
-lo	 81
-nan	 81
-_N	 80
-aman	 79
-aha	 78
-mg	 78
-mga	 78
-mga_	 78
-_mga_	 78
-_mg	 78
-_mga	 78
-_K	 78
-siy	 77
-kan	 76
-it_	 76
-san	 76
-d_	 75
-ad	 75
-di_	 74
-tin	 74
-'	 74
-ati	 73
-siya	 73
-kin	 72
-M	 72
-lang_	 71
-mo_	 70
-_mo_	 70
-ako	 70
-uma	 70
-_pag	 69
-pi	 69
-l_	 68
-_siy	 68
-rrr	 68
-_siya	 67
-ula	 67
-_M	 66
-Pa	 66
-iyo	 66
-mi	 66
-bu	 66
-mu	 65
-no	 65
-pu	 65
-nag	 65
-ung	 65
-Na	 65
-ot	 64
-_Na	 64
-niya_	 64
-iyan	 64
-ku	 64
-k_	 63
-go	 62
-awa	 62
-ip	 61
-_Pa	 61
-lu	 61
-_di	 60
-pan	 60
-_ta	 60
-ini	 60
-isa	 60
-nt	 60
-iyang	 60
-_iyo	 59
-_iy	 59
-on_	 59
-tan	 59
-mang	 59
-aba	 59
-gan	 59
-ut	 58
-I	 58
-hin	 58
-nak	 58
-an.	 57
-akin	 57
-_r	 57
-han	 57
-Ka	 57
-_ay	 57
-_ako	 56
-may	 56
-iyon	 56
-rrrr	 55
-Sa	 55
-aga	 55
-to_	 55
-nit	 55
-_ko	 54
-er	 54
-ib	 54
-ari	 54
-ana	 54
-ili	 54
-an._	 54
-ahi	 54
-au	 54
-ala_	 54
-gk	 53
-pa_	 53
-_is	 53
-rin	 53
-ilan	 52
-_kan	 52
-_Ka	 52
-_it	 52
-_Sa	 51
-king	 51
-ko_	 51
-_nak	 51
-gin	 51
-_ay_	 50
-bo	 50
-_iyon	 50
-amang	 50
-'y	 49
-os	 49
-mang_	 49
-_pa_	 49
-kat	 49
-a,	 49
-An	 48
-Ma	 48
-ny	 48
-mag	 48
-_ku	 48
-_ito	 48
-_ha	 47
-yong	 47
-?	 47
-aking	 47
-T	 47
-ni_	 47
-yong_	 47
-_An	 47
-king_	 47
-_akin	 46
-sang	 46
-_nag	 46
-kas	 46
-_aki	 46
-_ni_	 46
-ayo	 45
-kit	 45
-'y_	 45
-mat	 45
-_Ma	 45
-lal	 45
-ot_	 45
-nya	 44
-ban	 44
-ndi	 44
-oo	 44
-_u	 44
-ngi	 44
-_hi	 44
-sang_	 44
-B	 43
-su	 43
-may_	 43
-rrrrr	 43
-p_	 43
-ita	 43
-wal	 43
-ika	 43
-abi	 43
-aan	 43
-_may	 43
-lama	 42
-naka	 42
-mal	 42
-_I	 42
-_ri	 42
-alan	 42
-any	 42
-im	 42
-_pu	 42
-ai	 42
-wala	 41
-anya	 41
-a,_	 41
-_B	 41
-ndi_	 41
-as_	 41
-pat	 41
-po	 41
-nang	 41
-_mag	 41
-laman	 40
-lala	 40
-kal	 40
-g-	 40
-..	 40
-ir	 40
-!	 40
-uk	 40
-gu	 39
-ito_	 39
-ro_	 39
-_g	 39
-_da	 39
-_isa	 39
-_lam	 39
-ilang	 39
-kanya	 39
-w_	 39
-kany	 39
-agk	 38
-pal	 38
-ka_	 38
-_naka	 38
-siya_	 38
-isan	 38
diff --git a/libtextcat/data/new_fingerprints/lm/tamil.lm b/libtextcat/data/new_fingerprints/lm/tamil.lm
deleted file mode 100644
index 8563707..0000000
--- a/libtextcat/data/new_fingerprints/lm/tamil.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 11468
-Õ	 2697
-Ô	 2533
-´	 1960
-»	 1786
-½	 1249
-Â	 1103
-Ù	 990
-£	 976
-Ø	 849
-¡	 847
-¨	 831
-¿	 821
-À	 794
-¾	 758
-§	 750
-Á	 721
-¹	 715
-¶	 713
-.	 702
-£_	 671
-×	 655
-â	 648
-Æ	 625
-._	 611
-ç	 601
-Å	 571
-¯	 557
-»Õ	 556
-É	 524
-_É	 520
-¢	 518
-_½	 492
-Ç	 489
-_×	 488
-Þ	 484
-_Ç	 482
-¤	 461
-Ä	 442
-¼	 418
-ÿ	 416
-¥	 403
-§_	 398
-½Ô	 373
-_Ø	 368
-ª	 360
-Í	 359
-_Í	 349
-»Ô	 348
-´Õ	 342
-à	 337
-_Â	 331
-õ	 331
-¨_	 323
-_¼	 321
-¡´	 320
-_´	 310
-Õ¿	 308
-Ü	 299
-¢»	 294
-Ó	 292
-´Ô	 292
-ÿ»	 290
-Õ§	 288
-¡Þ	 284
-â_	 279
-ý	 271
-õ´	 266
-ÂÕ	 265
-_»	 265
-¾Ô	 241
-_¾	 234
-´ª	 232
-=	 231
-±	 229
-¤½	 227
-==	 221
-¶Õ	 218
-»_	 218
-Õ§_	 213
-===	 211
-Õ_	 210
-====	 201
-ª_	 199
-´_	 198
-ÀÕ	 197
-=====	 191
-,	 188
-Ø½	 188
-¿Õ	 187
-º	 186
-_¶	 184
-,_	 184
-Ã	 183
-Ô¯	 181
-¿_	 179
-Ô¨	 178
-å	 172
-´ª_	 171
-ì	 169
-ÙÁ	 168
-¢»Õ	 165
-¿Ô	 165
-Ô_	 165
-ç¡	 164
-È	 161
-Þ_	 160
-Í¨	 160
-_Í¨	 157
-«	 156
-_È	 156
-§Á	 152
-Ô´	 152
-Ù»	 151
-Ð	 150
-_Ð	 149
-ä	 149
-ö	 146
-ÕÅ	 146
-Ø½Ô	 145
-¯´	 143
-Ö	 142
-×¶	 142
-ÁÔ	 142
-½Õ	 140
-Á_	 139
-Ô§	 138
-_Éç	 138
-Éç	 138
-¶Ô	 137
-Õ¨	 137
-Æ_	 136
-¢â	 133
-_×¶	 132
-ÔÆ	 128
-¡´Õ	 128
-ÀÔ	 127
-¥¹	 127
-_Ë	 127
-Ë	 127
-_Ø½	 127
-ÕÀ	 125
-öÓ	 125
-ÄÕ	 124
-ÆÔ	 122
-ÅÕ	 121
-Þ£	 120
-Õç	 119
-¼Ô	 119
-×½	 119
-´Ù	 119
-_å	 118
-¯_	 118
-£.	 117
-´ÕÅ	 116
-»Õ¿	 115
-ÂÔ	 115
-_ÂÕ	 113
-â.	 113
-×»	 113
-£._	 112
-¡Þ_	 112
-ÕÙ	 111
-Õ¡	 111
-ÙÄ	 109
-×´	 109
-é	 109
-â._	 108
-_½Ô	 107
-Õ´	 106
-¤_	 105
-ÆÕ	 104
-'	 104
-½¹	 103
-ç_	 102
-¹Ô	 102
-Ø´	 101
-¼Õ	 100
-Éÿ	 100
-_Éÿ	 99
-_×»	 99
-ÔÀ	 98
-Éÿ»	 98
-æ	 98
-_×½	 97
-Å_	 97
-Ô»	 97
-_Éÿ»	 97
-Ô¨_	 97
-¹_	 97
-ß	 96
-±Å	 96
-×´Ô	 96
-»Ô¨	 95
-¡Þ£	 94
-Õ¿_	 94
-Ø»	 94
-ø	 94
-ØÂ	 93
-í	 93
-_Ø½Ô	 93
-¾Õ	 93
-Õ¨_	 92
-ÿ»_	 91
-ÁÕ	 91
-_Éç¡	 90
-Éç¡	 90
-Ðç	 90
-ÕÆ	 90
-_Ðç	 90
-ÿ»Õ	 90
-Ù¹	 89
-_´Ô	 89
-_Ðç_	 88
-_¼Ô	 88
-Ðç_	 88
-ì_	 86
-ç¡´	 86
-ÅÔ	 86
-ÿâ	 85
-¥à	 85
-¯´ª	 84
-¨Æ	 84
-¨ì	 83
-Ô¥	 83
-÷	 83
-_Þ	 83
-´Ä	 82
-à_	 81
-Ô´_	 81
-¨.	 80
-_¾Ô	 80
-¿Õ§	 80
-²	 80
-ÕÁ	 80
-Ä_	 79
-´ÙÄ	 79
-_½¹	 79
-¨Å	 79
-Ô£	 79
-«¶	 78
-¡_	 78
-¨._	 77
-_¶Õ	 77
-§ÁÔ	 77
-_¼Õ	 77
-ë	 77
-Åâ	 76
-Þ£_	 75
-ÔÆ_	 75
-Ù¾	 75
-Â¯	 75
-ÙÂ	 74
-çÿ	 73
-ýà	 72
-è	 72
-¨ì_	 71
-Ô§_	 71
-´ë	 71
-¥Ü	 71
-§Ù	 70
-»Õ§	 70
-§ÙÁ	 70
-£½	 69
-Ù»_	 69
-ªÄ	 69
-ç¡Þ	 69
-Ó_	 68
-Ôõ	 68
-Ø¾	 67
-_Ø´	 67
-Õ¢	 66
-ÄÔ	 66
-»Ô¨_	 66
-à£	 66
-_Ç»	 66
-Ç»	 66
-Ô¹	 66
-Î	 66
-¿Õ§_	 65
-Ôâ	 65
-_»Õ	 64
-¯.	 64
-¹¢	 63
-Õ¥	 63
-Ô¡	 63
-_×´	 63
-_Î	 63
-Ù´	 62
-´ÄÕ	 62
-Õ¿Ô	 62
-¯._	 61
-Éÿ»Õ	 61
-_½Õ	 61
-_×»Ô	 61
-×»Ô	 61
-Ôõ´	 61
-½¥	 60
-ÿ»Õ¿	 60
-_ä	 60
-_Éÿ»Õ	 60
-Ô¾	 60
-Ôç	 59
-×¶Ô	 59
-¡Þ£_	 59
-¤ä	 59
-_ÇÙ	 58
-ÿâ_	 58
-ÙÅ	 58
-ÇÂ	 58
-ÇÙ	 58
-Éÿ»Õ¿	 58
-ºÕ	 58
-»À	 57
-½Ô¯	 57
-¹£	 57
-ýº	 57
-_ÇÂ	 57
-æ£	 56
-ÔÁ	 56
-_×¶Ô	 55
-?	 55
-ý¹	 54
-ÃÕ	 54
-ÙÆ	 54
-»Õç	 54
-_×´Ô	 54
-´ÕÅâ	 53
-»Õ¿_	 53
-_À	 53
-ÕÅâ	 53
-¡´ÕÅ	 53
-ç¡´Õ	 52
-ÇÀ	 52
-ÙÄ_	 52
-×Â	 51
-Ü_	 51
-'_	 51
-_ÇÀ	 51
-ÔÂ	 51
-Í¨ì	 51
-Âç	 51
-î	 51
-â¡	 51
-_Í¨ì	 51
-À_	 51
-Õ¿Õ	 51
-ÙÀ	 51
-_É§	 50
-É§	 50
-½ý	 50
-»Õ§_	 50
-×½Ô	 50
-±ÅÕ	 50
-»¾	 49
-à£_	 49
-Ôà	 49
-õ´ª	 49
-´¥	 49
-»Õ_	 49
-»ÕÀ	 48
-¶Ô§	 48
-ç£	 48
-Õ¡´	 48
-Õ¤	 48
-ÕØ	 48
-À£	 48
-ÀÕ¿	 48
-_Éç¡´	 47
-æ£_	 47
-ê	 47
-Í¨ì_	 47
-×¶Ô§	 47
-Éç¡´	 47
-Â_	 47
-_Í¨ì_	 47
-?_	 46
-Ø¿	 46
-Ô¿	 46
-_Ø»	 46
-¹õ	 46
-_Ù	 46
-õ´ª_	 46
-è£	 45
-´ÙÄ_	 45
-¢Ù»	 45
-¢Ù	 45
-»Ù	 45
-_×½Ô	 44
-½Ü	 44
-Ô£_	 44
-ÕÆÕ	 44
-´Ø	 44
-á	 44
-´£	 44
-½Ôâ	 44
-ÁÔ£	 44
-Á.	 44
-_×¶Ô§	 43
-´ë¡	 43
diff --git a/libtextcat/data/new_fingerprints/lm/thai.lm b/libtextcat/data/new_fingerprints/lm/thai.lm
deleted file mode 100644
index e4b65ec..0000000
--- a/libtextcat/data/new_fingerprints/lm/thai.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 6290
-Ò	 5252
-Ã	 4377
-¹	 3920
-¡	 3050
-è	 2984
-Í	 2657
-§	 2522
-Ñ	 2454
-Á	 2369
-é	 2304
-à	 2158
-Â	 1981
-Ç	 1908
-Õ	 1693
-Å	 1543
-Ô	 1443
-´	 1422
-·	 1398
-µ	 1398
-»	 1301
-Ë	 1245
-Ð	 1239
-¤	 1210
-º	 1181
-Ê	 1081
-¨	 1045
-ä	 978
-ÒÃ	 951
-¾	 907
-ª	 892
-èÒ	 829
-á	 795
-¡Ò	 735
-ã	 722
-¡ÒÃ	 710
-¢	 691
-ÒÂ	 688
-×	 668
-Í§	 595
-.	 588
-ç	 553
-Ø	 543
-ÃÑ	 532
-Õè	 528
-ÃÐ	 522
-»Ã	 522
-·Õ	 477
-Ù	 452
-·Õè	 451
-èÍ	 443
-¹Ò	 441
-Ó	 422
-Ò§	 419
-éÒ	 414
-ì	 388
-¹_	 378
-ÃÃ	 367
-ÒÁ	 360
-°	 354
-Ñº	 349
-Ò_	 347
-éÍ	 345
-»ÃÐ	 340
-Çè	 337
-ÃÒ	 337
-Áè	 336
-ÇèÒ	 336
-à»	 334
-Ò¹	 333
-Ñé	 332
-¡Ã	 328
-´é	 325
-Ö	 322
-_à	 320
-ç¹	 314
-À	 313
-ÁÒ	 299
-Ñ§	 297
-Ò¡	 297
-×Í	 296
-äÁ	 295
-Ñ°	 293
-ÃÑ°	 293
-×è	 290
-â	 289
-äÁè	 288
-¸	 285
-ã¹	 280
-¼	 273
-è§	 268
-¹ÒÂ	 268
-é¹	 266
-¾Ã	 263
-Ñ¹	 263
-³	 263
-áÅ	 256
-¹¡	 254
-ËÒ	 253
-§¡	 252
-×èÍ	 251
-ÁÕ	 251
-ä´	 248
-	 248
-ä´é	 248
-¨Ð	 248
-»ç¹	 247
-à»ç¹	 247
-»ç	 247
-à»ç	 247
-Í¡	 245
-ÇÒ	 245
-ãË	 244
-¶	 244
-ªÒ	 243
-µÔ	 241
-_á	 240
-¡Ñ	 238
-È	 237
-_¡	 236
-µè	 234
-«	 227
-éÇ	 225
-é§	 221
-É	 216
-Â¡	 214
-Ã¤	 213
-ÕÂ	 211
-Ñé§	 211
-ÃÁ	 211
-¢Í	 210
-Ô¹	 209
-èÇ	 206
-Õé	 202
-ÅÐ	 202
-Ë¹	 201
-¹Ñ	 201
-_¹	 200
-µÃ	 197
-Ëé	 196
-§_	 193
-Á¹	 191
-Ðà	 191
-ÀÒ	 188
-ÍÂ	 188
-ÒÇ	 186
-¢Í§	 184
-¹Õ	 184
-ãËé	 183
-¤Ç	 183
-ÃÕ	 181
-§à	 180
-¡Å	 179
-áÅÐ	 178
-èÒ§	 177
-èÒ_	 176
-ÃÃ¤	 176
-_¾	 176
-¤ÇÒÁ	 174
-¹µ	 174
-ÇÒÁ	 174
-¤ÇÒ	 174
-Ñ´	 172
-Ô´	 172
-ÇèÒ_	 171
-¾ÃÃ	 167
-¨Ò	 167
-Í¹	 167
-Òµ	 167
-¹Õé	 167
-¾ÃÃ¤	 166
-¡ç	 166
-¤Ã	 165
-¹à	 165
-è¹	 163
-ºÒ	 162
-¢é	 161
-§ã	 161
-Õ_	 161
-ì_	 154
-ËÅ	 154
-Á×	 154
-éÍ§	 151
-¹¡ÒÃ	 151
-¹¡Ò	 151
-ä»	 150
-Ñ¡	 150
-é_	 148
-ÃÒÂ	 147
-µÑ	 146
-¹·	 146
-ÅÑ	 146
-Â_	 146
-à¾	 145
-Åé	 140
-à¡	 139
-¨Ò¡	 139
-àÁ	 138
-ÃÔ	 138
-¾Å	 137
-Ã×	 136
-·Ñ	 135
-¡Ñº	 134
-ÒÂ¡	 133
-_Ã	 132
-ºÃ	 132
-§ä	 132
-Ãà	 131
-à·	 130
-Åè	 129
-ÒµÔ	 129
-_·	 128
-¡Ô	 128
-µÃÕ	 128
-ÃÑº	 128
-Õ¡	 128
-àË	 127
-¹Í	 127
-µé	 126
-_¹Ò	 126
-ªÒµÔ	 126
-ÅÒ	 126
-ªÒµ	 126
-¹Ç	 126
-Òà	 126
-_áÅ	 125
-§¹	 124
-§¤	 124
-¡ÒÃà	 124
-ÒÃà	 124
-ÍÁ	 123
-Ò¤	 122
- 	 122
-áµ	 122
-àÊ	 121
-ÇÑ	 121
-Ñé¹	 120
-ÃÃÁ	 120
-Ò·	 119
-¹µÃ	 119
-èÒÇ	 118
-áµè	 118
-§·	 117
-Ç¹	 117
-ÂÑ	 117
-Á¹µÃ	 117
-¹µÃÕ	 117
-Á¹µ	 117
-Á¹µÃÕ	 117
-ÃÍ	 116
-Ùé	 116
-_¹ÒÂ	 116
-àÁ×	 116
-°Á¹	 115
-àÃ	 115
-ÃÑ°Á¹	 115
-ËÁ	 115
-à¢	 115
-Ñ°Á	 115
-Í.	 115
-Ñ°Á¹µ	 115
-ÃÑ°Á	 115
-°Á¹µ	 115
-Ñ°Á¹	 115
-°Á¹µÃ	 115
-°Á	 115
-_áÅÐ	 113
-éà	 113
-Ãè	 113
-èÁ	 112
-ã¨	 112
-_Ê	 112
-¹Ñé	 111
-Ô»	 111
-¹Ñé¹	 111
-èà	 111
-èä	 110
-_Í	 110
-Âà	 110
-_¨	 110
-Ò¨	 109
-»ÃÒ	 108
-¹ÒÂ¡	 108
-_Ë	 107
-Ñ	 107
-éÒ¹	 107
-¨Ñ	 106
-§¡Ò	 106
-_¤	 106
-§¡ÒÃ	 105
-ÇÂ	 105
-Ôµ	 105
-¹é	 105
-ÒÅ	 103
-´Â	 102
-è_	 102
-ÃÐà	 102
-àÍ	 102
-¹¹	 102
-ÍÒ	 101
-â´	 100
-µéÍ	 100
-ªè	 100
-_ä	 99
-ÇÅ	 99
-µéÍ§	 99
-â´Â	 99
-Ã_	 98
-Ðª	 98
-¾Ñ	 98
-»ÃÐà	 98
-Â¡Ã	 97
-Öè§	 97
-¡_	 97
-Öè	 97
-Òª	 97
-é¹_	 96
-ÅÔ	 96
-Ñ°º	 94
-Ò¾	 94
-ÃÑ°º	 94
-¼Ù	 94
-°º	 94
-Âè	 93
-¹ä	 93
-·Ò	 93
-°ºÒ	 92
-ÅèÒ	 92
-Å.	 92
-Ñ°ºÒ	 92
-¡Ñ¹	 92
-Ñ°ºÒÅ	 92
-§Ã	 92
-ÃÑ°ºÒ	 92
-ºÒÅ	 92
-°ºÒÅ	 92
-Ö§	 92
-.Í	 91
-¢éÒ	 91
-Ã¡	 91
-_¾Å	 90
-ÍÂè	 90
-¾Å.	 90
-Íà	 90
-ÍÂèÒ	 90
-ÂèÒ	 90
-¡ÃÐ	 89
-.Í.	 89
-ÂèÒ§	 89
-Õé_	 89
-ÍÂèÒ§	 89
-ÂÑ§	 89
-ÊØ	 89
-µèÍ	 88
-Íº	 88
-_â	 88
-Å.Í	 87
-èÍ§	 87
-ÃÐª	 87
-Áà	 87
-ÂÇ	 87
-ÅÑ§	 87
-¾Å.Í.	 87
-Å.Í.	 87
-¹Õé_	 87
-à´	 87
-Á¡	 87
-¼Ùé	 87
-ÇÔ	 87
-¾Å.Í	 87
-»ÃÐª	 87
-»Ñ	 87
-'	 86
-ÊÔ	 86
-Êè	 86
-Áèä	 86
-_¾Å.	 86
-·Ò§	 86
-ÇÁ	 85
-¡à	 85
-Â§	 85
-._	 85
-¡ÃÑ	 85
-ÍÀ	 85
-ªÇ	 84
-ÒÐ	 84
-¹éÒ	 84
-¡ÃÑ°	 84
-ÀÔ	 84
-·Ó	 84
-ËÒÃ	 84
-_¾Å.Í	 84
-ÍÍ	 83
-§Ê	 83
-ÍÀÔ	 83
-äÁèä	 83
-Ñµ	 82
-»ÃÒÂ	 82
-¤¹	 82
-Í_	 82
diff --git a/libtextcat/data/new_fingerprints/lm/turkish.lm b/libtextcat/data/new_fingerprints/lm/turkish.lm
deleted file mode 100644
index 553be45..0000000
--- a/libtextcat/data/new_fingerprints/lm/turkish.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 23226
-i	 8957
-a	 7675
-e	 6219
-n	 5169
-&	 4950
-;	 4950
-l	 4674
-r	 4464
-&i	 3206
-&i;	 3206
-i;	 3206
-s	 3206
-k	 3009
-d	 2977
-t	 2442
-m	 2010
-y	 2001
-u	 1885
-n_	 1725
-g	 1584
-o	 1567
-b	 1470
-e_	 1426
-ü	 1353
-ar	 1273
-la	 1236
-a_	 1209
-i_	 1169
-in	 1124
-_b	 1101
-an	 1097
-er	 1073
-le	 1058
-s;	 1036
-&s;	 1036
-&s	 1036
-;_	 1018
-de	 936
-;n	 918
-&i;n	 917
-i;n	 917
-,_	 872
-_,	 872
-_,_	 872
-,	 872
-i;_	 863
-&i;_	 863
-_k	 816
-en	 769
-r_	 762
-_y	 759
-da	 759
-il	 759
-k_	 750
-z	 739
-nd	 725
-&g;	 708
-g;	 708
-&g	 708
-ra	 697
-_a	 692
-_d	 692
-_s	 676
-'	 673
-_i	 644
-._	 641
-.	 641
-_.	 637
-_._	 637
-c	 637
-ka	 635
-v	 632
-;&	 624
-h	 615
-_g	 597
-ri	 596
-ç	 596
-lar	 583
-li	 580
-ma	 559
-ya	 555
-ler	 553
-p	 547
-re	 529
-al	 529
-ö	 527
-_t	 520
-ir	 508
-ak	 502
-bi	 500
-;l	 480
-in_	 478
-di	 477
-r&	 468
-el	 453
-et	 449
-ek	 445
-n&	 439
-_o	 439
-ol	 437
-da_	 434
-n&i	 433
-n&i;	 433
-ni	 429
-ti	 428
-de_	 425
-an_	 422
-eri	 421
-r&i	 417
-r&i;	 417
-s&	 413
-s&i	 413
-s&i;	 413
-ar&	 412
-me	 407
-te	 405
-a&	 404
-i&	 390
-ay	 387
-ne	 380
-_bi	 373
-_ka	 368
-ar&i;	 367
-ar&i	 367
-u_	 363
-as	 363
-_e	 362
-ta	 359
-&i;l	 352
-i;l	 352
-nda	 350
-ki	 347
-na	 346
-si	 343
-_v	 337
-;&i;	 334
-;&i	 334
-ve	 334
-ara	 333
-en_	 332
-;i	 331
-on	 328
-un	 326
-l&i;	 322
-l&	 322
-l&i	 322
-leri	 322
-ba	 318
-_m	 318
-ik	 315
-mi	 315
-f	 306
-lar&	 302
-lar&i	 302
-sa	 298
-_h	 297
-ld	 296
-&i;&	 290
-i;&	 290
-_ve	 288
-l_	 287
-ge	 286
-is	 285
-ed	 285
-i&s;	 284
-i&s	 284
-;r	 282
-_ya	 279
-_ol	 279
-d&i;	 278
-d&	 278
-d&i	 278
-nl	 277
-kl	 275
-;k	 274
-&i;n_	 271
-;n_	 271
-i;n_	 271
-ile	 270
-or	 269
-iy	 267
-a&s	 264
-a&s;	 264
-y&i;	 262
-ad	 262
-y&	 262
-y&i	 262
-ye	 259
-ha	 258
-es	 258
-t&	 257
-t&i	 257
-t&i;	 257
-ini	 253
-;nd	 253
-i;nd	 253
-ür	 253
-&i;nd	 253
-se	 248
-_ge	 248
-i;nda	 248
-;nda	 248
-;n&i;	 247
-i;n&	 247
-;n&	 247
-&i;n&	 247
-i;n&i	 247
-;n&i	 247
-bu	 245
-_'	 245
-_ba	 244
-as&i	 242
-as&i;	 242
-_de	 242
-as&	 242
-at	 240
-am	 240
-nda_	 239
-ar_	 231
-ve_	 230
-rin	 230
-_ve_	 228
-_bu	 227
-im	 227
-&i;r	 226
-i;r	 226
-ur	 221
-g;&i	 220
-g;&	 220
-&g;&	 220
-yo	 220
-&g;&i	 220
-g;&i;	 220
-ul	 215
-ak_	 215
-ke	 213
-nu	 213
-erin	 211
-g;i	 208
-&g;i	 208
-lan	 207
-bir	 205
-r&i;n	 205
-nde	 202
-rl	 202
-n&i;_	 201
-ko	 201
-ca	 200
-m_	 197
-rd	 196
-t_	 194
-er_	 194
-st	 193
-em	 193
-_sa	 190
-lm	 189
-rt	 188
-_ü	 187
-i;k	 187
-ün	 187
-ola	 187
-&i;k	 187
-lerin	 185
-ce	 185
-'_	 185
-;m	 183
-az	 183
-rk	 182
-yü	 182
-;la	 181
-_bir	 181
-ir_	 180
-n&i;n	 180
-ru	 180
-lu	 180
-;nda_	 178
-e&	 177
-_ç	 176
-_ha	 175
-_ko	 173
-esi	 171
-_ö	 170
-ap	 170
-ni_	 168
-tü	 167
-den	 164
-ind	 161
-di_	 161
-be	 161
-s&i;n	 160
-nin	 159
-üz	 158
-ri_	 155
-y&i;l	 155
-_p	 154
-nin_	 153
-&s;_	 152
-_y&	 152
-edi	 152
-s;_	 152
-_y&i;	 152
-_y&i	 152
-yl	 151
-le_	 151
-inde	 150
-eti	 150
-ala	 150
-&i;&s	 149
-ele	 149
-i;&s;	 149
-;&s;	 149
-;&s	 149
-i;&s	 149
-ek_	 148
-ere	 148
-çi	 147
-du	 145
-ön	 145
-z_	 144
-na_	 144
-eri_	 143
-ec	 142
-gö	 142
-i;&g;	 141
-s&i;_	 141
-bir_	 141
-&i;&g	 141
-i;&g	 141
-ah	 141
-;&g;	 141
-;&g	 141
-_gö	 140
-lar_	 140
-eli	 140
-a&g;	 140
-a&g	 140
-dan	 140
-ac	 140
-iç	 140
-an&	 140
-u&	 139
-;&g;&	 138
-_yü	 138
-an&i	 138
-an&i;	 138
-pa	 138
-it	 137
-_ola	 137
-_bir_	 136
-;t	 135
-ör	 135
-ne_	 135
-ini_	 134
-lma	 134
-kan	 133
-ab	 132
-to	 131
-ba&	 131
-kar	 130
-r&i;_	 130
-_ar	 129
-ili	 129
-li_	 129
-ki_	 128
-bu_	 127
-anl	 127
-dü	 127
-ler_	 126
-_ba&	 126
-kon	 126
-ll	 125
-tl	 125
-ine	 125
-e&g;	 124
-e&g	 124
-_il	 124
-_bu_	 124
-re_	 124
-bil	 123
-&s;i	 123
-;&i;n	 123
-s;i	 123
-ede	 123
-zd	 123
-''	 122
-_da	 122
-_''	 122
-_tü	 122
-ret	 122
-_-_	 121
-_''_	 121
-mas	 121
-''_	 121
--	 121
-dan_	 121
-leri_	 121
-;u	 121
-_-	 121
-ev	 121
diff --git a/libtextcat/data/new_fingerprints/lm/ukrainian.lm b/libtextcat/data/new_fingerprints/lm/ukrainian.lm
deleted file mode 100644
index 438bbda..0000000
--- a/libtextcat/data/new_fingerprints/lm/ukrainian.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-о
-и
-а
-╕
-в
-н
-р
-т
-е
-д
-л
-к
-у
-п
-с
-_п
-м
-и_
-я
-_в
-з
-╕_
-а_
-б
-о_
-е_
-ь
-г
-ч
-_т
-ов
-_з
-_д
-у_
-в╕
-.
-_с
-ли
-ро
-в_
-на
-по
-ш
-ю
-ти
-й
-ж
-ор
-х
-_к
-ит
-ин
-щ
-╕д
-"
-_б
-я_
-до
-ви
-ц
-О
-ом
-ко
-_н
-пр
-╓
-ра
-ни
-С
-._
-то
-од
-ка
-ло
-_по
-ри
-м_
-ю_
-ки
-_пр
-ал
-А
-н╕
-ть
-_м
-ен
-ол
-ер
-,
-го
-ь_
-ою
-"_
-_до
-ар
-за
-й_
-на_
-_в_
-во
-ил
-бу
-та
-╖
-_щ
-ав
-ки_
-_╕
-що
-И
-об
-да
-уд
-д╕
-мо
-_бу
-_╕_
-ть_
-Т
-ог
-Р
-_за
-,_
-╕в
-_ц
-Н
-╕н
-ою_
-╕л
-ст
-п╕
-де
-ат
-ос
-те
-ну
-не
-_що
-_в╕
-в╕д
-_о
-дн
-ти_
-ла
-а╓
-ли_
-ого
-т╕
-он
-П
-о╖
-хо
-ик
-_ч
-ле
-_р
-╖_
-л╕
-ц╕
-_П
-ом_
-що_
-но
-р╕
-ду
-ить
-_п╕
-ьк
-н╕_
-_"
-же
-з_
-_не
-ся
-аж
-Я
-З
-В
-_г
-╓_
-х_
-_ви
-ис
-_то
-оро
-ва
-нн
-_л
-ов╕
-_що_
-ди
-про
-_мо
-ль
-му
-ем
-н_
-ий_
-_т╕
-ати
-Я_
-ще
-_про
-К
-оди
-оло
-рт
-ак
-ить_
-ад
-о╖_
-ив
-ля
-ий
-_я
-_Н
-го_
-до_
-_З
-_ка
-п╕д
-ня
-_ко
-_на
-че
-чи
-_со
-_ст
-а╓_
-_з_
-же_
-при
-ся_
-ови
-б╕
-ка_
-╕й
-ого_
-пе
-би
-╕ль
-╕т
-к_
-_буд
-ма
-со
-си
-буд
-св
-пов
-оз
-ок
-Л
-_при
-Г
-Д
-оч
-тор
-ур
-га
-уде
-аз
-ел
-ан
-их_
-╕льк
-ити
-ен╕
-к╕
-ому
-их
-ен╕_
-льк
-_до_
-_х
-ве
-ОС
-му_
-_п╕д
-не_
-ння
-зн
-буде
-ча
-ому_
-али
-╕я
-ц╕_
-ин_
-_буде
-╕р
-╕с
-ння_
-д_
-!
-чен
-ф
-Й
-ов╕д
-_пра
-дов
-льки
-ув
-ру
-ре
-гр
-_пер
-_не_
-╕да
-тер
-рон
-Й_
-енн
-рн
-пер
-им
-ши
-╕льки
-ла_
-льки_
-шо
-ба
-_й
-."
-в╕р
-_т╕ль
-ход
-ьки
-_соб
-иш
-дем
-сто
-_С
-_К
-ви_
-арти
-_сто
-_В
-СТ
-вя
-нк
-вч
-вс
-дно
-_л╕
-т╕л
-!_
-_ки
-_у
-╕й_
-ван
-ьки_
-ня_
-т╕ль
-чо
-рти
-бит
-ення
-ину
-_св
-вин
-д╕_
-пра
-ну_
-каж
-_па
-_пе
-_за_
-удем
-будем
-т╕льк
-арт
-кою
-ьо
-па
-I
-зна
-але
-щен
-."_
-аже
-пов╕
-за_
-_ро
-_гр
-ми
-_т╕л
-соб
-РО
-_в╕д
-карт
-каже
-*
-ЗА
-Ч
-_стор
-╕нк
-ож
-Б
diff --git a/libtextcat/data/new_fingerprints/lm/vietnamese.lm b/libtextcat/data/new_fingerprints/lm/vietnamese.lm
deleted file mode 100644
index 1422126..0000000
--- a/libtextcat/data/new_fingerprints/lm/vietnamese.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 88044
-n	 17000
-h	 12823
-t	 9071
-i	 8490
-c	 8394
-g	 8035
-ng	 6718
-_t	 6352
-_c	 5234
-a	 5083
-g_	 4883
-ng_	 4882
-_n	 4379
-n_	 4365
-i_	 4365
-u	 4149
-m	 3648
-à	 3635
-nh	 3480
-o	 3451
-Ç	 3193
-_Ç	 3168
-r	 3011
-l	 2692
-Ü	 2659
-,	 2328
-,_	 2295
-c_	 2279
-_l	 2263
-ch	 2226
-v	 2161
-th	 2158
-a_	 2132
-_th	 2113
-y	 2111
-.	 2107
-t_	 2106
-h_	 2074
-_v	 2057
-_h	 1888
-_m	 1834
-_ch	 1813
-s	 1749
-nh_	 1715
-u_	 1679
-á	 1668
-à_	 1649
-tr	 1611
-b	 1589
-_tr	 1581
-_nh	 1541
-_b	 1530
-m_	 1505
-p	 1483
-._	 1455
-k	 1429
-_s	 1415
-o_	 1380
-y_	 1371
-_k	 1367
-_ng	 1348
-©	 1343
-e	 1296
-ó	 1208
-	 1199
-ô	 1181
-¶	 1139
-å	 1132
-T	 1126
-hi	 1121
-â	 1081
-ì	 1058
-ê	 1055
-d	 1040
-_g	 1039
-kh	 1034
-_kh	 1027
-_T	 994
-©i	 967
-là	 943
-_là	 941
-"	 926
-ä	 916
-Ü©	 901
-an	 893
-_d	 888
-Ó	 877
-©i_	 859
-on	 853
-Ã	 848
-N	 846
-	 820
-ó_	 813
-	 801
-ôn	 795
-ph	 776
-_p	 772
-_ph	 752
-û	 752
-§	 734
-hÜ	 728
-ho	 715
-và	 709
-_và	 703
-gÜ	 702
-®	 700
-_r	 696
-H	 693
-_là_	 691
-là_	 691
-Ü©i	 684
-àn	 679
-ên	 677
-ông	 676
-ha	 672
-gi	 663
-C	 656
-_gi	 655
-Ö	 654
-gÜ©i	 646
-gÜ©	 646
-Ü©i_	 624
-ông_	 610
-ngÜ	 610
-_ngÜ	 608
-ác	 606
-ú	 601
-ngÜ©	 600
-ngÜ©i	 600
-_ngÜ©	 598
-gÜ©i_	 594
-ûa	 587
-cû	 586
-_cû	 585
-¶t	 585
-cûa	 585
-ên_	 585
-_cûa	 584
-có	 583
-ûa_	 582
-_có	 581
-cûa_	 581
-ã	 581
-_cûa_	 580
-¶t_	 578
-_N	 574
-có_	 574
-»	 573
-_có_	 572
-i	 568
-À	 562
-	 562
-m¶	 557
-_C	 553
-_m¶	 551
-p_	 540
-Æ	 540
-m¶t	 538
-m¶t_	 534
-_m¶t	 532
-ìn	 528
-_m¶t_	 528
-ti	 526
-i	 525
-Ù	 517
-Î	 512
-ình	 500
-..	 500
-	 497
-và_	 497
-_và_	 496
-æ	 491
-q	 490
-qu	 490
-_H	 487
-_q	 484
-_qu	 484
-ong	 481
-ong_	 471
-há	 471
-x	 470
-hô	 468
-¿	 466
-_"	 460
-Ü®	 456
-ro	 453
-ình_	 445
-ì_	 434
-_x	 434
-ã_	 427
-í	 423
-_ti	 423
-in	 422
-ân	 421
-"_	 418
-i	 415
-Ön	 413
-ron	 412
-V	 411
-rong	 410
-§i	 410
-rong_	 409
-ác_	 405
-ª	 400
-n	 399
-hôn	 398
-åi	 395
-ay	 390
-_V	 387
-h»	 382
-hà	 380
-ày	 377
-Ãt	 376
-uy	 374
-ÇÜ	 374
-_ÇÜ	 373
-§i_	 372
-cá	 371
-_cá	 367
-nà	 366
-_	 366
-hú	 366
-_nà	 365
-ra	 363
-hông	 362
-ho_	 359
-ân_	 356
-án	 356
-°	 355
-åi_	 354
-ai	 352
-hu	 352
-cho	 352
-Ü®c	 351
-®c	 351
-Ón	 351
-_cho	 349
-tro	 347
-t	 347
-ào	 347
-_tro	 346
-_tron	 346
-ñ	 346
-tron	 346
-trong	 346
-M	 345
-khô	 340
-âu	 338
-_khô	 338
-cho_	 337
-_cho_	 336
-hông_	 336
-ay_	 333
-ch_	 332
-Çã	 331
-Ãt_	 331
-(	 331
-_(	 330
-Ò	 329
-_Çã	 329
-ÇÜ®	 328
-_ÇÜ®c	 328
-)	 328
-ÇÜ®c	 328
-_ÇÜ®	 328
-khôn	 324
-_ñ	 324
-_khôn	 322
-Çã_	 322
-_Çã_	 320
-ò	 318
-ån	 318
-không	 316
-ào_	 316
-Ü®c_	 316
-®c_	 316
-nhÜ	 315
-Ü_	 315
-»ng	 313
-»ng_	 313
-»n	 313
-_nhÜ	 313
-Th	 312
-hì	 311
-Û	 310
-h»n	 310
-h»ng_	 310
-h»ng	 310
-iê	 309
-gh	 309
-u	 307
-ta	 307
-anh	 307
-¡	 307
-ai_	 306
-àng	 306
-ày_	 304
-ÇÜ®c_	 298
-ÜÖ	 295
-S	 295
-:	 294
-t_	 294
-e_	 294
-:_	 290
-Î_	 289
-ua	 288
-æn	 288
-ài	 286
-u_	 285
-_nh»	 285
-nh»	 285
-nh»ng	 285
-nh»n	 285
-_nh»n	 285
-_Th	 285
-n_	 284
-n	 283
-Ø	 281
-_M	 281
-A	 281
-úc	 278
-L	 277
-ø	 277
-ÜÖn	 276
-_ha	 276
-n,	 275
-Öng	 275
-ÜÖng	 275
-an_	 272
-ài_	 271
-iu	 269
-sÓ	 269
-n,_	 268
-¿_	 268
-on_	 267
-_sÓ	 267
-các	 265
-àng_	 265
-_các	 264
-anh_	 264
-ngh	 264
-_ta	 263
-hi_	 262
-hàn	 261
-_	 261
-âu_	 261
-Àn	 260
-ù	 260
-_ngh	 257
-ia	 255
-¢	 252
-...	 252
-êu	 251
-Ùc	 251
-i,	 249
-iu_	 248
-nhi	 247
-B	 246
-i,_	 245
-Óng	 244
-ª_	 244
-co	 244
-_nhi	 244
-¥	 244
-Ü§	 244
-iên	 243
-D	 243
-Tr	 241
-_S	 240
-hÜ_	 239
-òn	 237
-hÃ	 236
-hÆ	 233
-K	 233
-Öng_	 232
-ôi	 232
-ÜÖng_	 232
-Àn_	 231
-_co	 231
-n_	 229
-hå	 229
-äi	 229
-yê	 229
-Ûn	 229
-¢n	 228
-Ûng	 228
-_L	 227
-Ûng_	 226
-inh	 226
-Çi	 225
-mà	 225
-_Çi	 225
-ng,	 224
-ang	 224
-P	 224
-n	 224
-g,	 224
-g,_	 223
-_v§	 223
diff --git a/libtextcat/data/new_fingerprints/lm/welsh.lm b/libtextcat/data/new_fingerprints/lm/welsh.lm
deleted file mode 100644
index c25d4a4..0000000
--- a/libtextcat/data/new_fingerprints/lm/welsh.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 78614
-a	 18113
-d	 17890
-y	 16837
-e	 14108
-n	 13902
-r	 13869
-i	 12928
-o	 9972
-l	 9188
-h	 7454
-g	 7165
-w	 7010
-t	 6296
-f	 6080
-u	 5400
-n_	 5159
-_y	 5051
-dd	 4946
-s	 4884
-r_	 4547
-m	 4364
-d_	 4223
-yn	 4082
-_a	 4020
-c	 3707
-th	 3301
-u_	 2900
-yd	 2900
-ae	 2649
-l_	 2588
-_g	 2547
-.	 2460
-'	 2458
-._	 2408
-wy	 2334
-yn_	 2331
-_d	 2307
-b	 2267
-ym	 2262
-ra	 2261
-an	 2235
-ar	 2228
-ol	 2218
-ia	 2212
-i_	 2199
-ed	 2191
-_yn	 2038
-_i	 2020
-y_	 1983
-_c	 1934
-_yn_	 1861
-ei	 1815
-it	 1796
-g_	 1787
-ith	 1779
-dd_	 1745
-h_	 1741
-ydd	 1731
-ai	 1709
-au	 1708
-'r_	 1655
-'r	 1655
-_y_	 1621
-di	 1615
-,	 1613
-,_	 1608
-da	 1585
-od	 1546
-_o	 1535
-ad	 1532
-th_	 1510
-ll	 1494
-au_	 1492
-_s	 1415
-er	 1359
-o_	 1350
-io	 1311
-a_	 1299
-ol_	 1294
-_e	 1273
-_h	 1249
-cy	 1246
-yr	 1243
-en	 1228
-p	 1217
-_f	 1212
-_cy	 1203
-mr	 1200
-gy	 1193
-ymr	 1185
-ha	 1172
-hy	 1164
-eg	 1159
-do	 1151
-edd	 1147
-G	 1134
-we	 1107
-C	 1089
-_ar	 1078
-_m	 1075
-yf	 1057
-de	 1048
-fe	 1047
-_G	 1045
-ch	 1043
-rae	 1023
-el	 1016
-no	 1010
-ni	 1010
-_b	 1009
-ne	 1001
-ef	 992
-ri	 983
-et	 978
-_C	 957
-_gy	 952
-_a_	 943
-eth	 943
-_.	 940
-_._	 939
-eit	 930
-eith	 927
-ys	 921
-wyd	 912
-ga	 901
-_i_	 893
-s_	 887
-mrae	 878
-mraeg	 878
-raeg	 878
-ymrae	 878
-aeg	 878
-ymra	 878
-mra	 878
-_p	 856
-aet	 850
-aeth	 850
-_n	 844
-un	 838
-on	 836
-ait	 833
-aith	 833
-nn	 830
-at	 827
-oe	 823
-li	 805
-_r	 801
-ddi	 795
-gw	 789
-ma	 783
-le	 777
-nt	 772
-ho	 769
-ff	 766
-yr_	 764
-na	 753
-la	 748
-rh	 747
-eg_	 734
-si	 733
-ng	 732
-dol	 732
-ro	 718
-al	 712
-_dd	 706
-wn	 705
-oed	 705
-Gy	 704
-dy	 701
-Cy	 696
-o'	 692
-ar_	 691
-ny	 690
-Gym	 678
-wr	 677
-id	 676
-_Gy	 672
-_o_	 668
-Gymr	 667
-if	 662
-ith_	 662
-_ar_	 660
-iad	 657
-_w	 657
-fo	 656
-eu	 655
-aeg_	 650
-raeg_	 650
-aith_	 648
-or	 648
-_Gym	 646
-fa	 642
-re	 638
-_Cy	 638
-_Gymr	 635
-_gw	 633
-fy	 633
-oedd	 633
-edd_	 629
-rd	 627
-od_	 622
-ac	 619
-ddo	 612
-an_	 607
-Gymra	 606
-er_	 605
-A	 604
-eth_	 601
-hw	 596
-ydd_	 591
-o'r	 586
-o'r_	 586
-es	 583
-ir	 579
-dw	 573
-go	 559
-yl	 548
-rw	 545
-aeth_	 545
-wydd	 543
-aw	 539
-_rh	 539
-dr	 537
-ly	 537
-fn	 534
-dau	 533
-_hy	 531
-t_	 531
-sg	 529
-'n	 529
-*	 528
-'n_	 523
-_*	 522
-nyd	 521
-nydd	 521
-M	 519
-st	 518
-Y	 516
-sy	 515
-yd_	 513
-lw	 512
-_ga	 508
-iai	 503
-il	 502
-_l	 499
-rt	 494
-ad_	 493
-_yr	 493
-_yr_	 492
-as	 492
-dol_	 492
-f_	 491
-dda	 491
-ig	 490
-og	 484
-wa	 479
-he	 478
-iaith	 477
-iait	 477
-oedd_	 475
-_ma	 473
-c_	 472
-Cym	 470
-te	 469
-_ym	 467
-am	 467
-_M	 465
-_ia	 462
-efn	 462
-i'	 460
-ie	 458
-_Cym	 458
-_ac	 457
-dau_	 456
-yw	 455
-ew	 453
-fr	 441
-fod	 441
-_A	 441
-du	 437
-_sy	 434
-e_	 432
-wi	 426
-Cymr	 426
-se	 425
-B	 424
-D	 424
-_Cymr	 423
-bl	 423
-lu	 420
-in	 417
-_t	 417
-tr	 414
-ac_	 413
-wed	 410
-os	 410
-_iai	 407
-_iait	 407
-el_	 405
-_ac_	 405
-rha	 404
-m_	 404
-is	 403
-on_	 401
-eu_	 393
-hi	 393
-rdd	 393
-id_	 389
-_Y	 388
-ry	 387
-odd	 387
-rwy	 387
-rf	 386
-io_	 380
-ynn	 380
-cyf	 380
-hr	 380
-_cyf	 379
-yddi	 379
-cyn	 372
-_de	 372
-rth	 371
-ru	 368
-S	 363
-wei	 363
-ysg	 362
-_B	 362
-u'	 361
-yddo	 360
-wn_	 360
-so	 359
-dio	 359
-_ei	 358
-N	 356
-dwy	 355
-_da	 353
-me	 353
-gan	 353
-gyf	 353
-w_	 352
-_o'	 351
-fer	 349
-nol	 347
-hyn	 346
-ddy	 346
-af	 346
-ta	 343
-ddol	 343
-_fe	 340
-nd	 340
-mae	 338
-_cyn	 338
-efnyd	 337
-fnydd	 337
-fny	 337
-efny	 337
-fnyd	 337
-iad_	 335
-_mae	 333
-ion	 333
-_ll	 330
-def	 330
-_gyf	 327
-nt_	 326
-i'r_	 326
--	 326
-i'r	 326
-weith	 325
-weit	 325
-defn	 325
-defny	 325
-bo	 324
-hyd	 323
-by	 322
-_si	 321
-ir_	 321
-hau	 318
-nod	 318
-edi	 315
-I	 314
-fyd	 313
-wyr	 313
-ada	 311
-ddio	 310
-rif	 309
-sia	 307
-sa	 306
-fel	 305
-tha	 305
-_S	 302
-_ne	 302
-_u	 301
-fod_	 300
-_o'r	 300
-yg	 300
-_o'r_	 300
-_i'	 299
-ge	 299
-dia	 299
diff --git a/libtextcat/data/new_fingerprints/lm/yiddish_utf.lm b/libtextcat/data/new_fingerprints/lm/yiddish_utf.lm
deleted file mode 100644
index e3386a3..0000000
--- a/libtextcat/data/new_fingerprints/lm/yiddish_utf.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-�	 29767
-_	 13552
-_�	 6516
-�	 4273
-�	 3670
-א	 3670
-ע	 3261
-�	 3261
-��	 2826
-ע�	 2826
-א�	 2785
-��	 2785
-י	 2565
-�	 2565
-�	 2082
-ר	 2082
-��	 2062
-י�	 2062
-�	 1857
-ט	 1857
-�	 1828
-ַ	 1828
-�	 1793
-ן	 1793
-_א	 1537
-�_	 1532
-ן_	 1532
-��	 1527
-ַ�	 1527
-אַ	 1517
-�ַ	 1517
-ר�	 1355
-��	 1355
-�	 1270
-ל	 1270
-�	 1268
-אָ	 1268
-ָ	 1268
-�ָ	 1268
-�ַ�	 1240
-אַ�	 1240
-נ	 1232
-�	 1232
-אָ�	 1229
-�ָ�	 1229
-��	 1229
-ָ�	 1229
-נ�	 1181
-��	 1181
-ו	 1116
-�	 1116
-�	 1031
-ד	 1031
-ט�	 1012
-��	 1012
-ל�	 1007
-��	 1007
-ו�	 975
-��	 975
-ד�	 965
-��	 965
-פ�	 929
-�	 929
-פ	 929
-��	 929
-�ר	 873
-ער	 873
-א�	 870
-��	 870
-ז	 868
-�	 868
-�	 832
-ס	 832
-�	 797
-ק	 797
-_א�	 784
-מ	 766
-�	 766
-_א�	 752
-��	 747
-מ�	 747
-�	 742
-ג	 742
-�	 725
-ש	 725
-ט_	 699
-�_	 699
-װ	 691
-�	 691
-װ�	 674
-��	 674
-�	 667
-ײ	 667
-��	 664
-ג�	 664
-�	 661
-ֿ	 661
-ק�	 654
-��	 654
-��	 652
-ֿ�	 652
-ש�	 651
-��	 651
-��	 643
-ז�	 643
-פֿ	 641
-�ֿ	 641
-פֿ�	 638
-�ֿ�	 638
-_אַ	 638
-ר_	 592
-�_	 592
-_ד	 560
-_ד�	 554
-,	 551
-,_	 534
-ב	 517
-�	 517
-_פ�	 502
-_פ	 502
-ב�	 472
-��	 472
-ס�	 436
-��	 436
-צ	 436
-�	 436
-צ�	 433
-��	 433
-_װ	 430
-_װ�	 429
-�	 410
-ה	 410
-�ר_	 404
-_פֿ	 404
-ער_	 404
-_מ	 400
-_מ�	 396
-גע	 390
-�ע	 390
-_ז	 390
-_ז�	 386
-�ע�	 384
-ען	 384
-גע�	 384
-�ן	 384
-ער�	 382
-�ר�	 382
-.	 374
-אי	 372
-�י	 372
-ּ	 366
-�	 366
-��	 363
-ה�	 363
-�י�	 362
-אי�	 362
-_ג	 359
-ױ	 357
-�	 357
-_ג�	 356
-ון	 349
-�ן	 349
-י_	 346
-�_	 346
-ע_	 343
-�_	 343
-�ן_	 337
-ון_	 337
-�ע	 334
-דע	 334
-_אי	 331
-ך	 330
-�	 330
-�ע�	 323
-��	 323
-דע�	 323
-ּ�	 323
-��	 322
-ײ�	 322
-ען_	 321
-�ן_	 321
-��	 320
-ױ�	 320
-�י	 317
-די	 317
-�ַ	 311
-�ַר	 311
-ײ�	 311
-�ר	 311
-ַר	 311
-ײַ	 311
-��	 311
-לע	 310
-�ע	 310
-._	 307
--	 305
-�_	 297
-ַ_	 297
-�	 294
-כ	 294
-�ע	 290
-נע	 290
-ס_	 289
-�_	 289
-פּ	 288
-�ּ	 288
-ײַ�	 287
-�ַ�	 287
-ך_	 283
-�_	 283
-�ַ_	 274
-אַ_	 274
-ַר�	 272
-�ר�	 272
-לע�	 261
-�ע�	 261
-_ה�	 260
-_ה	 260
-_צ	 259
-�ש	 257
-יש	 257
-_צ�	 256
-זי	 254
-�י	 254
-פּ�	 252
-�ּ�	 252
-מע	 248
-�ע	 248
-_ק	 247
-נע�	 247
-�ע�	 247
-טע	 245
-�ע	 245
-_ק�	 245
-או	 244
-�ו�	 244
-�ו	 244
-או�	 244
-�ל	 238
-על	 238
-�א	 235
-הא	 235
-הא�	 235
-שט	 235
-�ט	 235
-�א�	 235
-כ�	 234
-��	 234
-_ב�	 231
-�ער	 231
-_ב	 231
-ַנ	 229
-�נ	 229
-�נ�	 228
-ַנ�	 228
-_או	 227
-_גע	 226
-�	 219
-ם	 219
-"	 218
-�ע�	 217
-מע�	 217
-�ע	 217
-װע	 217
-�ל	 216
-ַל	 216
-_זי	 215
-_נ	 215
-על�	 212
-�ל�	 212
-�א	 211
-רא	 211
-_נ�	 211
-טע�	 211
-�ע�	 211
-װא	 210
-�א	 210
-_דע	 210
-�א�	 209
-װע�	 209
-װא�	 209
-�ע�	 209
-�ש�	 208
-יש�	 208
-�ק	 207
-יק	 207
-רא�	 206
-�א�	 206
-�_	 205
-ז_	 205
-�י	 196
-מי	 196
-_ש	 195
-מי�	 195
-�י�	 195
-�ַל	 193
-_ש�	 191
-ֿא	 189
-�א	 189
-�ֿא	 189
-ֿא�	 188
-�ו	 188
-ֿו�	 188
-ֿו	 188
-�ו�	 188
-�א�	 188
-�ון	 187
-�אָ	 186
-_הא	 185
-�ֿו	 184
-_ע	 179
-_די	 178
-�א	 176
-טא	 176
-טא�	 175
-�א�	 175
-ָס	 174
-�ָס	 174
-יט	 174
-�ט	 174
-�ס	 174
-ל_	 173
-�_	 173
-�י_	 173
-די_	 173
-ם_	 171
-�ל�	 171
-�_	 171
-ַל�	 171
-_ע�	 171
-�ָט	 169
-�ט	 169
-ָט	 169
-יך	 168
-�ך	 168
-�ָר	 166
-�י�	 166
-ָר	 166
-�ר	 166
-זי�	 166
-ני	 164
-ענ	 164
-�י	 164
-�נ	 164
-�י	 163
-רי	 163
-יך_	 163
-�ך_	 163
-�אָ	 162
-ענ�	 162
-�נ�	 162
-�אַ	 160
-�ט	 160
-עט	 160
-_י	 158
-�י�	 157
-�ר	 157
-רי�	 157
-יר	 157
--�	 156
-ָס_	 155
-�ס_	 155
-�י	 154
-_מי	 154
-לי	 154
-קע	 153
-ונ	 153
-�ע	 153
-�נ	 153
-_װא	 152
-�י�	 152
-ני�	 152
-�ן	 151
-ין	 151
-אױ	 151
-�ױ	 151
-י�	 150
-�ט	 150
-�	 150
-��	 150
-יִ	 150
-�ִ	 150
-ִ	 150
-ַט	 150
-ִ�	 149
-�ִ�	 149
-��	 149
-יִ�	 149
-�י�	 148
-_י�	 148
-לי�	 148
-�ױ�	 146
-אױ�	 146
-�ַנ	 146
-_אױ	 145
-�ון	 145
-יז	 143
-�ז	 143
-�י�	 142
-די�	 142
diff --git a/libtextcat/data/new_fingerprints/lm/zulu.lm b/libtextcat/data/new_fingerprints/lm/zulu.lm
deleted file mode 100644
index f30c09c..0000000
--- a/libtextcat/data/new_fingerprints/lm/zulu.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_
-a
-e
-i
-n
-u
-o
-l
-k
-h
-s
-a_
-b
-t
-m
-g
-w
-z
-e_
-i_
-ng
-ku
-d
-y
-la
-an
-_n
-th
-le
-_u
-o_
-el
-ba
-_k
-en
-in
-wa
-p
-_e
-zi
-.
-hi
-si
-al
-ha
-uk
-ab
-_i
-r
-is
-ka
-_a
-kh
-we
-li
-ni
-ma
-_ng
-he
-ul
-._
-ga
-thi
-la_
-be
-ak
-c
-on
-nd
-na
-ok
-am
-lo
-ho
-,
-se
-ph
-hi_
-ut
-es
-nga
-_ku
-,_
-ez
-thi_
-un
-uth
-le_
-uku
-hu
-f
-u_
-um
-ek
-ne
-go
-q
-_uk
-at
-aba
-_l
-sh
-lu
-M
-_uku
-ol
-_b
-hl
-ni_
-ngo
-kw
--
-N
-ik
-oku
-em
-nt
-as
-ge
-az
-ya
-iz
-sa
-_o
-S
-uthi
-A
-za
-_w
-wa_
-_s
-mb
-kut
-kuth
-ela
-ye
-_y
-uthi_
-il
-ay
-ele
-ba_
-I
-dl
-nge
-ath
-ub
-ke
-U
-zo
-na_
-yi
-us
-kuthi
-esi
-ob
-v
-om
-ama
-it
-lo_
-bu
-L
-ezi
-j
-ny
-im
-ing
-li_
-_ab
-eni
-no
-de
-ela_
-ze
-ang
-ko
-ala
-lw
-yo
-zin
-_U
-lel
-eng
-mi
-_ngo
-eb
-uz
-me
-gi
-ti
-ukut
-so
-ukuth
-bo
-da
-_ba
-nz
-_aba
-the
-eli
-akh
-eni_
-E
-ban
-s_
-aka
-_kw
-ma_
-ap
-_ukut
-he_
-ini
-di
-K
-ka_
-ib
-kwa
-ulu
-ele_
-kho
-nj
-bi
-_z
-khu
-we_
-lal
-enz
-ho_
-et
-C
-gu
-zi_
-and
-hla
-ngi
-pha
-_um
-_ka
-isi
-_nge
-isa
-aph
-ung
-izi
-dla
-ala_
-zw
-nde
-to
-n_
-ne_
-nk
-ke_
-_I
-athi
-_no
-lan
-_wa
-kul
-B
-ind
-fu
-wen
-ikh
-azi
-ule
-kub
-e.
-_S
-x
-o.
-ona
-kha
-_iz
-je
-bh
-_M
-er
-kwe
-oba
-ane
-O
-_N
-sa_
-a.
-lwa
-_ez
-kus
-ki
-mu
-od
-"
-ebe
-P
-_nga
-hul
-_m
-ase
-ben
-_be
-T
-ic
-nda
-_si
-_na
-/
-ant
-ngu
-ad
-anga
-nje
-ith
-a._
-ye_
-athi_
-R
-os
-alo
-tha
-za_
-eth
-_es
-uma
-ana
-ile
-te
-ale
-aban
-:
-_A
-oba_
-hat
-kun
-ha_
-phe
-be_
-ali
-_am
-si_
-wo
-uy
-sik
-ise
-kan
-hath
-dlal
-_ne
-zwe
-aw
-han
-tu
-nye
-qe
-_ko
-ah
-hel
-thu
-isa_
-gob
-_K
-_lo
-ta
-_ama
-ot
-ula
-_em
-ze_
-i.
-ngob
-_izi
-hol
-ar
-ani
-ole
-uba
-_in
-up
-eka
-ini_
-goba
-tho
-hon
-_ezi
-ona_
-ezin
-ngoba
-lu_
-goba_
-ip
-a,
-eli_
-t_
-nya
-ndl
-sha
-_is
-the_
-i._
-amb
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
deleted file mode 100644
index 0a2e5d7..0000000
--- a/libtextcat/libtextcat-2.2.patch
+++ /dev/null
@@ -1,4098 +0,0 @@
---- misc/build/libtextcat-2.2/configure
-+++ misc/build/libtextcat-2.2/configure
-@@ -3451,7 +3451,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux-gnu*|k*bsd*-gnu*)
-   case $host_cpu in
-   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
-     lt_cv_deplibs_check_method=pass_all ;;
-@@ -5391,7 +5391,8 @@
- allow_undefined_flag=
- no_undefined_flag=
- need_lib_prefix=unknown
--need_version=unknown
-+#need_version=unknown
-+need_version=no
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
- archive_cmds=
-@@ -5785,7 +5786,7 @@
-     #        cross-compilation, but unfortunately the echo tests do not
-     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-     #	     `"' quotes if we put them in here... so don't!
--    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$compiler_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-     # We need to add '_' to the symbols in $export_symbols first
-     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-     hardcode_direct=yes
-@@ -6280,7 +6281,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -6365,7 +6365,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux-gnu*|k*bsd*-gnu*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
---- misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
-+++ misc/build/libtextcat-2.2/src/Makefile.in	Mon Mar 31 11:29:14 2008
-@@ -124,20 +124,20 @@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = 1.4 foreign
- 
--WARNS = -W -Wall -Wshadow -Wpointer-arith 
--IFLAGS = 
--FLAGS = -g -O3 -funroll-loops -D_THREAD_SAFE -D_GNU_SOURCE
-+#WARNS = -W -Wall -Wshadow -Wpointer-arith
-+IFLAGS =
-+#FLAGS = -g -O3 -funroll-loops -D_THREAD_SAFE -D_GNU_SOURCE
- VERBOSE = -DVERBOSE
- AM_CFLAGS = $(IFLAGS) $(VERBOSE) $(WARNS) $(FLAGS)
- AM_LDFLAGS = -g
- 
- noinst_HEADERS = \
--	common.h constants.h fingerprint.h textcat.h wg_mempool.h
-+        common.h constants.h fingerprint.h textcat.h wg_mempool.h utf8misc.h
- 
- 
- lib_LTLIBRARIES = libtextcat.la
- libtextcat_la_SOURCES = \
--	common.c fingerprint.c textcat.c wg_mempool.c
-+        common.c fingerprint.c textcat.c wg_mempool.c utf8misc.c
- 
- 
- bin_PROGRAMS = createfp
-@@ -156,7 +156,7 @@
- libtextcat_la_LDFLAGS =
- libtextcat_la_LIBADD =
- am_libtextcat_la_OBJECTS = common.lo fingerprint.lo textcat.lo \
--	wg_mempool.lo
-+        wg_mempool.lo utf8misc.lo
- libtextcat_la_OBJECTS = $(am_libtextcat_la_OBJECTS)
- bin_PROGRAMS = createfp$(EXEEXT)
- noinst_PROGRAMS = testtextcat$(EXEEXT)
-@@ -177,7 +177,8 @@
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/common.Plo ./$(DEPDIR)/createfp.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/fingerprint.Plo \
- @AMDEP_TRUE@	./$(DEPDIR)/testtextcat.Po ./$(DEPDIR)/textcat.Plo \
--@AMDEP_TRUE@	./$(DEPDIR)/wg_mempool.Plo
-+@AMDEP_TRUE@    ./$(DEPDIR)/wg_mempool.Plo \
-+@AMDEP_TRUE@    ./$(DEPDIR)/utf8misc.Plo
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -213,7 +214,7 @@
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
- 
--$(srcdir)/config.h.in:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-+$(srcdir)/config.h.in:  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	touch $(srcdir)/config.h.in
- 
-@@ -247,8 +248,8 @@
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
--libtextcat.la: $(libtextcat_la_OBJECTS) $(libtextcat_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libtextcat_la_LDFLAGS) $(libtextcat_la_OBJECTS) $(libtextcat_la_LIBADD) $(LIBS)
-+libtextcat.la: $(libtextcat_la_OBJECTS) $(libtextcat_la_DEPENDENCIES)
-+	$(LINK) -avoid-version -rpath $(libdir) $(libtextcat_la_LDFLAGS) $(libtextcat_la_OBJECTS) $(libtextcat_la_LIBADD) $(LIBS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -285,10 +286,10 @@
- 	  echo " rm -f $$p $$f"; \
- 	  rm -f $$p $$f ; \
- 	done
--createfp$(EXEEXT): $(createfp_OBJECTS) $(createfp_DEPENDENCIES) 
-+createfp$(EXEEXT): $(createfp_OBJECTS) $(createfp_DEPENDENCIES)
- 	@rm -f createfp$(EXEEXT)
- 	$(LINK) $(createfp_LDFLAGS) $(createfp_OBJECTS) $(createfp_LDADD) $(LIBS)
--testtextcat$(EXEEXT): $(testtextcat_OBJECTS) $(testtextcat_DEPENDENCIES) 
-+testtextcat$(EXEEXT): $(testtextcat_OBJECTS) $(testtextcat_DEPENDENCIES)
- 	@rm -f testtextcat$(EXEEXT)
- 	$(LINK) $(testtextcat_LDFLAGS) $(testtextcat_OBJECTS) $(testtextcat_LDADD) $(LIBS)
- 
-@@ -304,6 +305,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testtextcat.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textcat.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wg_mempool.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8misc.Plo@am__quote@
- 
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
---- misc/libtextcat-2.2/src/common.c	Thu May 22 13:32:43 2003
-+++ misc/build/libtextcat-2.2/src/common.c	Mon Mar 31 11:29:14 2008
-@@ -3,23 +3,23 @@
-  *
-  * Copyright (c) 2003, WiseGuys Internet B.V.
-  * All rights reserved.
-- * 
-+ *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-- * 
-+ *
-  * - Redistributions of source code must retain the above copyright
-  * notice, this list of conditions and the following disclaimer.
-- * 
-+ *
-  * - Redistributions in binary form must reproduce the above copyright
-  * notice, this list of conditions and the following disclaimer in the
-  * documentation and/or other materials provided with the
-  * distribution.
-- * 
-+ *
-  * - Neither the name of the WiseGuys Internet B.V. nor the names of
-  * its contributors may be used to endorse or promote products derived
-  * from this software without specific prior written permission.
-- * 
-+ *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-@@ -114,11 +114,11 @@
- 		wgmem_error( "Error while strduping %u bytes.\n", strlen(s) );
- 	}
- 
--	return( result ); 
-+	return( result );
- }
- 
--extern void* wg_realloc( void *ptr, size_t size ) 
--{ 
-+extern void* wg_realloc( void *ptr, size_t size )
-+{
- 	void *result;
- 
- 	if (!size) {
-@@ -131,7 +131,7 @@
- 		wgmem_error( "Error while reallocing %u bytes.\n", size );
- 	}
- 
--	return( result ); 
-+	return( result );
- }
- 
- extern void wg_free( void *mem )
-@@ -148,12 +148,12 @@
-         if ( fgets(line, size, fp) == NULL ) {
- 		return NULL;
- 	}
--        
-+
-         /** kill term null **/
-         if ( (p = strpbrk( line, "\n\r" )) ) {
-                 *p = '\0';
--        }           
--  
-+        }
-+
-         return line;
- }
- 
-@@ -164,39 +164,39 @@
-  *
-  * ARGUMENTS:
-  * - result:
-- * 
-+ *
-  *  After the split, this array contains pointers to the start of each
-  *  detected segment. Must be preallocated and at least as large as
-  *  maxsegments. The pointers point into the dest buffer.
-- * 
-- * - dest: 
-- * 
-+ *
-+ * - dest:
-+ *
-  *  String into which result points as an index. Must be preallocated, and
-  *  at least as big as src. You can use src as dest, but in that case src
-  *  is overwritten!
-- * 
-- * - src:  
-- * 
-+ *
-+ * - src:
-+ *
-  *  The string to split. Sequences of whitespace are treated as separators, unless
-  *  escaped. There are two ways to escape: by using single quotes (anything
-  *  between single quotes is treated as one segment), or by using a backslash
-  *  to escape the next character. The backslash escape works inside quotation
-  *  as well.
-- * 
-+ *
-  *  Example:
-- *  
-+ *
-  *  "It\'s   very\ easy   'to  use WiseGuys\' wg_split()' function" is split into:
-- *  
-+ *
-  *  "It's"
-  *  "very easy"
-  *  "to  use WiseGuys' wg_split()"
-  *  "function"
-- *  
-- * - maxsegments: 
-- * 
-+ *
-+ * - maxsegments:
-+ *
-  *  The maximum number of segments. If the splitter runs out of segments,
-  *  the remainder of the string is stored in the last segment.
-- *  
-+ *
-  * RETURN VALUE:
-  * The number of segments found.
-  */
-@@ -218,12 +218,12 @@
- 		switch (state) {
- 		case 0:
- 			/*** Skip spaces ***/
--			while ( isspace((int) *p) ) {
-+			while ( isspace((unsigned char) *p) ) {
- 				p++;
- 			}
- 			state = 1;
- 
--		case 1: 
-+		case 1:
- 			/*** Start segment ***/
- 			result[cnt] = w;
- 			cnt++;
-@@ -232,12 +232,12 @@
- 		case 2:
- 			/*** Unquoted segment ***/
- 			while (*p) {
--				if ( isspace((int) *p) ) {
-+				if ( isspace((unsigned char) *p) ) {
- 					*w++ = '\0';
- 					p++;
- 					state = 0;
- 					break;
--				}				
-+				}
- 				else if ( *p == '\'' ) {
- 					/*** Start quotation ***/
- 					p++;
-@@ -292,17 +292,17 @@
- }
- 
- 
-+#ifdef HAVE_GETTIMEOFDAY    /* TL : no struct timeval under Win32 */
- extern void wg_timerstart(wgtimer_t *t)
- {
--#ifdef HAVE_GETTIMEOFDAY
-         gettimeofday( &(t->start), NULL );
--#endif
- }
-+#endif  /* TL : no struct timeval under Win32 */
- 
- 
-+#ifdef HAVE_GETTIMEOFDAY    /* TL : no struct timeval under Win32 */
- extern uint4 wg_timerstop(wgtimer_t *t)
- {
--#ifdef HAVE_GETTIMEOFDAY
- 	uint4 result;
-         gettimeofday( &(t->stop), NULL );
-         result = (t->stop.tv_sec - t->start.tv_sec) * 1000000 +
-@@ -312,25 +312,23 @@
- 	t->start.tv_usec = t->stop.tv_usec;
- 
- 	return result;
--#else
--	return 0;
--#endif
- }
-+#endif  /* TL : no struct timeval under Win32 */
- 
- 
- /**
-  * wg_strgmov -- a guarded strcpy() variation
-- * 
-+ *
-  * copies src to dest (including terminating zero), and returns
-  * pointer to position of terminating zero in dest. The function is
-  * guaranteed not to write past destlimit. If the copy couldn't be
-- * finished, the function returns NULL after restoring the first 
-- * character in dest for your convenience (since this is usually a zero).  
-+ * finished, the function returns NULL after restoring the first
-+ * character in dest for your convenience (since this is usually a zero).
-  */
- char *wg_strgmov( char *dest, const char *src, const char *destlimit )
- {
- 	char tmp, *w;
--	
-+
- 	if ( !dest || dest >= destlimit ) {
- 		return NULL;
- 	}
-@@ -355,7 +353,7 @@
- }
- 
- /*
-- * wg_trim() -- remove whitespace surrounding a string. 
-+ * wg_trim() -- remove whitespace surrounding a string.
-  *
-  * Example: "   bla   bla   bla   " becomes "bla   bla   bla" after trimming.
-  *
-@@ -373,12 +371,12 @@
- 	char *lastnonspace = &dest[-1];
- 	const char *p = src;
- 	char *w = dest;
--	
--	while ( isspace((int)*p) ) {
-+
-+	while ( isspace((unsigned char)*p) ) {
- 		p++;
- 	}
- 	while (*p) {
--		if ( !isspace((int)*p) ) {
-+		if ( !isspace((unsigned char)*p) ) {
- 			lastnonspace = w;
- 		}
- 		*w++ = *p++;
-@@ -386,3 +386,18 @@
- 	return dest;
- }
- 
-+void *
-+rpl_malloc (size_t n)
-+{
-+  if (n == 0)
-+    n = 1;
-+  return malloc (n);
-+}
-+
-+void *
-+rpl_realloc (void *ptr, size_t n)
-+{
-+  if (n == 0)
-+    n = 1;
-+  return realloc (ptr, n);
-+}
---- misc/libtextcat-2.2/src/common.h	Thu May 22 15:02:29 2003
-+++ misc/build/libtextcat-2.2/src/common.h	Mon Mar 31 11:29:14 2008
-@@ -1,28 +1,28 @@
- #ifndef _COMMON_H_
- #define _COMMON_H_
- /**
-- * common.h -- a mixed bag of helper functions 
-+ * common.h -- a mixed bag of helper functions
-  *
-  * Copyright (C) 2003 WiseGuys Internet B.V.
-  *
-  * THE BSD LICENSE
-- * 
-+ *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-- * 
-+ *
-  * - Redistributions of source code must retain the above copyright
-  * notice, this list of conditions and the following disclaimer.
-- * 
-+ *
-  * - Redistributions in binary form must reproduce the above copyright
-  * notice, this list of conditions and the following disclaimer in the
-  * documentation and/or other materials provided with the
-  * distribution.
-- * 
-+ *
-  * - Neither the name of the WiseGuys Internet B.V. nor the names of
-  * its contributors may be used to endorse or promote products derived
-  * from this software without specific prior written permission.
-- * 
-+ *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-@@ -86,10 +86,12 @@
- typedef char		boole;
- #endif
- 
-+#ifdef HAVE_GETTIMEOFDAY    /* TL : no struct timeval under Win32 */
- typedef struct wgtimer_s {
-         struct timeval start;
-         struct timeval stop;
- } wgtimer_t;
-+#endif  /* TL : no struct timeval under Win32 */
- 
- 
- extern void *wg_malloc( size_t size );
-@@ -101,13 +103,15 @@
- 
- extern char *wg_getline( char *line, int size, FILE *fp );
- 
-+#ifdef HAVE_GETTIMEOFDAY    /* TL : no struct timeval under Win32 */
- extern void wg_timerstart(wgtimer_t *t);
- extern uint4 wg_timerstop(wgtimer_t *t);
-+#endif  /* TL : no struct timeval under Win32 */
- 
- extern unsigned int wg_split( char **result, char *dest, char *src, int maxsegments );
- extern char *wg_strgmov( char *dest, const char *src, const char *destlimit );
- extern char *wg_trim( char *dest, const char *src );
- 
--      
-+
- #endif
- 
---- misc/libtextcat-2.2/src/constants.h	Thu May 22 13:32:43 2003
-+++ misc/build/libtextcat-2.2/src/constants.h	Mon Mar 31 11:29:14 2008
-@@ -39,6 +39,8 @@
-  */
- #include <limits.h>
- 
-+#define _UTF8_
-+
- #define DESCRIPTION "out of place"
- 
- /* Reported matches are those fingerprints with a score less than best
-@@ -59,14 +61,21 @@
- /* Maximum number of n-grams in a fingerprint */
- #define MAXNGRAMS  400
- 
--/* Maximum size of an n-gram? */
--#define MAXNGRAMSIZE 5
-+/* Maximum number of character of an n-gram? */
-+#define MAXNGRAMSYMBOL 5
-+
-+/* Maximum size of the string representing an n-gram (must be greater than number of symbol) */
-+#ifdef _UTF8_
-+#define MAXNGRAMSIZE 20
-+#else
-+#define MAXNGRAMSIZE MAXNGRAMSYMBOL
-+#endif
- 
- /* Which characters are not acceptable in n-grams? */
--#define INVALID(c) (isspace((int)c) || isdigit((int)c)) 
-+#define INVALID(c) (isspace((unsigned char)c) || isdigit((unsigned char)c)) 
- 
- /* Minimum size (in characters) for accepting a document */
--#define MINDOCSIZE  25
-+#define MINDOCSIZE  6
- 
- /* Maximum penalty for missing an n-gram in fingerprint */
- #define MAXOUTOFPLACE 400
-@@ -75,5 +84,8 @@
- #define TABLEPOW  13
- 
- #define MAXSCORE  INT_MAX
-+
-+/* where the fingerprints files are stored */
-+#define DEFAULT_FINGERPRINTS_PATH ""
- 
- #endif
---- misc/libtextcat-2.2/src/fingerprint.c	Thu May 22 13:32:43 2003
-+++ misc/build/libtextcat-2.2/src/fingerprint.c	Mon Mar 31 11:29:14 2008
-@@ -6,23 +6,23 @@
-  * All rights reserved.
-  *
-  * THE BSD LICENSE
-- * 
-+ *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-- * 
-+ *
-  * - Redistributions of source code must retain the above copyright
-  * notice, this list of conditions and the following disclaimer.
-- * 
-+ *
-  * - Redistributions in binary form must reproduce the above copyright
-  * notice, this list of conditions and the following disclaimer in the
-  * documentation and/or other materials provided with the
-  * distribution.
-- * 
-+ *
-  * - Neither the name of the WiseGuys Internet B.V. nor the names of
-  * its contributors may be used to endorse or promote products derived
-  * from this software without specific prior written permission.
-- * 
-+ *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-@@ -51,7 +51,7 @@
-  * The reason why we go through the trouble of doing a partial
-  * (heap)sort is that a full quicksort behaves horribly on the data:
-  * most n-grams have a very low count, resulting in a data set in
-- * nearly-sorted order. This causes quicksort to behave very badly. 
-+ * nearly-sorted order. This causes quicksort to behave very badly.
-  * Heapsort, on the other hand, behaves handsomely: worst case is
-  * Mlog(N) for M n-grams filtered through a N-sized heap.
-  *
-@@ -63,6 +63,10 @@
-  * - put table/heap datastructure in a separate file.
-  */
- 
-+#ifndef _UTF8_
-+#define _UTF8_
-+#endif
-+
- #include "config.h"
- #include <stdio.h>
- #ifdef HAVE_STDLIB_H
-@@ -80,10 +84,12 @@
- #include "wg_mempool.h"
- #include "constants.h"
- 
-+#include "utf8misc.h"
- 
- #define TABLESIZE  (1<<TABLEPOW)
- #define TABLEMASK  ((TABLESIZE)-1)
- 
-+
- typedef struct {
- 
- 	sint2 rank;
-@@ -96,7 +102,7 @@
- 	const char *name;
- 	ngram_t *fprint;
- 	uint4 size;
--	
-+
- } fp_t;
- 
- typedef struct entry_s {
-@@ -105,13 +111,13 @@
- 	struct entry_s *next;
- } entry_t;
- 
--typedef struct table_s {	
-+typedef struct table_s {
- 	void *pool;
- 	entry_t **table;
- 	entry_t *heap;
- 
- 	struct table_s *next;
--	
-+
- 	uint4 heapsize;
- 	uint4 size;
- } table_t;
-@@ -122,7 +128,7 @@
-  * fast and furious little hash function
-  *
-  * (Note that we could use some kind of rolling checksum, and update it
-- * during n-gram construction) 
-+ * during n-gram construction)
-  */
- static uint4 simplehash( const char *p, int len )
- {
-@@ -134,29 +140,14 @@
- }
- 
- 
--/* checks if n-gram lex is a prefix of key and of length len */
--inline int issame( char *lex, char *key, int len )
--{
--	int i;
--	for (i=0; i<len; i++) {
--		if ( key[i] != lex[i] ) {
--			return 0;
--		}
--	}
--	if ( lex[i] != 0 ) {
--		return 0;
--	}
--	return 1;
--}
--
- 
- /* increases frequency of ngram(p,len) */
--static inline int increasefreq( table_t *t, char *p, int len ) 
--{	
--	uint4 hash = simplehash( p, len ) & TABLEMASK;				
-+static int increasefreq( table_t *t, char *p, int len )
-+{
-+	uint4 hash = simplehash( p, len ) & TABLEMASK;
- 	entry_t *entry = t->table[ hash ];
--	
--	while ( entry ) {				
-+
-+	while ( entry ) {
- 		if ( issame( entry->str, p, len ) ) {
- 			/*** Found it! ***/
- 			entry->cnt++;
-@@ -168,7 +159,7 @@
- 	}
- 
- 	/*** Not found, so create ***/
--	entry = wgmempool_alloc( t->pool, sizeof(entry_t) );
-+        entry = (entry_t*)(wgmempool_alloc( t->pool, sizeof(entry_t) ));
- 	strcpy( entry->str, p );
- 	entry->cnt = 1;
- 
-@@ -181,12 +172,12 @@
- #if 0
- 
- /* looks up ngram(p,len) */
--static entry_t *findfreq( table_t *t, char *p, int len ) 
--{	
--	uint4 hash = simplehash( p, len ) & TABLEMASK;				
-+static entry_t *findfreq( table_t *t, char *p, int len )
-+{
-+	uint4 hash = simplehash( p, len ) & TABLEMASK;
- 	entry_t *entry = t->table[ hash ];
--	
--	while ( entry ) {				
-+
-+	while ( entry ) {
- 		if ( issame( entry->str, p, len ) ) {
- 			return entry;
- 		}
-@@ -219,7 +210,7 @@
- #define GREATER(x,y) ((x).cnt > (y).cnt)
- #define LESS(x,y)    ((x).cnt < (y).cnt)
- 
--inline static void siftup( table_t *t, unsigned int child )
-+static void siftup( table_t *t, unsigned int child )
- {
- 	entry_t *heap = t->heap;
- 	unsigned int parent = (child-1) >> 1;
-@@ -241,7 +232,7 @@
- }
- 
- 
--inline static void siftdown( table_t *t, unsigned int heapsize, uint4 parent )
-+static void siftdown( table_t *t, unsigned int heapsize, uint4 parent )
- {
- 	entry_t *heap = t->heap;
- 	unsigned int child = parent*2 + 1;
-@@ -273,7 +264,7 @@
- 	if (t->size < t->heapsize) {
- 		memcpy( &(heap[t->size]), item, sizeof(entry_t));
- 		siftup( t, t->size );
--		t->size++;		
-+		t->size++;
- 		return 0;
- 	}
- 
-@@ -316,18 +307,18 @@
- 
- 	/*** Fill result heap ***/
- 	for (i=0; i<TABLESIZE; i++) {
--		entry_t *p = t->table[i];	       
-+		entry_t *p = t->table[i];
- 		while (p) {
- 			heapinsert(t, p);
- 			p = p->next;
- 		}
--	}     
-+	}
- 	return 1;
- }
- 
- 
- static table_t *inittable(uint4 maxngrams)
--{	
-+{
- 	table_t *result = (table_t *)wg_zalloc( sizeof(table_t) );
- 	result->table = (entry_t **)wg_zalloc( sizeof(entry_t*) * TABLESIZE );
- 	result->pool = wgmempool_Init( 10000, 10 );
-@@ -347,14 +338,14 @@
- 	wgmempool_Done(t->pool);
- 	wg_free(t->table);
- 	wg_free(t->heap);
--	wg_free(t);	
-+	wg_free(t);
- }
- 
- 
- extern void *fp_Init(const char *name)
- {
- 	fp_t *h = (fp_t *)wg_zalloc( sizeof(fp_t) );
--	
-+
- 	if ( name ) {
- 		h->name = wg_strdup(name);
- 	}
-@@ -458,21 +449,27 @@
- 	return dest;
- }
- 
--
-+/**
-+* this function extract all n-gram from past buffer and put them into the table "t"
-+* [modified] by Jocelyn Merand to accept utf-8 multi-character symbols to be used in OpenOffice
-+*/
- static void createngramtable( table_t *t, const char *buf )
- {
- 	char n[MAXNGRAMSIZE+1];
- 	const char *p = buf;
- 	int i;
-+        int pointer = 0;
- 
- 	/*** Get all n-grams where 1<=n<=MAXNGRAMSIZE. Allow underscores only at borders. ***/
--	for (;;p++) {
-+	while(1) {
- 
--		const char *q = p;
-+     const char *q = &p[pointer];   /*[modified] previously p++ above (for(;;p++)) now, it's pointer wich is increased so we have to get the new pointer on the buffer*/
- 		char *m = n;
- 
- 		/*** First char may be an underscore ***/
--		*m++ = *q++;
-+                int decay = charcopy(q, m); /*[modified] previously *q++ = *m++*/
-+                q = &(p[pointer+decay]);    /*[modified] the old copying method do not manage multi-character symbols*/
-+                m += decay; /*[modified]*/
- 		*m = '\0';
- 
- 		increasefreq( t, n, 1 );
-@@ -482,19 +479,22 @@
- 		}
- 
- 		/*** Let the compiler unroll this ***/
--		for ( i=2; i<=MAXNGRAMSIZE; i++) {
-+		for ( i=2; i<=MAXNGRAMSYMBOL; i++) {
- 
--			*m++ = *q;
-+                        decay = charcopy(q, m); /*[modified] like above*/
-+                        m += decay;
- 			*m = '\0';
- 
- 			increasefreq( t, n, i );
- 
- 			if ( *q == '_' ) break;
--			q++;
-+                        q += decay;
- 			if ( *q == '\0' ) {
- 				return;
- 			}
- 		}
-+
-+  pointer = nextcharstart(p,pointer);   /*[modified] p[pointer] must point on the next start of symbol, but whith utf next start is not surely next char*/
- 	}
- 	return;
- }
-@@ -514,7 +514,7 @@
- {
- 	ngram_t *x = (ngram_t *)a;
- 	ngram_t *y = (ngram_t *)b;
--	
-+
- 	return mystrcmp( x->str, y->str );
- }
- 
-@@ -522,12 +522,12 @@
- {
- 	ngram_t *x = (ngram_t *)a;
- 	ngram_t *y = (ngram_t *)b;
--	
-+
- 	return x->rank - y->rank;
- }
- 
- /**
-- * Create a fingerprint: 
-+ * Create a fingerprint:
-  * - record the frequency of each unique n-gram in a hash table
-  * - take the most frequent n-grams
-  * - sort them alphabetically, recording their relative rank
-@@ -544,20 +544,21 @@
- 	}
- 
- 	/*** Throw out all invalid chars ***/
--	tmp = prepbuffer( buffer, bufsize ); 	
-+	tmp = prepbuffer( buffer, bufsize );
-+    /*printf("Cleaned buffer : %s\n",tmp);*/
- 	if ( tmp == NULL ) {
- 		return 0;
- 	}
--
- 	h = (fp_t*)handle;
- 	t = inittable(maxngrams);
-+    /*printf("Table initialized\n");*/
- 
- 	/*** Create a hash table containing n-gram counts ***/
- 	createngramtable(t, tmp);
--
-+    /*printf("Table created\n");*/
- 	/*** Take the top N n-grams and add them to the profile ***/
--	table2heap(t);	
--	maxngrams = WGMIN( maxngrams, t->size );       
-+	table2heap(t);
-+	maxngrams = WGMIN( maxngrams, t->size );
- 
- 	h->fprint = (ngram_t *)wg_malloc( sizeof(ngram_t) * maxngrams );
- 	h->size = maxngrams;
-@@ -568,7 +569,7 @@
- 		entry_t tmp2;
- 
- 		heapextract(t, &tmp2);
--		
-+
- 		/*** the string and its rank is all we need ***/
- 		strcpy( h->fprint[i].str, tmp2.str );
- 		h->fprint[i].rank = i;
-@@ -578,7 +579,7 @@
- 	wg_free(tmp);
- 
- 	/*** Sort n-grams alphabetically, for easy comparison ***/
--	qsort( h->fprint, h->size, sizeof(ngram_t), ngramcmp_str ); 
-+	qsort( h->fprint, h->size, sizeof(ngram_t), ngramcmp_str );
- 	return 1;
- }
- 
-@@ -608,7 +609,7 @@
- #endif
- 		return 0;
- 	}
--	
-+
- 	h->fprint = (ngram_t *)wg_malloc(maxngrams * sizeof(ngram_t));
- 
- 	while (cnt < maxngrams && wg_getline(line,1024,fp)) {
-@@ -635,7 +636,7 @@
- 	h->size = cnt;
- 
- 	/*** Sort n-grams, for easy comparison later on ***/
--	qsort( h->fprint, h->size, sizeof(ngram_t), ngramcmp_str ); 
-+	qsort( h->fprint, h->size, sizeof(ngram_t), ngramcmp_str );
- 
- 	fclose(fp);
- 
-@@ -648,14 +649,15 @@
- {
- 	uint4 i;
- 	fp_t *h = (fp_t *)handle;
--	ngram_t *tmp = wg_malloc( sizeof(ngram_t) * h->size );
--	
-+        ngram_t *tmp = (ngram_t*)wg_malloc( sizeof(ngram_t) * h->size );
-+
- 	/*** Make a temporary and sort it on rank ***/
- 	memcpy( tmp, h->fprint, h->size * sizeof(ngram_t) );
--	qsort( tmp, h->size, sizeof(ngram_t), ngramcmp_rank ); 
-+	qsort( tmp, h->size, sizeof(ngram_t), ngramcmp_rank );
- 
- 	for (i=0; i<h->size; i++) {
--		fprintf( fp, "%s\n", tmp[i].str );
-+        /*fprintf( fp, "%s\t%i\n", tmp[i].str, tmp[i].rank );*/
-+                fprintf( fp, "%s\n", tmp[i].str);
- 	}
- 	wg_free( tmp );
- }
-@@ -669,7 +671,7 @@
- 	uint4 i = 0;
- 	uint4 j = 0;
- 	sint4 sum = 0;
--	
-+
- 	/*** Compare the profiles in mergesort fashion ***/
- 	while ( i < c->size && j < u->size ) {
- 
-@@ -705,7 +707,7 @@
- 	}
- 
- 	return sum;
--	       	
-+
- }
- 
- 
---- misc/libtextcat-2.2/src/fingerprint.h	Mon May 19 14:16:31 2003
-+++ misc/build/libtextcat-2.2/src/fingerprint.h	Mon Mar 31 11:29:14 2008
-@@ -41,7 +41,13 @@
- extern int fp_Read( void *handle, const char *fname, int maxngrams );
- extern sint4 fp_Compare( void *cat, void *unknown, int cutoff );
- extern void fp_Show( void *handle );
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- extern const char *fp_Name( void *handle );
-+#ifdef __cplusplus
-+}
-+#endif
- extern void fp_Print( void *handle, FILE *fp );
- 
- #endif
---- misc/libtextcat-2.2/src/libtextcat.map	Mon Mar 31 11:30:06 2008
-+++ misc/build/libtextcat-2.2/src/libtextcat.map	Mon Mar 31 11:29:14 2008
-@@ -1 +1,40 @@
--dummy
-+{
-+	global: 
-+		charcopy
-+		issame
-+		nextcharstart
-+		utfstrlen
-+		wgmempool_Done
-+		wgmempool_Init
-+		wgmempool_Reset
-+		wgmempool_alloc
-+		wgmempool_getline
-+		wgmempool_strdup
-+		special_textcat_Init
-+		textcat_Classify
-+		textcat_Done
-+		textcat_Init
-+		textcat_Version
-+		fp_Compare
-+		fp_Create
-+		fp_Debug
-+		fp_Done
-+		fp_Init
-+		fp_Name
-+		fp_Print
-+		fp_Read
-+		heapextract
-+		wg_calloc
-+		wg_free
-+		wg_getline
-+		wg_malloc
-+		wg_split
-+		wg_strdup
-+		wg_strgmov
-+		wg_trim
-+		wg_zalloc
-+		wgmem_error
-+		
-+	local:
-+		*;
-+}
---- misc/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:30:06 2008
-+++ misc/build/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:29:42 2008
-@@ -1 +1,87 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ = ..$/..$/..$/..$/..
-+
-+PRJNAME = libtextcat
-+TARGET  = libtextcat
-+CFLAGSCALL=gsd
-+
-+USE_DEFFILE=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+# !! not to be compiled because those belong to a stand alone programs: !!
-+#        $(SLO)$/createfp.obj\
-+#        $(SLO)$/testtextcat.obj
-+
-+SLOFILES=   \
-+        $(SLO)$/common.obj\
-+        $(SLO)$/fingerprint.obj\
-+        $(SLO)$/textcat.obj\
-+        $(SLO)$/wg_mempool.obj\
-+        $(SLO)$/utf8misc.obj
-+
-+#SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
-+SHL1TARGET= $(TARGET)
-+
-+SHL1STDLIBS=
-+
-+# build DLL
-+SHL1LIBS=       $(SLB)$/$(TARGET).lib
-+SHL1IMPLIB=     i$(TARGET)
-+SHL1DEPN=       $(SHL1LIBS)
-+SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-+
-+# build DEF file
-+DEF1NAME=       $(SHL1TARGET)
-+DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
-+
-+SHL1VERSIONMAP= libtextcat.map
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+
-+# copy hand supplied configuration file for Win32 builds to the file
-+# which is included in the source code
-+$(SLOFILES) : config.h
-+config.h :
-+    $(GNUCOPY) $(OUT)$/misc$/build$/libtextcat-2.2$/src$/win32_config.h   $(OUT)$/misc$/build$/libtextcat-2.2$/src$/config.h
-+
-+
-+$(MISC)$/$(SHL1TARGET).flt:  makefile.mk
-+    @echo ------------------------------
-+    @echo Making: $@
-+    @echo Imp>$@
-+    @echo __CT>>$@
-+    @echo _real>>$@
-+    @echo unnamed>>$@
---- misc/libtextcat-2.2/src/textcat.c	Thu May 22 13:32:43 2003
-+++ misc/build/libtextcat-2.2/src/textcat.c	Mon Mar 31 11:29:14 2008
-@@ -4,23 +4,23 @@
-  * Copyright (C) 2003 WiseGuys Internet B.V.
-  *
-  * THE BSD LICENSE
-- * 
-+ *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-- * 
-+ *
-  * - Redistributions of source code must retain the above copyright
-  * notice, this list of conditions and the following disclaimer.
-- * 
-+ *
-  * - Redistributions in binary form must reproduce the above copyright
-  * notice, this list of conditions and the following disclaimer in the
-  * documentation and/or other materials provided with the
-  * distribution.
-- * 
-+ *
-  * - Neither the name of the WiseGuys Internet B.V. nor the names of
-  * its contributors may be used to endorse or promote products derived
-  * from this software without specific prior written permission.
-- * 
-+ *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-@@ -74,6 +74,7 @@
- typedef struct {
- 
- 	void **fprint;
-+        char *fprint_disable;
- 	uint4 size;
- 	uint4 maxsize;
- 
-@@ -112,11 +113,21 @@
- 		fp_Done( h->fprint[i] );
- 	}
- 	wg_free( h->fprint );
-+        wg_free( h->fprint_disable );
- 	wg_free( h );
- 
- }
- 
--extern void *textcat_Init( const char *conffile )
-+/** Replaces older function */
-+extern void *textcat_Init( const char *conffile ){
-+    return special_textcat_Init( conffile, DEFAULT_FINGERPRINTS_PATH );
-+}
-+
-+/**
-+ * Originaly this function had only one parameter (conffile) it has been modified since OOo use
-+ * Basicaly prefix is the directory path where fingerprints are stored
-+ */
-+extern void *special_textcat_Init( const char *conffile, const char *prefix )
- {
- 	textcat_t *h;
- 	char line[1024];
-@@ -134,11 +145,13 @@
- 	h->size = 0;
- 	h->maxsize = 16;
- 	h->fprint = (void **)wg_malloc( sizeof(void*) * h->maxsize );
-+ h->fprint_disable = (char *)wg_malloc( sizeof(char*) * h->maxsize );   /*added to store the state of languages*/
- 
- 	while ( wg_getline( line, 1024, fp ) ) {
- 		char *p;
- 		char *segment[4];
--		int res;
-+                char finger_print_file_name[512];
-+                int res;
- 
- 		/*** Skip comments ***/
- #ifdef HAVE_STRCHR
-@@ -156,17 +169,23 @@
- 		/*** Ensure enough space ***/
- 		if ( h->size == h->maxsize ) {
- 			h->maxsize *= 2;
--			h->fprint = (void *)wg_realloc( h->fprint, sizeof(void*) * h->maxsize );
-+			h->fprint = (void **)wg_realloc( h->fprint, sizeof(void*) * h->maxsize );
-+                        h->fprint_disable = (char *)wg_realloc( h->fprint_disable, sizeof(char*) * h->maxsize );
- 		}
- 
- 		/*** Load data ***/
- 		if ((h->fprint[ h->size ] = fp_Init( segment[1] ))==NULL) {
- 			goto ERROR;
- 		}
--		if ( fp_Read( h->fprint[h->size], segment[0], 400 ) == 0 ) {
-+                finger_print_file_name[0] = '\0';
-+                strcat(finger_print_file_name, prefix);
-+                strcat(finger_print_file_name, segment[0]);
-+
-+                if ( fp_Read( h->fprint[h->size], finger_print_file_name, 400 ) == 0 ) {
- 			textcat_Done(h);
- 			goto ERROR;
--		}		
-+		}
-+                h->fprint_disable[h->size] = 0xF0;  /*0xF0 is the code for enabled languages, 0x0F is for disabled*/
- 		h->size++;
- 	}
- 
-@@ -203,11 +222,18 @@
- 		result = _TEXTCAT_RESULT_SHORT;
- 		goto READY;
- 	}
--	
-+
- 	/*** Calculate the score for each category. ***/
- 	for (i=0; i<h->size; i++) {
--		int score = fp_Compare( h->fprint[i], unknown, threshold );
--		candidates[i].score = score;
-+                int score;
-+                if(h->fprint_disable[i] & 0x0F){    /*if this language is disabled*/
-+                    score = MAXSCORE;
-+                }
-+                else{
-+                    score = fp_Compare( h->fprint[i], unknown, threshold );
-+                    /*printf("Score for %s : %i\n", fp_Name(h->fprint[i]), score);*/
-+                }
-+                candidates[i].score = score;
- 		candidates[i].name = fp_Name( h->fprint[i] );
- 		if ( score < minscore ) {
- 			minscore = score;
-@@ -218,7 +244,6 @@
- 	/*** Find the best performers ***/
- 	for (i=0; i<h->size; i++) {
- 		if ( candidates[i].score < threshold ) {
--
- 			if ( ++cnt == MAXCANDIDATES+1 ) {
- 				break;
- 			}
-@@ -235,7 +260,7 @@
- 	else {
- 		char *p = result;
- 		char *plimit = result+MAXOUTPUTSIZE;
--		
-+
- 		qsort( candidates, cnt, sizeof(candidate_t), cmpcandidates );
- 
- 		*p = '\0';
-@@ -247,7 +272,7 @@
- 	}
-  READY:
- 	fp_Done(unknown);
--#ifdef SHOULD_FREE 
-+#ifdef SHOULD_FREE
- 	free(candidates);
- #undef SHOULD_FREE
- #endif
---- misc/libtextcat-2.2/src/textcat.h	Mon May 19 14:16:31 2003
-+++ misc/build/libtextcat-2.2/src/textcat.h	Mon Mar 31 11:29:14 2008
-@@ -40,6 +40,9 @@
- #define _TEXTCAT_RESULT_UNKOWN        "UNKNOWN"
- #define _TEXTCAT_RESULT_SHORT         "SHORT"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * textcat_Init() - Initialize the text classifier. The textfile
-@@ -51,10 +54,19 @@
-  * Returns: handle on success, NULL on error. (At the moment, the
-  * only way errors can occur, is when the library cannot read the
-  * conffile, or one of the fingerprint files listed in it.)
-+ *
-+ * Replace older function (and has exacly the same behaviour)
-+ * see below
-  */
- extern void *textcat_Init( const char *conffile );
- 
- /**
-+ * Originaly this function had only one parameter (conffile) it has been modified since OOo must be able to load alternativ DB
-+ * Basicaly prefix is the directory path where fingerprints are stored
-+ */
-+extern void *special_textcat_Init( const char *conffile, const char *prefix );
-+
-+/**
-  * textcat_Done() - Free up resources for handle
-  */
- extern void textcat_Done( void *handle );
-@@ -77,4 +89,8 @@
-  * textcat_Version() - Returns a string describing the version of this classifier.
-  */
- extern char *textcat_Version();
-+
-+#ifdef __cplusplus
-+}
-+#endif
- #endif
---- misc/libtextcat-2.2/src/utf8misc.c	Mon Mar 31 11:30:06 2008
-+++ misc/build/libtextcat-2.2/src/utf8misc.c	Mon Mar 31 11:29:14 2008
-@@ -1 +1,132 @@
--dummy
-+/***************************************************************************
-+ *   Copyright (C) 2006 by Jocelyn Merand                                  *
-+ *   joc.mer@gmail.com                                                     *
-+ *                                                                         *
-+ * THE BSD LICENSE
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ ***************************************************************************/
-+
-+#ifndef _UTF8_MISC_H_
-+#include "utf8misc.h"
-+#endif
-+
-+
-+int nextcharstart(const char *str, int position){
-+    int pointer = position;
-+
-+    if(str[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
-+
-+        /*then str[pointer] is an escape character*/
-+
-+    char escape_char = ((str[pointer] & WEIGHT_MASK) << 1); /*and we use it to count (by bit translation) following characters (only the weightest part)*/
-+
-+    while(escape_char & ESCAPE_MASK && str[pointer]){/*every step, we move the byte of 1 bit left, when first bit is 0, it's finished*/
-+        escape_char = escape_char <<1;
-+        ++pointer;
-+    }
-+    }
-+    if(str[pointer]){   /*finaly, if we are not on the \0 character, we jump to the next character*/
-+        ++pointer;
-+    }
-+    return pointer;
-+}
-+
-+
-+int charcopy(const char *str, char *dest){
-+
-+    int pointer = 0;
-+    if(str[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
-+
-+        /*then str[pointer] is an escape character*/
-+
-+        char escape_char = ((str[pointer] & WEIGHT_MASK) << 1); /*and we use it to count following characters (only the weightest part)*/
-+
-+        while(escape_char & ESCAPE_MASK && str[pointer]){   /*every step, we move the byte of 1 bit left, when first bit is 0, it's finished*/
-+            dest[pointer] = str[pointer];
-+            escape_char = escape_char <<1;
-+            ++pointer;
-+        }
-+    }
-+    if(str[pointer]){
-+        dest[pointer] = str[pointer];
-+        ++pointer;
-+    }
-+
-+    return pointer;
-+}
-+
-+
-+int issame( char *lex, char *key, int len )
-+{
-+    /*printf("[%s] prefix of [%s] with length %i", lex, key, len);*/
-+    int char_counter = 0;
-+    int pointer = 0;
-+    while(char_counter < len) {
-+
-+        if(key[pointer] & ESCAPE_MASK){ /*if the first bit of the current char is 1*/
-+
-+            /*then key[pointer] is an escap character*/
-+
-+            char escape_char = ((key[pointer] & WEIGHT_MASK) << 1);     /*and we use it to count (only the weightest part)*/
-+
-+            while(escape_char & ESCAPE_MASK && key[pointer] == lex[pointer] ){
-+                escape_char = escape_char <<1;
-+                ++pointer;
-+            }
-+        }
-+        ++char_counter; /*and we are on a new utf8 character*/
-+        if ( key[pointer] != lex[pointer] ) {
-+            return 0;
-+            /*printf(" NO\n", lex, key, len);*/
-+        }
-+        ++pointer;
-+    }
-+    if ( lex[pointer] != '\0' ) {
-+        return 0;
-+        /*printf(" NO\n");*/
-+    }
-+
-+    /*printf(" YES\n");*/
-+
-+    return 1;
-+}
-+
-+
-+extern int utfstrlen(const char* str){
-+    int char_counter = 0;
-+    int pointer = 0;
-+    while(str[pointer]) {
-+        pointer = nextcharstart(str, pointer);
-+
-+        ++char_counter; /*and we are on a new utf8 character*/
-+    }
-+    return char_counter;
-+}
-+
---- misc/libtextcat-2.2/src/utf8misc.h	Mon Mar 31 11:30:06 2008
-+++ misc/build/libtextcat-2.2/src/utf8misc.h	Mon Mar 31 11:29:14 2008
-@@ -1 +1,88 @@
--dummy
-+/***************************************************************************
-+ *   Copyright (C) 2006 by Jocelyn Merand                                  *
-+ *   joc.mer@gmail.com                                                     *
-+ *                                                                         *
-+ * THE BSD LICENSE
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ ***************************************************************************/
-+
-+#ifndef _UTF8_MISC_H_
-+#define _UTF8_MISC_H_
-+
-+/**
-+ * These variables are used in character processing functions
-+ * These have been added to manage utf-8 symbols, particularly escape chars
-+ */
-+#ifdef _UTF8_
-+#define ESCAPE_MASK 0x80
-+#define WEIGHT_MASK 0xF0
-+#else
-+#define ESCAPE_MASK 0xFF
-+#define WEIGHT_MASK 0x00
-+#endif
-+
-+
-+/*
-+ * Is used to jump to the next start of char
-+ * of course it's only usefull when encoding is utf-8
-+ * This function have been added by Jocelyn Merand to use libtextcat in OOo
-+ */
-+int nextcharstart(const char *str, int position);
-+
-+
-+/*Copy the char in str to dest
-+ * of course it's only usefull when encoding is utf8 and the symbol is encoded with more than 1 char
-+ * return the number of char jumped
-+ * This function have been added by Jocelyn Merand to use libtextcat in OOo
-+ */
-+int charcopy(const char *str, char *dest);
-+
-+
-+/* checks if n-gram lex is a prefix of key and of length len
-+* if _UTF8_ is defined, it uses escap characters and len is not realy the length of lex
-+* in this case, len is the number of utf-8 char strlen("€") == 3 but len == 1
-+*/
-+int issame( char *lex, char *key, int len );
-+
-+
-+/* Counts the number of characters
-+* if _UTF8_ is defined, it uses escap characters and the result is not realy the length of str
-+* in this case, the result is the number of utf-8 char strlen("€") == 3 but utfstrlen("€") == 1
-+*/
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+extern int utfstrlen(const char* str);
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
---- misc/libtextcat-2.2/src/win32_config.h	Mon Mar 31 11:30:06 2008
-+++ misc/build/libtextcat-2.2/src/win32_config.h	Mon Mar 31 11:29:14 2008
-@@ -1 +1,136 @@
--dummy
-+/* src/config.h.  Generated by configure.  */
-+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-+   systems. This function is required for `alloca.c' support on those systems.
-+   */
-+/* #undef CRAY_STACKSEG_END */
-+
-+/* Define to 1 if using `alloca.c'. */
-+/* #undef C_ALLOCA */
-+
-+/* Define to 1 if you have `alloca', as a function or macro. */
-+/* #undef HAVE_ALLOCA */
-+
-+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-+   */
-+/* #undef HAVE_ALLOCA_H */
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#define HAVE_DLFCN_H 1
-+
-+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-+/* #undef HAVE_DOPRNT */
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+/* #undef  HAVE_GETTIMEOFDAY */
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+/* #undef  HAVE_INTTYPES_H */
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-+   to 0 otherwise. */
-+#define HAVE_MALLOC 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the `memset' function. */
-+#define HAVE_MEMSET 1
-+
-+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
-+   and to 0 otherwise. */
-+#define HAVE_REALLOC 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+/* #undef  HAVE_STDINT_H */
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `strchr' function. */
-+#define HAVE_STRCHR 1
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#define HAVE_STRDUP 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+/* #undef HAVE_STRINGS_H */
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strpbrk' function. */
-+#define HAVE_STRPBRK 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+/* #undef  HAVE_SYS_TIME_H */
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#define HAVE_VPRINTF 1
-+
-+/* Name of package */
-+#define PACKAGE "libtextcat"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT ""
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "libtextcat"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "libtextcat 2.2"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "libtextcat"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "2.2"
-+
-+/* If using the C implementation of alloca, define if you know the
-+   direction of stack growth for your system; otherwise it will be
-+   automatically deduced at run-time.
-+        STACK_DIRECTION > 0 => grows toward higher addresses
-+        STACK_DIRECTION < 0 => grows toward lower addresses
-+        STACK_DIRECTION = 0 => direction of growth unknown */
-+/* #undef STACK_DIRECTION */
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-+/* #undef TM_IN_SYS_TIME */
-+
-+/* Version number of package */
-+#define VERSION "2.2"
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-+   if it is not supported. */
-+/* #undef inline */
-+
-+/* Define to rpl_malloc if the replacement function should be used. */
-+/* #undef malloc */
-+
-+/* Define to rpl_realloc if the replacement function should be used. */
-+/* #undef realloc */
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* #undef size_t */
---- misc/libtextcat-2.2/config.guess	2010-04-15 09:20:04.000000000 +0000
-+++ misc/build/libtextcat-2.2/config.guess	2010-04-15 09:20:41.000000000 +0000
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
- 
--timestamp='2002-10-21'
-+timestamp='2009-12-30'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,23 +18,25 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Originally written by Per Bothner <per@bothner.com>.
--# Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -53,8 +56,9 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -66,11 +70,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -98,14 +102,18 @@
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
- 
--# This shell variable is my proudest work .. or something. --bje
-+# Portable tmp directory creation inspired by the Autoconf team.
- 
--set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
--(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
--   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
--dummy=$tmpdir/dummy ;
--files="$dummy.c $dummy.o $dummy.rel $dummy" ;
--trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-  ,,)    echo "int x;" > $dummy.c ;
- 	for c in cc gcc c89 c99 ; do
-@@ -113,15 +121,13 @@
- 	     CC_FOR_BUILD="$c"; break ;
- 	  fi ;
- 	done ;
--	rm -f $files ;
- 	if test x"$CC_FOR_BUILD" = x ; then
- 	  CC_FOR_BUILD=no_compiler_found ;
- 	fi
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;
--unset files'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -156,6 +162,7 @@
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -164,7 +171,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -178,144 +185,128 @@
- 		;;
- 	esac
- 	# The OS release
--	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mipseb-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	eval $set_cc_for_build
--	cat <<EOF >$dummy.s
--	.data
--\$Lformat:
--	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
--
--	.text
--	.globl main
--	.align 4
--	.ent main
--main:
--	.frame \$30,16,\$26,0
--	ldgp \$29,0(\$27)
--	.prologue 1
--	.long 0x47e03d80 # implver \$0
--	lda \$2,-1
--	.long 0x47e20c21 # amask \$2,\$1
--	lda \$16,\$Lformat
--	mov \$0,\$17
--	not \$1,\$18
--	jsr \$26,printf
--	ldgp \$29,0(\$26)
--	mov 0,\$16
--	jsr \$26,exit
--	.end main
--EOF
--	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
--	if test "$?" = 0 ; then
--		case `$dummy` in
--			0-0)
--				UNAME_MACHINE="alpha"
--				;;
--			1-0)
--				UNAME_MACHINE="alphaev5"
--				;;
--			1-1)
--				UNAME_MACHINE="alphaev56"
--				;;
--			1-101)
--				UNAME_MACHINE="alphapca56"
--				;;
--			2-303)
--				UNAME_MACHINE="alphaev6"
--				;;
--			2-307)
--				UNAME_MACHINE="alphaev67"
--				;;
--			2-1307)
--				UNAME_MACHINE="alphaev68"
--				;;
--			3-1307)
--				UNAME_MACHINE="alphaev7"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy && rmdir $tmpdir
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -323,29 +314,51 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
--    DRS?6000:UNIX_SV:4.2*:7*)
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
--    i86pc:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -354,10 +367,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -369,10 +382,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -383,37 +396,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -437,33 +453,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--	rm -f $dummy.c $dummy && rmdir $tmpdir
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
--    Night_Hawk:*:*:PowerMAX_OS)
-+	exit ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -479,29 +495,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -509,7 +525,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -524,16 +540,19 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--		rm -f $dummy.c $dummy && rmdir $tmpdir
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
--    *:AIX:*:[45])
-+	exit ;;
-+    *:AIX:*:[456])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -546,28 +565,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -624,16 +643,36 @@
-               }
- EOF
- 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
--		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
--		    rm -f $dummy.c $dummy && rmdir $tmpdir
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
- 		fi ;;
- 	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep -q __LP64__
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -661,186 +700,248 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--	rm -f $dummy.c $dummy && rmdir $tmpdir
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
--    CRAY*T3D:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
--	# Determine whether the default compiler uses glibc.
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#if __GLIBC__ >= 2
--	LIBC=gnu
--	#else
--	LIBC=
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c && rmdir $tmpdir
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
--	exit 0 ;;
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
--    i*:MINGW*:*)
-+	exit ;;
-+    *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
--    x86:Interix*:3*)
--	echo i386-pc-interix3
--	exit 0 ;;
-+	exit ;;
-+    *:Interix*:*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    authenticamd | genuineintel | EM64T)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i386-pc-interix
--	exit 0 ;;
-+	echo i586-pc-interix
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-     arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
--    mips:Linux:*:*)
-+	exit ;;
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips
--	#undef mipsel
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	rm -f $dummy.c && rmdir $tmpdir
--	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
--    ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -848,82 +949,40 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
--    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
--    i*86:Linux:*:*)
--	# The BFD linker knows what the default object file format is, so
--	# first see if it will tell us. cd to the root directory to prevent
--	# problems with other programs or directories called `ld' in the path.
--	# Set LC_ALL=C to ensure ld outputs messages in English.
--	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
--			 | sed -ne '/supported targets:/!d
--				    s/[ 	][ 	]*/ /g
--				    s/.*supported targets: *//
--				    s/ .*//
--				    p'`
--        case "$ld_supported_targets" in
--	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
--		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
--	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
--	esac
--	# Determine whether the default compiler is a.out or elf
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#ifdef __ELF__
--	# ifdef __GLIBC__
--	#  if __GLIBC__ >= 2
--	LIBC=gnu
--	#  else
--	LIBC=gnulibc1
--	#  endif
--	# else
--	LIBC=gnulibc1
--	# endif
--	#else
--	#ifdef __INTEL_COMPILER
--	LIBC=gnu
--	#else
--	LIBC=gnuaout
--	#endif
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c && rmdir $tmpdir
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
--	;;
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -931,7 +990,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -939,15 +1018,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -965,76 +1045,86 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
--    i*86:*DOS:*:*)
--	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
--    M68*:*:R3V[567]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-+	exit ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1042,64 +1132,94 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
--	echo `uname -p`-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    i386)
-+		eval $set_cc_for_build
-+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		      grep IS_64BIT_ARCH >/dev/null
-+		  then
-+		      UNAME_PROCESSOR="x86_64"
-+		  fi
-+		fi ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1107,22 +1227,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
--    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1133,36 +1256,50 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
--    i*86:OS/2:*:*)
--	# If we were able to find `uname', then EMX Unix compatibility
--	# is probably installed.
--	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
--    i*86:XTS-300:*:STOP)
--	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
--    i*86:atheos:*:*)
--	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1194,7 +1331,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1283,12 +1420,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--rm -f $dummy.c $dummy && rmdir $tmpdir
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1297,22 +1434,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
-@@ -1323,7 +1460,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--    ftp://ftp.gnu.org/pub/gnu/config/
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
---- misc/libtextcat-2.2/config.sub	2010-04-15 09:20:04.000000000 +0000
-+++ misc/build/libtextcat-2.2/config.sub	2010-04-15 09:20:41.000000000 +0000
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
- 
--timestamp='2002-09-05'
-+timestamp='2010-01-22'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,22 +22,26 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
- 
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -70,8 +75,9 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -83,11 +89,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +105,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -118,7 +124,10 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -144,10 +153,13 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis)
-+	-apple | -axis | -knuth | -cray | -microblaze)
- 		os=
- 		basic_machine=$1
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -169,6 +181,10 @@
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco5)
- 		os=-sco3.2v5
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -185,6 +201,10 @@
- 		# Don't forget version if it is 3.2v4 or newer.
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco*)
- 		os=-sco3.2v2
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -228,51 +248,71 @@
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
--	| clipper \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
-+	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fr30 | frv \
-+	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
--	| ip2k \
--	| m32r | m68000 | m68k | m88k | mcore \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
- 	| mipsisa64sb1 | mipsisa64sb1el \
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
-+	| msp430 \
-+	| nios | nios2 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| rx \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
--	| strongarm \
--	| tahoe | thumb | tic80 | tron \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| ubicom32 \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xstormy16 | xtensa \
--	| z8k)
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m6811 | m68hc11 | m6812 | m68hc12)
-+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
- 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
- 
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
-@@ -292,50 +332,69 @@
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
--	| bs2000-* \
--	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
--	| clipper-* | cydra-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
--	| ip2k-* \
--	| m32r-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
- 	| mipsisa64sb1-* | mipsisa64sb1el-* \
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
--	| mipstx39 | mipstx39el \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
-+	| msp430-* \
-+	| nios-* | nios2-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+	| romp-* | rs6000-* | rx-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
--	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tile-* | tilegx-* \
-+	| tron-* \
-+	| ubicom32-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--	| xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -353,6 +412,9 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -367,6 +429,12 @@
- 		basic_machine=a29k-none
- 		os=-bsd
- 		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
-@@ -390,6 +458,10 @@
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -398,10 +470,26 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -426,12 +514,27 @@
- 		basic_machine=j90-cray
- 		os=-unicos
- 		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
-@@ -454,6 +557,14 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -604,6 +715,14 @@
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -615,10 +734,17 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+        microblaze)
-+		basic_machine=microblaze-xilinx
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
- 		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -632,10 +758,6 @@
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
--	mmix*)
--		basic_machine=mmix-knuth
--		os=-mmixware
--		;;
- 	monitor)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -648,6 +770,9 @@
- 		basic_machine=i386-pc
- 		os=-msdos
- 		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -723,9 +848,12 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
- 		;;
- 	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
-@@ -743,6 +871,14 @@
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -752,24 +888,36 @@
- 	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
- 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
--	pentiumii | pentium2)
-+	pentiumii | pentium2 | pentiumiii | pentium3)
- 		basic_machine=i686-pc
- 		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
- 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumii-* | pentium2-*)
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
-@@ -802,6 +950,10 @@
- 		basic_machine=i586-unknown
- 		os=-pw32
- 		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -828,6 +980,14 @@
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -835,6 +995,12 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
- 	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
-@@ -901,10 +1067,6 @@
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
--	t3d)
--		basic_machine=alpha-cray
--		os=-unicos
--		;;
- 	t3e)
- 		basic_machine=alphaev5-cray
- 		os=-unicos
-@@ -913,14 +1075,27 @@
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
--        tic4x | c4x*)
--		basic_machine=tic4x-unknown
--		os=-coff
--		;;
- 	tic54x | c54x*)
- 		basic_machine=tic54x-unknown
- 		os=-coff
- 		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+        # This must be matched before tile*.
-+        tilegx*)
-+		basic_machine=tilegx-unknown
-+		os=-linux-gnu
-+		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -934,6 +1109,10 @@
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
- 	udi29k)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -977,9 +1156,9 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
--	windows32)
--		basic_machine=i386-pc
--		os=-windows32-msvcrt
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
- 		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
-@@ -992,6 +1171,10 @@
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1011,6 +1194,9 @@
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
-@@ -1027,13 +1213,10 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
--	sparc | sparcv9 | sparcv9b)
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1080,6 +1263,9 @@
-         # First match some system type aliases
-         # that might get confused with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
-+        -auroraux)
-+	        os=-auroraux
-+		;;
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
- 		;;
-@@ -1100,24 +1286,31 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
--	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* \
-+	      | -aos* | -aros* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -chorusos* | -chorusrdb* \
-+	      | -androideabi* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
--	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1129,16 +1321,21 @@
- 			;;
- 		esac
- 		;;
-+	-nto-qnx*)
-+		;;
- 	-nto*)
--		os=-nto-qnx
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
- 		os=`echo $os | sed -e 's|mac|macos|'`
- 		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -1151,6 +1348,9 @@
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
- 	-wince*)
- 		os=-wince
- 		;;
-@@ -1172,6 +1372,9 @@
- 	-atheos*)
- 		os=-atheos
- 		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
-@@ -1194,6 +1397,9 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
-@@ -1224,6 +1430,20 @@
- 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- 		os=-mint
- 		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+        -nacl*)
-+	        ;;
- 	-none)
- 		;;
- 	*)
-@@ -1246,6 +1466,12 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1255,6 +1481,9 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-@@ -1280,6 +1509,9 @@
- 	m68*-cisco)
- 		os=-aout
- 		;;
-+        mep-*)
-+		os=-elf
-+		;;
- 	mips*-cisco)
- 		os=-elf
- 		;;
-@@ -1298,9 +1530,15 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1403,7 +1641,7 @@
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
-@@ -1433,9 +1671,15 @@
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
- 			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
-@@ -1460,7 +1704,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/libtextcat/libtextcat-aix.patch b/libtextcat/libtextcat-aix.patch
deleted file mode 100644
index 26fb48c..0000000
--- a/libtextcat/libtextcat-aix.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- misc/libtextcat-2.2/config.guess	2010-09-10 03:09:48.000000000 -0500
-+++ misc/build/libtextcat-2.2/config.guess	2010-09-10 03:20:55.000000000 -0500
-@@ -548,7 +548,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -560,6 +560,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
---- misc/libtextcat-2.2/configure	2010-09-10 03:45:41.000000000 -0500
-+++ misc/build/libtextcat-2.2/configure	2010-09-10 03:48:35.000000000 -0500
-@@ -3371,7 +3371,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -4944,7 +4944,7 @@
-   else
-     # PORTME Check for PIC flags for the system compiler.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix*)
-       lt_cv_prog_cc_wl='-Wl,'
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
-@@ -5448,7 +5448,7 @@
- 
-   # See if GNU ld supports shared libraries.
-   case $host_os in
--  aix3* | aix4* | aix5*)
-+  aix[3-9]*)
-     # On AIX, the GNU linker is very broken
-     # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-     ld_shlibs=no
-@@ -5650,7 +5650,7 @@
-     fi
-     ;;
- 
--  aix4* | aix5*)
-+  aix[4-9]*)
-     if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-@@ -5663,7 +5663,7 @@
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
--      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	for ld_flag in $LDFLAGS; do
- 	  case $ld_flag in
- 	  *-brtl*)
-@@ -6157,7 +6157,7 @@
-   soname_spec='${libname}${release}.so$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -6563,7 +6563,7 @@
-   fi
-   ;;
- 
--aix4*)
-+aix[4-9]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
deleted file mode 100644
index d47c130..0000000
--- a/libtextcat/makefile.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=libtextcat
-TARGET=libtextcat
-
-.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
-all:
-        @echo "An already available installation of libtextcat should exist on your system."
-        @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=libtextcat-2.2
-TARFILE_MD5=128cfc86ed5953e57fe0f5ae98b62c2e
-TARFILE_ROOTDIR=libtextcat-2.2
-
-PATCH_FILES=\
-    libtextcat-2.2.patch \
-    libtextcat-aix.patch
-
-ADDITIONAL_FILES= \
-                src$/utf8misc.h \
-                src$/utf8misc.c \
-                src$/win32_config.h \
-                src$/makefile.mk \
-                src$/libtextcat.map
-
-.IF "$(GUI)"=="UNX"
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-.IF "$(OS)"=="AIX"
-CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
-.ENDIF
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS+= --disable-shared
-.ENDIF
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=make
-
-.IF "$(OS)"=="ANDROID"
-# The libtool in the libtextcat-2.2 tarball doesn't build
-# shared libraries on Android, for some reason.
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*.a
-.ELSE
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat*$(DLLPOST)
-.ENDIF
-
-.ENDIF # "$(GUI)"=="UNX"
-
-
-.IF "$(GUI)"=="WNT"
-BUILD_ACTION=cd src && dmake $(MAKEMACROS)
-.ENDIF # "$(GUI)"=="WNT"
-
-
-OUT2INC= \
-    $(BUILD_DIR)$/src$/config.h \
-    $(BUILD_DIR)$/src$/common.h \
-    $(BUILD_DIR)$/src$/fingerprint.h \
-    $(BUILD_DIR)$/src$/textcat.h \
-    $(BUILD_DIR)$/src$/wg_mempool.h
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst
deleted file mode 100644
index 8516375..0000000
--- a/libtextcat/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-ltc     libtextcat      :       soltools solenv NULL
-ltc     libtextcat              usr1    -       all ltc_mkout NULL
-ltc     libtextcat              nmake   -       all ltc_libtextcat NULL
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
deleted file mode 100644
index 9e060ae..0000000
--- a/libtextcat/prj/d.lst
+++ /dev/null
@@ -1,12 +0,0 @@
-
-..\%__SRC%\lib\lib*.*        %_DEST%\lib\lib*.*
-..\%__SRC%\lib\ilib*.*        %_DEST%\lib\ilib*.*
-..\%__SRC%\bin\l*.dll         %_DEST%\bin\*.dll
-
-mkdir: %_DEST%\inc\libtextcat
-..\%__SRC%\misc\build\libtextcat-2.2\src\*.h %_DEST%\inc\libtextcat\*.h
-
-# data for language guessing
-..\data\new_fingerprints\fpdb.conf %COMMON_DEST%\pck\fpdb.conf
-..\data\new_fingerprints\lm\*.lm   %COMMON_DEST%\pck\*.lm
-
diff --git a/libvisio/libvisio-0.0.3-uint8_t.patch b/libvisio/libvisio-0.0.3-uint8_t.patch
deleted file mode 100644
index e415268..0000000
--- a/libvisio/libvisio-0.0.3-uint8_t.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- misc/libvisio-0.0.3/src/lib/VSDXCollector.h	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXCollector.h	2011-07-25 12:18:22.334328001 +0200
-@@ -22,7 +22,6 @@
- #define VSDXCOLLECTOR_H
- 
- #include <vector>
--#include <stdint.h>
- #include "VSDXParser.h"
- 
- namespace libvisio {
-@@ -63,7 +62,7 @@
-   virtual void collectColours(const std::vector<Colour> &colours) = 0;
- 
-   virtual void collectCharList(unsigned id, unsigned level) = 0;
--  virtual void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format) = 0;
-+  virtual void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format) = 0;
-   virtual void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace) = 0;
- 
-   // Temporary hack
---- misc/libvisio-0.0.3/src/lib/VSDXContentCollector.cpp	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXContentCollector.cpp	2011-07-25 12:18:30.722328001 +0200
-@@ -987,7 +987,7 @@
-     m_colours.push_back(colours[i]);
- }
- 
--void libvisio::VSDXContentCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format)
-+void libvisio::VSDXContentCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format)
- {
-   _handleLevelChange(level);
- 
-@@ -1156,7 +1156,7 @@
-   if (fail)
-     throw GenericException();
- 
--  uint8_t first;
-+  unsigned char first;
-   int len;
-   if (ucs4Character < 0x80)
-   {
-@@ -1189,7 +1189,7 @@
-     len = 6;
-   }
- 
--  uint8_t outbuf[6] = { 0, 0, 0, 0, 0, 0};
-+  unsigned char outbuf[6] = { 0, 0, 0, 0, 0, 0};
-   int i;
-   for (i = len - 1; i > 0; --i)
-   {
---- misc/libvisio-0.0.3/src/lib/VSDXContentCollector.h	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXContentCollector.h	2011-07-25 12:18:13.810328000 +0200
-@@ -77,7 +77,7 @@
-   void collectColours(const std::vector<Colour> &colours);
- 
-   void collectCharList(unsigned id, unsigned level);
--  void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format);
-+  void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format);
-   void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace);
- 
-   void startPage();
-@@ -148,7 +148,7 @@
- 
-   std::map<unsigned, NURBSData> m_NURBSData;
-   std::map<unsigned, PolylineData> m_polylineData;
--  std::vector<uint8_t> m_textStream;
-+  std::vector<unsigned char> m_textStream;
-   TextFormat m_textFormat;
-   bool m_outputTextStart;
- };
---- misc/libvisio-0.0.3/src/lib/VSDXStylesCollector.cpp	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXStylesCollector.cpp	2011-07-25 12:18:26.586328031 +0200
-@@ -180,7 +180,7 @@
- {
- }
- 
--void libvisio::VSDXStylesCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<uint8_t> & /*textStream*/, TextFormat /*format*/)
-+void libvisio::VSDXStylesCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<unsigned char> & /*textStream*/, TextFormat /*format*/)
- {
-  _handleLevelChange(level);
- }
---- misc/libvisio-0.0.3/src/lib/VSDXStylesCollector.h	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXStylesCollector.h	2011-07-25 12:18:06.970328002 +0200
-@@ -68,7 +68,7 @@
-   void collectColours(const std::vector<Colour> &colours);
- 
-   void collectCharList(unsigned id, unsigned level);
--  void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format);
-+  void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format);
-   void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace);
-   // Temporary hack
-   void startPage();
diff --git a/libvisio/libvisio-0.0.3.patch b/libvisio/libvisio-0.0.3.patch
deleted file mode 100644
index 7da3ff3..0000000
--- a/libvisio/libvisio-0.0.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libvisio-0.0.3/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.3/src/lib/libvisio_utils.h
-@@ -31,17 +31,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
- 
- #endif
- 
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
deleted file mode 100644
index 9e185ef..0000000
--- a/libvisio/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=visio
-TARGET=visio
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBVISIO)" == "YES"
-@all:
-    @echo "Using system libvisio..."
-.ENDIF
-
-# libvisio depends on the libwpd and libwpg
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(LIBWPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-
-TARFILE_NAME=libvisio-0.0.3
-TARFILE_MD5=90882496f9ff4cd6d75d61dac2f62f66
-
-PATCH_FILES=\
-    libvisio-0.0.3.patch \
-    libvisio-0.0.3-uint8_t.patch
-
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst
deleted file mode 100644
index 7ce8628..0000000
--- a/libvisio/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-vsd	libvisio	: LIBWPD:libwpd LIBWPG:libwpg soltools NULL
-vsd	libvisio	usr1	-	all	vsd_mkout NULL
-vsd	libvisio	nmake	-	all	vsd_libvisio NULL
diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst
deleted file mode 100644
index f03b25b..0000000
--- a/libvisio/prj/d.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio
-..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpd/libwpd-0.9.2.patch b/libwpd/libwpd-0.9.2.patch
deleted file mode 100644
index 2fc7074..0000000
--- a/libwpd/libwpd-0.9.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
-+++ misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
-@@ -1229,7 +1229,11 @@
- 		tempString.sprintf("0.0000");
- 	else
- 		tempString.sprintf("%.4f", value);
-+#ifndef __ANDROID__
- 	std::string decimalPoint(localeconv()->decimal_point);
-+#else
-+	std::string decimalPoint(".");
-+#endif
- 	if ((decimalPoint.size() == 0) || (decimalPoint == "."))
- 		return tempString;
- 	std::string stringValue(tempString.cstr());
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
deleted file mode 100644
index 8761bbb..0000000
--- a/libwpd/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=wpd
-TARGET=wpd
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-@all:
-    @echo "Using system libwpd..."
-.ENDIF
-
-TARFILE_NAME=libwpd-0.9.2
-TARFILE_MD5=8d265a592619166f29c4672ea54812b7
-
-PATCH_FILES=$(TARFILE_NAME).patch
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-
diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst
deleted file mode 100644
index 1da425b..0000000
--- a/libwpd/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-lw	libwpd	: soltools NULL
-lw	libwpd	usr1	-	all	lw_mkout NULL
-lw	libwpd	nmake	-	all	lw_libwpd NULL
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
deleted file mode 100644
index f891f3b..0000000
--- a/libwpd/prj/d.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-mkdir: %_DEST%\inc\libwpd
-mkdir: %_DEST%\inc\libwpd-stream
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch
deleted file mode 100644
index 86567b1..0000000
--- a/libwpg/libwpg-0.2.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
-+++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
-@@ -30,7 +30,11 @@
- {
-   std::ostringstream tempStream;
-   tempStream << value;
-+#ifndef __ANDROID__
-   std::string decimalPoint(localeconv()->decimal_point);
-+#else
-+  std::string decimalPoint(".");
-+#endif
-   if ((decimalPoint.size() == 0) || (decimalPoint == "."))
-     return tempStream.str();
-   std::string stringValue(tempStream.str());
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
deleted file mode 100644
index 44eccce..0000000
--- a/libwpg/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=wpg
-TARGET=wpg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-@all:
-    @echo "Using system libwpg..."
-.ENDIF
-
-# libwpg depends on the libwpd framework
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-
-TARFILE_NAME=libwpg-0.2.0
-TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
-
-PATCH_FILES=$(TARFILE_NAME).patch
-
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
diff --git a/libwpg/prj/build.lst b/libwpg/prj/build.lst
deleted file mode 100644
index d54a1d9..0000000
--- a/libwpg/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-lwpg	libwpg	: LIBWPD:libwpd soltools NULL
-lwpg	libwpg	usr1	-	all	lwpg_mkout NULL
-lwpg	libwpg	nmake	-	all	lwpg_libwpg NULL
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
deleted file mode 100644
index a6a84a3..0000000
--- a/libwpg/prj/d.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\inc\libwpg
-..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwps/libwps-0.2.1-warnings.patch b/libwps/libwps-0.2.1-warnings.patch
deleted file mode 100644
index fffffd5..0000000
--- a/libwps/libwps-0.2.1-warnings.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- misc/libwps-0.2.1/src/lib/WPS8.cpp	2011-04-05 11:25:15.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/WPS8.cpp	2011-05-03 15:02:21.107349347 +0200
-@@ -136,7 +136,7 @@
- 	input->seek(pos->second.offset, WPX_SEEK_SET);
- 	n_streams = readU32(input);
- 
--	if (n_streams > 100) WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams));
-+	if (n_streams > 100) { WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); }
- 
- 	/* skip mysterious header*/
- 	input->seek(8, WPX_SEEK_CUR);
-@@ -155,7 +155,7 @@
- 		last_pos += offset;
- 	}
- 	offset = readU32(input);
--	if (offset) WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n"));
-+	if (offset) { WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); }
- 
- 	for (unsigned i=0; i < n_streams; i++) {
- 		uint16_t len;
-@@ -325,7 +325,7 @@
-  *
-  */
- 
--void WPS8Parser::readText(WPXInputStream * input, WPS8ContentListener *listener)
-+void WPS8Parser::readText(WPXInputStream * /* input */, WPS8ContentListener * /* listener */)
- {
- #if (0)
- 	WPS_DEBUG_MSG(("WPS8Parser::readText()\n"));
-@@ -1356,7 +1356,7 @@
- 							id += 4;
- 							t_rem -= 4;
- 
--							if (t_count < 0 && t_count > 20) break; /* obviously wrong */
-+							if (t_count > 20) break; /* obviously wrong */
- 						} else break; /* wrong format */
- 					}
- 
---- misc/libwps-0.2.1/src/lib/WPSContentListener.cpp	2011-04-04 21:56:29.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.cpp	2011-05-03 15:02:21.837414573 +0200
-@@ -621,7 +621,7 @@
- 		_closeParagraph();
- }
- 
--const uint16_t WPSContentListener::getSpec() const
-+uint16_t WPSContentListener::getSpec() const
- {
- 	return m_ps->m_spec;
- }
---- misc/libwps-0.2.1/src/lib/WPSContentListener.h	2011-04-04 21:30:56.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.h	2011-05-03 15:02:23.334548336 +0200
-@@ -154,7 +154,7 @@
- 
- 	void insertEOL();
- 
--	const uint16_t getSpec() const;
-+	uint16_t getSpec() const;
- protected:
- 	WPSContentListener(std::list<WPSPageSpan> &pageList, WPXDocumentInterface *documentInterface);
- 	virtual ~WPSContentListener();
diff --git a/libwps/libwps-0.2.1.patch b/libwps/libwps-0.2.1.patch
deleted file mode 100644
index a70812d..0000000
--- a/libwps/libwps-0.2.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/libwps-0.2.1/src/lib/libwps_internal.cpp	2011-04-04 21:53:42.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/libwps_internal.cpp	2011-05-03 14:50:56.146147538 +0200
-@@ -79,18 +79,15 @@
- 	{0x419,"ru-RU"}
- };
- 
--static int _ltcomp(const void *k1, const void *k2)
--{
--	int r = (int)((ssize_t)k1) - ((_lange*)k2)->id;
--	return r;
--}
--
- std::string getLangFromLCID(uint32_t lcid)
- {
--	_lange *c = (_lange*) bsearch((const void*)lcid,s_lang_table,
--		sizeof(s_lang_table)/sizeof(_lange),
--		sizeof(_lange),_ltcomp);
--	if (c) return c->name;
-+	unsigned i = 0;
-+	
-+	for (i=0; i < sizeof(s_lang_table)/sizeof(s_lang_table[0]); i++)
-+	{
-+		if (s_lang_table[i].id == lcid)
-+			return s_lang_table[i].name;
-+	}
- 	return "-none-";
- }
- 
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
deleted file mode 100644
index fe1792c..0000000
--- a/libwps/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=wps
-TARGET=wps
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-@all:
-    @echo "Using system libwps..."
-.ENDIF
-
-# libwps depends on the libwpd framework
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-
-TARFILE_NAME=libwps-0.2.2
-TARFILE_MD5=29721a16f25967d59969d5f0ae485b4a
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
diff --git a/libwps/prj/build.lst b/libwps/prj/build.lst
deleted file mode 100644
index 85004e1..0000000
--- a/libwps/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-lwps	libwps	: LIBWPD:libwpd soltools NULL
-lwps	libwps	usr1	-	all	lwps_mkout NULL
-lwps	libwps	nmake	-	all	lwps_libwps NULL
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
deleted file mode 100644
index 3923a18..0000000
--- a/libwps/prj/d.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\libwps
-..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc\libwps\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
deleted file mode 100644
index 58fc9b9..0000000
--- a/libxmlsec/makefile.mk
+++ /dev/null
@@ -1,191 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=xmlsec1
-TARGET=so_xmlsec1
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(WITH_MOZILLA)" == "NO"
-@all:
-    @echo "Mozilla disabled -> no nss -> no libxmlsec...."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-XMLSEC1VERSION=1.2.14
-
-TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
-TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
-
-#xmlsec1-configure.patch: Set up the build. Straightforward configuration
-#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
-#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
-#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
-#xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
-#xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ?
-#xmlsec1-noverify.patch: As per readme.txt. 
-#xmlsec1-mingw32.patch: Mingw32 support. 
-#xmlsec1-mingw-customkeymanage-addmscrypto.patch: builds the custom keymanager on mingw
-#xmlsec1-vc.path: support for Visual C++ 10
-PATCH_FILES=\
-   xmlsec1-configure.patch \
-   xmlsec1-configure-libxml-libxslt.patch \
-   xmlsec1-olderlibxml2.patch \
-   xmlsec1-nssdisablecallbacks.patch \
-   xmlsec1-customkeymanage.patch \
-   xmlsec1-nssmangleciphers.patch \
-   xmlsec1-noverify.patch \
-   xmlsec1-mingw32.patch \
-   xmlsec1-mingw-keymgr-mscrypto.patch \
-   xmlsec1-vc10.patch \
-   xmlsec1-1.2.14_fix_extern_c.patch
-
-ADDITIONAL_FILES= \
-    include$/xmlsec$/mscrypto$/akmngr.h \
-    src$/mscrypto$/akmngr.c \
-    include$/xmlsec$/nss$/akmngr.h \
-    include$/xmlsec$/nss$/ciphers.h \
-    include$/xmlsec$/nss$/tokens.h \
-    src$/nss$/akmngr.c \
-    src$/nss$/keywrapers.c \
-    src$/nss$/tokens.c
-
-.IF "$(GUI)"=="WNT"
-CRYPTOLIB=mscrypto
-.ELSE
-CRYPTOLIB=nss
-.ENDIF
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-xmlsec_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-xmlsec_CC+=-shared-libgcc
-.ENDIF
-xmlsec_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
-
-.IF "$(SYSTEM_MOZILLA)" != "YES"
-CONFIGURE_FLAGS+=--enable-pkgconfig=no
-.ENDIF
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ELSE
-CONFIGURE_DIR=win32
-CONFIGURE_ACTION=cscript configure.js
-.IF "$(product)"!="full" && "$(CCNUMVER)" >= "001399999999"
-CONFIGURE_FLAGS=crypto=$(CRYPTOLIB) debug=yes xslt=no iconv=no static=no include=$(BASEINC) lib=$(BASELIB)
-.ELSE
-CONFIGURE_FLAGS=crypto=$(CRYPTOLIB) xslt=no iconv=no static=no include=$(BASEINC) lib=$(BASELIB)
-.ENDIF
-BUILD_ACTION=nmake
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-.ELSE
-.IF "$(GUI)"=="UNX"
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-xmlsec_CFLAGS+=-m64
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-xmlsec_CFLAGS+=-I$(SYSBASE)$/usr$/include 
-.IF "$(COMNAME)"=="sunpro5"
-xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS)
-.ENDIF			# "$(COMNAME)"=="sunpro5"
-.IF "$(EXTRA_CFLAGS)"!=""
-xmlsec_CFLAGS+=$(EXTRA_CFLAGS)
-xmlsec_CPPFLAGS+=$(EXTRA_CFLAGS)
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
-.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
-xmlsec_CPPFLAGS+=$(EXTRA_CDEFS)
-.ENDIF
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF			# "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF			# "$(OS)$(COM)"=="SOLARISC52"
-
-LDFLAGS:=$(xmlsec_LDFLAGS)
-.EXPORT: LDFLAGS
-
-.ENDIF
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
-# system-mozilla needs pkgconfig to get the information about nss
-# FIXME: This also will enable pkg-config usage for libxml2. It *seems*
-# that the internal headers still are used when they are there but....
-# (and that pkg-config is allowed to fail...)
-# I have no real good idea how to get mozilla (nss) pkg-config'ed and libxml2
-# not... We need mozilla-nss pkg-config'ed since we can *not* just use
-# --with-nss or parse -pkg-config --libs / cflags mozilla-nss since
-# the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include
-# $with_nss/lib.
-.IF "$(SYSTEM_MOZILLA)" != "YES"
-CONFIGURE_FLAGS+=--enable-pkgconfig=no
-.ENDIF
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-OUTDIR2INC=include$/xmlsec 
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=src$/.libs$/libxmlsec1.dll.a src$/nss$/.libs$/libxmlsec1-nss.dll.a src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll.a
-OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll
-.ELSE
-OUT2LIB+=win32$/binaries$/*.lib
-OUT2BIN+=win32$/binaries$/*.dll
-.ENDIF
-.ELSE
-OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
deleted file mode 100644
index a52eb09..0000000
--- a/libxmlsec/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-ls  libxmlsec   : soltools LIBXML2:libxml2 MOZ:moz NULL
-ls	libxmlsec			    usr1	-	all	ls_mkout NULL
-ls	libxmlsec			    nmake	-	all	ls_xmlsec1 NULL
diff --git a/libxmlsec/prj/d.lst b/libxmlsec/prj/d.lst
deleted file mode 100644
index 21896b5..0000000
--- a/libxmlsec/prj/d.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-mkdir: %_DEST%\inc\external\xmlsec
-mkdir: %_DEST%\inc\external\xmlsec\nss
-mkdir: %_DEST%\inc\external\xmlsec\mscrypto
-..\%__SRC%\inc\xmlsec\*.h %_DEST%\inc\external\xmlsec\*.h
-..\%__SRC%\inc\xmlsec\nss\*.h %_DEST%\inc\external\xmlsec\nss\*.h
-..\%__SRC%\inc\xmlsec\mscrypto\*.h %_DEST%\inc\external\xmlsec\mscrypto\*.h
-..\%__SRC%\lib\lib*.a %_DEST%\lib
-..\%__SRC%\lib\*.lib %_DEST%\lib
-..\%__SRC%\bin\*.dll %_DEST%\bin
diff --git a/libxmlsec/readme.txt b/libxmlsec/readme.txt
deleted file mode 100644
index 55c6976..0000000
--- a/libxmlsec/readme.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-The XML Security library has been modified, so that there is NO verification of
-the certificate during sign or verification operation. On Windows this was done
-in the function xmlSecMSCryptoX509StoreVerify (file src/mscrypto/x509vfy.c) and
-on UNIX in xmlSecNssX509StoreVerify (file src/nss/x509vfy.c).
-
-The implementation creates certificates from all of the X509Data children, such
-as X509IssuerSerial and X509Certificate and stores them in a certificate store
-(see xmlsec/src/mscrypto/x509.c:xmlSecMSCryptoX509DataNodeRead). It must then
-find the certificate containing the public key which is used for validation
-within that store. This is done in xmlSecMSCryptoX509StoreVerify. This function
-however only takes those certificates into account which can be validated. This
-was changed by the patch xmlsec1-noverify.patch, which prevents this certificate
-validation.
-
-xmlSecMSCryptoX509StoreVerify iterates over all certificates contained or
-referenced in the X509Data elements and selects one which is no issuer of any of
-the other certificates. This certificate is not necessarily the one which was
-used for signing but it must contain the proper validation key, which is
-sufficient to validate the signature. See 
-http://www.w3.org/TR/xmldsig-core/#sec-X509Data 
-for details.
-
-There is a flag XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS that can be set
-in a xmlSecKeyInfoCtx (see function xmlSecNssKeyDataX509XmlRead, in file
-src/nss/x509.c), which indicates that one can turn off the validation. However,
-setting it will cause that the validation key is not found. If the flag is set,
-then the key is not extracted from the certificate store which contains all the
-certificates of the X509Data elements. In other words, the certificates which
-are delivered within the XML signature are not used when looking for suitable
-validation key.
-
-
diff --git a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch b/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
deleted file mode 100644
index f5bbf5e..0000000
--- a/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL	2009-12-05 15:19:18.000000000 -0600
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h	2011-02-13 03:09:42.917240245 -0600
-@@ -11,16 +11,16 @@
- #ifndef __XMLSEC_H__
- #define __XMLSEC_H__    
- 
--#ifdef __cplusplus
--extern "C" {
--#endif /* __cplusplus */ 
--
- #include <libxml/tree.h>
- 
- #include <xmlsec/version.h>
- #include <xmlsec/exports.h>
- #include <xmlsec/strings.h>
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */ 
-+
- /***********************************************************************
-  *
-  * Basic types to make ports to exotic platforms easier
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
deleted file mode 100644
index fdf39ad..0000000
--- a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- misc/xmlsec1-1.2.14/configure	Wed Jun 30 11:55:36 2010
-+++ misc/build/xmlsec1-1.2.14/configure	Wed Jun 30 11:57:28 2010
-@@ -12077,7 +12077,7 @@
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$with_libxml/bin:$PATH"
-+as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
- for as_dir in $as_dummy
- do
-   IFS=$as_save_IFS
-@@ -12258,7 +12258,7 @@
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--as_dummy="$with_libxslt/bin:$PATH"
-+as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
- for as_dir in $as_dummy
- do
-   IFS=$as_save_IFS
---- misc/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:55:37 2010
-+++ misc/build/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:53:55 2010
-@@ -231,7 +231,7 @@
- if test "z$LIBXML_FOUND" = "zno" ; then
-     if test "z$with_libxml" != "zyes" ; then
- 	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
--		     [$with_libxml/bin:$PATH])
-+		     [$with_libxml${with_libxml:+/bin:}$PATH])
-     fi
-     AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
-     if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
-@@ -296,7 +296,7 @@
- if test "z$LIBXSLT_FOUND" = "zno" ; then
-     if test "z$with_libxslt" != "zyes" ; then
- 	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
--		     [$with_libxslt/bin:$PATH])
-+		     [$with_libxslt${with_libxslt:+/bin:}:$PATH])
-     fi
-     AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
-     if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
deleted file mode 100644
index f2f5f4e..0000000
--- a/libxmlsec/xmlsec1-configure.patch
+++ /dev/null
@@ -1,765 +0,0 @@
---- misc/xmlsec1-1.2.14/Makefile.in	2009-06-25 22:53:34.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/Makefile.in	2009-10-01 10:32:48.708515261 +0200
-@@ -341,8 +341,9 @@
- top_srcdir = @top_srcdir@
- NULL = 
- SAFE_VERSION = @XMLSEC_VERSION_SAFE@
--SUBDIRS = include src apps man docs
--TEST_APP = apps/xmlsec1$(EXEEXT)
-+#Do not build xmlsec1 app. It is not needed. Also the libtool includes 
-+#a -L/path_to_lib_dir which may contain an incompatible lixbml2.
-+SUBDIRS = include src man docs
- DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
- bin_SCRIPTS = xmlsec1-config
- pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
---- misc/xmlsec1-1.2.14/configure	2009-06-25 22:53:35.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/configure	2009-10-01 10:28:50.980389049 +0200
-@@ -1,12 +1,14 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for xmlsec1 1.2.14.
-+# Generated by GNU Autoconf 2.65 for xmlsec1 1.2.14.
- #
- # Report bugs to <http://www.aleksey.com/xmlsec>.
- #
-+#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -676,7 +678,8 @@
- 
- 
- 
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -1749,7 +1752,7 @@
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-   LIBS        libraries to pass to the linker, e.g. -l<library>
--  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-   PKG_CONFIG  path to pkg-config utility
-@@ -1837,7 +1840,7 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- xmlsec1 configure 1.2.14
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1884,7 +1887,7 @@
- 	ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
- 
-@@ -1921,7 +1924,7 @@
-     ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_cpp
- 
-@@ -1963,7 +1966,7 @@
- fi
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_run
- 
-@@ -2009,7 +2012,7 @@
-   # left behind by Apple's compiler.  We do this before executing the actions.
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_link
- 
-@@ -2378,7 +2381,7 @@
- 
-   fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_compute_int
- cat >config.log <<_ACEOF
-@@ -2386,7 +2389,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by xmlsec1 $as_me 1.2.14, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2639,7 +2642,7 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-   test "x$ac_site_file" = xNONE && continue
--  if test -r "$ac_site_file"; then
-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-@@ -2648,9 +2651,9 @@
- done
- 
- if test -r "$cache_file"; then
--  # Some versions of bash will fail to source /dev/null (special
--  # files actually), so we avoid doing that.
--  if test -f "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special files
-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-@@ -3160,6 +3163,7 @@
- 
- fi
- 
-+  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -3167,7 +3171,6 @@
-     # value for MKDIR_P within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
--    test -d ./--version && rmdir ./--version
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
-@@ -3753,32 +3756,30 @@
- ... rest of stderr output deleted ...
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
--    rm -f conftest.er1 conftest.err
-   fi
-+  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
- 
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -3840,10 +3841,10 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -3851,51 +3852,18 @@
- { as_fn_set_status 77
- as_fn_error "C compiler cannot create executables
- See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3928,13 +3896,72 @@
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then :
-@@ -5249,13 +5276,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:5252: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:5279: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5255: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:5282: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5258: output\"" >&5)
-+  (eval echo "\"\$as_me:5285: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -6460,7 +6487,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6463 "configure"' > conftest.$ac_ext
-+  echo '#line 6490 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7736,11 +7763,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7739: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7766: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7743: \$? = $ac_status" >&5
-+   echo "$as_me:7770: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8075,11 +8102,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8078: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8105: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8082: \$? = $ac_status" >&5
-+   echo "$as_me:8109: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8180,11 +8207,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8183: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8210: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8187: \$? = $ac_status" >&5
-+   echo "$as_me:8214: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8235,11 +8262,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8238: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8265: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8242: \$? = $ac_status" >&5
-+   echo "$as_me:8269: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10618,7 +10645,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10621 "configure"
-+#line 10648 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10714,7 +10741,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10717 "configure"
-+#line 10744 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11804,8 +11831,12 @@
-     fi
- fi
- 
--LIBXML_MIN_VERSION="2.7.4"
- LIBXML_CONFIG="xml2-config"
-+if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then
-+  LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config"
-+else
-+  LIBXML_CONFIG="xml2-config"
-+fi
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
-@@ -12757,12 +12788,26 @@
- 
- XMLSEC_NO_NSS="1"
- MOZILLA_MIN_VERSION="1.4"
-+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
-+    MOZILLA_MIN_VERSION="1.0"
-+fi
- NSS_MIN_VERSION="3.2"
- NSPR_MIN_VERSION="4.0"
- NSS_CFLAGS=""
- NSS_LIBS=""
--NSS_LIBS_LIST="-lnss3 -lsmime3"
--NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  NSS_LIBS_LIST="-lnss3 -lsmime3"
-+  NSPR_LIBS_LIST="-lnspr4"
-+  ;;
-+
-+*)
-+  NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3"
-+  NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-+  ;;
-+esac
-+
- NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
- NSS_FOUND="no"
- NSPR_PACKAGE=mozilla-nspr
-@@ -12811,6 +12856,79 @@
-         pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$NSS_LIBS"; then
-+        pkg_cv_NSS_LIBS="$NSS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"`
-+        else
-+	        NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$NSS_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+                NSS_FOUND=no
-+elif test $pkg_failed = untried; then
-+	NSS_FOUND=no
-+else
-+	NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
-+	NSS_LIBS=$pkg_cv_NSS_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss
-+fi
-+    fi
-+    if test "z$NSS_FOUND" = "zno" ; then
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5
-+$as_echo_n "checking for NSS... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$NSS_CFLAGS"; then
-+        pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5
-   ac_status=$?
-@@ -13030,8 +13148,8 @@
-         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
-     fi
- 
--    ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
--    ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name"
-+    ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}"
-+    ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla"
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5
- $as_echo_n "checking for nspr libraries >= $NSPR_MIN_VERSION... " >&6; }
-@@ -13066,7 +13184,7 @@
- 	done
- 
- 	for dir in $ac_nss_lib_dir ; do
--    	    if test -f $dir/libnspr4$shrext ; then
-+	    if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
- 		        	if test "z$dir" = "z/usr/lib" ; then
-             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-     		else
-@@ -13148,7 +13266,7 @@
-         done
- 
-         for dir in $ac_nss_lib_dir ; do
--    	    if test -f $dir/libnss3$shrext ; then
-+            if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
-         	    		if test "z$dir" = "z/usr/lib" ; then
-         	    NSS_LIBS="$NSS_LIBS_LIST"
-                 else
-@@ -13166,7 +13284,7 @@
- 
-     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
-        OLD_CPPFLAGS=$CPPFLAGS
--       CPPFLAGS="$NSS_CFLAGS"
-+       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -15036,7 +15154,7 @@
- # values after options handling.
- ac_log="
- This file was extended by xmlsec1 $as_me 1.2.14, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -15076,6 +15194,7 @@
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-   -q, --quiet, --silent
-                    do not print progress messages
-   -d, --debug      don't remove temporary files
-@@ -15098,10 +15217,11 @@
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- xmlsec1 config.status 1.2.14
--configured by $0, generated by GNU Autoconf 2.64,
--  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
-+  with options \\"\$ac_cs_config\\"
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -15139,6 +15259,8 @@
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-@@ -15606,7 +15728,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -15620,7 +15742,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
---- misc/xmlsec1-1.2.14/configure.in	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/configure.in	2009-10-01 10:28:50.990755126 +0200
-@@ -190,8 +190,12 @@
- dnl ==========================================================================
- dnl find libxml
- dnl ==========================================================================
--LIBXML_MIN_VERSION="2.7.4"
- LIBXML_CONFIG="xml2-config"
-+if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then 
-+  LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config"
-+else
-+  LIBXML_CONFIG="xml2-config"
-+fi
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
-@@ -555,12 +559,26 @@
-     
- XMLSEC_NO_NSS="1"
- MOZILLA_MIN_VERSION="1.4"
-+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
-+    MOZILLA_MIN_VERSION="1.0"
-+fi
- NSS_MIN_VERSION="3.2"
- NSPR_MIN_VERSION="4.0"
- NSS_CFLAGS=""
- NSS_LIBS=""
--NSS_LIBS_LIST="-lnss3 -lsmime3"
--NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-+ 
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  NSS_LIBS_LIST="-lnss3 -lsmime3"
-+  NSPR_LIBS_LIST="-lnspr4"
-+  ;;
-+
-+*)
-+  NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3"
-+  NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
-+  ;;
-+esac
-+
- NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
- NSS_FOUND="no"
- NSPR_PACKAGE=mozilla-nspr
-@@ -586,6 +604,11 @@
-     dnl We are going to try all options
-     dnl
-     if test "z$NSS_FOUND" = "zno" ; then
-+        PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION,
-+    	    [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss],
-+	    [NSS_FOUND=no])
-+    fi
-+    if test "z$NSS_FOUND" = "zno" ; then
-         PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
-     	    [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss],
- 	    [NSS_FOUND=no])
-@@ -612,8 +635,8 @@
-         ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
-     fi
- 
--    ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
--    ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name"
-+    ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}"
-+    ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla"
- 
-     AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
-     NSPR_INCLUDES_FOUND="no"
-@@ -648,7 +671,7 @@
- 	done
- 	
- 	for dir in $ac_nss_lib_dir ; do
--    	    if test -f $dir/libnspr4$shrext ; then
-+	    if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
- 		dnl do not add -L/usr/lib because compiler does it anyway
-         	if test "z$dir" = "z/usr/lib" ; then
-             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -719,7 +742,7 @@
-         done
-        
-         for dir in $ac_nss_lib_dir ; do
--    	    if test -f $dir/libnss3$shrext ; then
-+            if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
-         	dnl do not add -L/usr/lib because compiler does it anyway
-     		if test "z$dir" = "z/usr/lib" ; then
-         	    NSS_LIBS="$NSS_LIBS_LIST"
-@@ -738,7 +761,7 @@
- 
-     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
-        OLD_CPPFLAGS=$CPPFLAGS
--       CPPFLAGS="$NSS_CFLAGS"
-+       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
-        AC_EGREP_CPP(yes,[
-           #include <nss.h>
-           #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
---- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-10-01 10:28:50.997747312 +0200
-@@ -376,7 +376,7 @@
- XMLSEC_OPENSSL_SOLIBS   = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
- XMLSEC_OPENSSL_ALIBS    = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
- 
--XMLSEC_NSS_SOLIBS   	= smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
-+XMLSEC_NSS_SOLIBS   	= smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
- XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
- 
- XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
diff --git a/libxmlsec/xmlsec1-customkeymanage.patch b/libxmlsec/xmlsec1-customkeymanage.patch
deleted file mode 100644
index 8bc97c4..0000000
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ /dev/null
@@ -1,6065 +0,0 @@
---- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.am	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.am	2009-09-21 14:02:48.563253008 +0200
-@@ -3,6 +3,7 @@
- xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
- 
- xmlsecmscryptoinc_HEADERS = \
-+akmngr.h \
- app.h \
- certkeys.h \
- crypto.h \
---- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.in	2009-06-25 22:53:30.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.in	2009-09-21 14:02:48.571021349 +0200
-@@ -281,6 +281,7 @@
- NULL = 
- xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto
- xmlsecmscryptoinc_HEADERS = \
-+akmngr.h \
- app.h \
- certkeys.h \
- crypto.h \
---- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/akmngr.h	2009-09-21 14:07:19.052318336 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/akmngr.h	2009-09-21 14:02:48.504966762 +0200
-@@ -1 +1,71 @@
--dummy
-+/** 
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright ..........................
-+ */
-+#ifndef __XMLSEC_MSCRYPTO_AKMNGR_H__
-+#define __XMLSEC_MSCRYPTO_AKMNGR_H__    
-+
-+#include <windows.h>
-+#include <wincrypt.h>
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/keys.h>
-+#include <xmlsec/transforms.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */ 
-+
-+XMLSEC_CRYPTO_EXPORT xmlSecKeysMngrPtr
-+xmlSecMSCryptoAppliedKeysMngrCreate(
-+    HCERTSTORE keyStore ,
-+    HCERTSTORE certStore
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrSymKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCRYPTKEY	symKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrPubKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCRYPTKEY	pubKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrPriKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCRYPTKEY	priKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCERTSTORE keyStore
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore (
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCERTSTORE trustedStore
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore (
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCERTSTORE untrustedStore
-+) ;
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */
-+
-+
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.am	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.am	2009-09-21 14:02:48.577933031 +0200
-@@ -10,6 +10,9 @@
- keysstore.h \
- pkikeys.h \
- x509.h \
-+akmngr.h \
-+tokens.h \
-+ciphers.h \
- $(NULL)
- 
- install-exec-hook:
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.in	2009-06-25 22:53:31.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.in	2009-09-21 14:02:48.585376325 +0200
-@@ -288,6 +288,9 @@
- keysstore.h \
- pkikeys.h \
- x509.h \
-+akmngr.h \
-+tokens.h \
-+ciphers.h \
- $(NULL)
- 
- all: all-am
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/akmngr.h	2009-09-21 14:07:19.105517659 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/akmngr.h	2009-09-21 14:02:48.510978278 +0200
-@@ -1 +1,56 @@
--dummy
-+/** 
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright ..........................
-+ */
-+#ifndef __XMLSEC_NSS_AKMNGR_H__
-+#define __XMLSEC_NSS_AKMNGR_H__    
-+
-+#include <nss.h>
-+#include <nspr.h>
-+#include <pk11func.h>
-+#include <cert.h>
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/keys.h>
-+#include <xmlsec/transforms.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */ 
-+
-+XMLSEC_CRYPTO_EXPORT xmlSecKeysMngrPtr
-+xmlSecNssAppliedKeysMngrCreate(
-+    PK11SlotInfo** slots,
-+	int cSlots,
-+    CERTCertDBHandle* handler
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssAppliedKeysMngrSymKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	PK11SymKey*			symKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssAppliedKeysMngrPubKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	SECKEYPublicKey*	pubKey
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssAppliedKeysMngrPriKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	SECKEYPrivateKey*	priKey
-+) ;
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif /* __XMLSEC_NSS_AKMNGR_H__ */
-+
-+
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/app.h	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/app.h	2009-09-21 14:02:48.612847068 +0200
-@@ -22,6 +22,9 @@
- #include <xmlsec/keysmngr.h>
- #include <xmlsec/transforms.h>
- 
-+#include <xmlsec/nss/tokens.h>
-+#include <xmlsec/nss/akmngr.h>
-+
- /**
-  * Init/shutdown
-  */
-@@ -36,6 +39,8 @@
- 									    xmlSecKeyPtr key);
- XMLSEC_CRYPTO_EXPORT int 		xmlSecNssAppDefaultKeysMngrLoad	(xmlSecKeysMngrPtr mngr,
- 									 const char* uri);
-+XMLSEC_CRYPTO_EXPORT int		xmlSecNssAppDefaultKeysMngrAdoptKeySlot(xmlSecKeysMngrPtr mngr,
-+									 xmlSecNssKeySlotPtr keySlot);
- XMLSEC_CRYPTO_EXPORT int 		xmlSecNssAppDefaultKeysMngrSave	(xmlSecKeysMngrPtr mngr,
- 									 const char* filename,
- 									 xmlSecKeyDataType type);
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/ciphers.h	2009-09-21 14:07:19.146496548 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/ciphers.h	2009-09-21 14:02:48.516689712 +0200
-@@ -1 +1,35 @@
--dummy
-+/** 
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright ..........................
-+ */
-+#ifndef __XMLSEC_NSS_CIPHERS_H__
-+#define __XMLSEC_NSS_CIPHERS_H__    
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */ 
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/keys.h>
-+#include <xmlsec/transforms.h>
-+
-+
-+XMLSEC_CRYPTO_EXPORT int xmlSecNssSymKeyDataAdoptKey( xmlSecKeyDataPtr data,
-+									PK11SymKey* symkey ) ;
-+
-+XMLSEC_CRYPTO_EXPORT xmlSecKeyDataPtr xmlSecNssSymKeyDataKeyAdopt( PK11SymKey* symKey ) ;
-+
-+XMLSEC_CRYPTO_EXPORT PK11SymKey*   xmlSecNssSymKeyDataGetKey(xmlSecKeyDataPtr data);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif /* __XMLSEC_NSS_CIPHERS_H__ */
-+
-+
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/keysstore.h	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/keysstore.h	2009-09-21 14:02:48.626261748 +0200
-@@ -16,6 +16,8 @@
- #endif /* __cplusplus */ 
- 
- #include <xmlsec/xmlsec.h>
-+#include <xmlsec/keysmngr.h>
-+#include <xmlsec/nss/tokens.h>
- 
- /****************************************************************************
-  *
-@@ -31,6 +33,8 @@
- XMLSEC_CRYPTO_EXPORT xmlSecKeyStoreId	xmlSecNssKeysStoreGetKlass	(void);
- XMLSEC_CRYPTO_EXPORT int		xmlSecNssKeysStoreAdoptKey	(xmlSecKeyStorePtr store,
- 									 xmlSecKeyPtr key);
-+XMLSEC_CRYPTO_EXPORT int		xmlSecNssKeysStoreAdoptKeySlot(xmlSecKeyStorePtr store,
-+									 xmlSecNssKeySlotPtr keySlot);
- XMLSEC_CRYPTO_EXPORT int		xmlSecNssKeysStoreLoad 	(xmlSecKeyStorePtr store,
- 								 const char *uri,
- 								 xmlSecKeysMngrPtr keysMngr);
---- misc/xmlsec1-1.2.14/include/xmlsec/nss/tokens.h	2009-09-21 14:07:19.172421448 +0200
-+++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/tokens.h	2009-09-21 14:02:48.522913605 +0200
-@@ -1 +1,182 @@
--dummy
-+/**
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright (c) 2003 Sun Microsystems, Inc.  All rights reserved.
-+ * 
-+ * Contributor(s): _____________________________
-+ * 
-+ */
-+#ifndef __XMLSEC_NSS_TOKENS_H__
-+#define __XMLSEC_NSS_TOKENS_H__
-+
-+#include <string.h>
-+
-+#include <nss.h>
-+#include <pk11func.h>
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/list.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */ 
-+
-+/**
-+ * xmlSecNssKeySlotListId
-+ *
-+ * The crypto mechanism list klass
-+ */
-+#define xmlSecNssKeySlotListId xmlSecNssKeySlotListGetKlass()
-+XMLSEC_CRYPTO_EXPORT xmlSecPtrListId xmlSecNssKeySlotListGetKlass( void ) ;
-+
-+/*******************************************
-+ * KeySlot interfaces
-+ *******************************************/ 
-+/**
-+ * Internal NSS key slot data
-+ * @mechanismList:		the mechanisms that the slot bound with.
-+ * @slot:				the pkcs slot
-+ *
-+ * This context is located after xmlSecPtrList
-+ */
-+typedef struct _xmlSecNssKeySlot	xmlSecNssKeySlot ;
-+typedef struct _xmlSecNssKeySlot*	xmlSecNssKeySlotPtr ;
-+
-+struct _xmlSecNssKeySlot {
-+	CK_MECHANISM_TYPE_PTR	mechanismList ; /* mech. array, NULL ternimated */
-+	PK11SlotInfo*			slot ;
-+} ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotSetMechList(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE_PTR mechanismList
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotEnableMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE mechanism
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotDisableMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE mechanism
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT CK_MECHANISM_TYPE_PTR
-+xmlSecNssKeySlotGetMechList(
-+    xmlSecNssKeySlotPtr keySlot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotSetSlot(
-+    xmlSecNssKeySlotPtr keySlot ,
-+	PK11SlotInfo* slot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotInitialize(
-+    xmlSecNssKeySlotPtr keySlot ,
-+	PK11SlotInfo* slot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT void
-+xmlSecNssKeySlotFinalize(
-+    xmlSecNssKeySlotPtr keySlot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT PK11SlotInfo*
-+xmlSecNssKeySlotGetSlot(
-+	xmlSecNssKeySlotPtr keySlot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT xmlSecNssKeySlotPtr
-+xmlSecNssKeySlotCreate() ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotCopy(
-+	xmlSecNssKeySlotPtr newKeySlot ,
-+	xmlSecNssKeySlotPtr keySlot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT xmlSecNssKeySlotPtr
-+xmlSecNssKeySlotDuplicate(
-+	xmlSecNssKeySlotPtr keySlot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT void
-+xmlSecNssKeySlotDestroy(
-+	    xmlSecNssKeySlotPtr keySlot
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotBindMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE type
-+) ;
-+
-+XMLSEC_CRYPTO_EXPORT int
-+xmlSecNssKeySlotSupportMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE type
-+) ;
-+
-+
-+/************************************************************************
-+ * PKCS#11 crypto token interfaces
-+ *
-+ * A PKCS#11 slot repository will be defined internally. From the
-+ * repository, a user can specify a particular slot for a certain crypto
-+ * mechanism.
-+ *
-+ * In some situation, some cryptographic operation should act in a user
-+ * designated devices. The interfaces defined here provide the way. If 
-+ * the user do not initialize the repository distinctly, the interfaces
-+ * use the default functions provided by NSS itself.
-+ *
-+ ************************************************************************/
-+/**
-+ * Initialize NSS pkcs#11 slot repository
-+ *
-+ * Returns 0 if success or -1 if an error occurs.
-+ */
-+XMLSEC_CRYPTO_EXPORT int xmlSecNssSlotInitialize( void ) ;
-+
-+/**
-+ * Shutdown and destroy NSS pkcs#11 slot repository
-+ */
-+XMLSEC_CRYPTO_EXPORT void xmlSecNssSlotShutdown() ;
-+
-+/**
-+ * Get PKCS#11 slot handler
-+ * @type	the mechanism that the slot must support.
-+ *
-+ * Returns a pointer to PKCS#11 slot or NULL if an error occurs.
-+ *
-+ * Notes: The returned handler must be destroied distinctly.
-+ */
-+XMLSEC_CRYPTO_EXPORT PK11SlotInfo* xmlSecNssSlotGet( CK_MECHANISM_TYPE type ) ;
-+
-+/**
-+ * Adopt a pkcs#11 slot with a mechanism into the repository
-+ * @slot:	the pkcs#11 slot.
-+ * @mech:	the mechanism.
-+ *
-+ * If @mech is available( @mech != CKM_INVALID_MECHANISM ), every operation with
-+ * this mechanism only can perform on the @slot.
-+ * 
-+ * Returns 0 if success or -1 if an error occurs.
-+ */
-+XMLSEC_CRYPTO_EXPORT int xmlSecNssSlotAdopt( PK11SlotInfo* slot, CK_MECHANISM_TYPE mech ) ;
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif	/* __XMLSEC_NSS_TOKENS_H__ */
-+
---- misc/xmlsec1-1.2.14/src/mscrypto/akmngr.c	2009-09-21 14:07:19.078910929 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/akmngr.c	2009-09-21 14:02:48.531281225 +0200
-@@ -1 +1,236 @@
--dummy
-+/** 
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright.........................
-+ */
-+#include "globals.h"
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/keys.h>
-+#include <xmlsec/keysmngr.h>
-+#include <xmlsec/transforms.h>
-+#include <xmlsec/errors.h>
-+
-+#include <xmlsec/mscrypto/crypto.h>
-+#include <xmlsec/mscrypto/keysstore.h>
-+#include <xmlsec/mscrypto/akmngr.h>
-+#include <xmlsec/mscrypto/x509.h>
-+
-+/**
-+ * xmlSecMSCryptoAppliedKeysMngrCreate:
-+ * @hKeyStore:		the pointer to key store.
-+ * @hCertStore:		the pointer to certificate database.
-+ *
-+ * Create and load key store and certificate database into keys manager
-+ *
-+ * Returns keys manager pointer on success or NULL otherwise.
-+ */
-+xmlSecKeysMngrPtr
-+xmlSecMSCryptoAppliedKeysMngrCreate(
-+    HCERTSTORE hKeyStore ,
-+    HCERTSTORE hCertStore
-+) {
-+	xmlSecKeyDataStorePtr	certStore = NULL ;
-+	xmlSecKeysMngrPtr		keyMngr = NULL ;
-+	xmlSecKeyStorePtr		keyStore = NULL ;
-+
-+	keyStore = xmlSecKeyStoreCreate( xmlSecMSCryptoKeysStoreId ) ;
-+	if( keyStore == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeyStoreCreate" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * At present, MS Crypto engine do not provide a way to setup a key store.
-+	 */
-+	if( keyStore != NULL ) {
-+		/*TODO: binding key store.*/
-+	}
-+
-+	keyMngr = xmlSecKeysMngrCreate() ;
-+	if( keyMngr == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrCreate" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeyStoreDestroy( keyStore ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * Add key store to manager, from now on keys manager destroys the store if
-+	 * needed
-+	 */
-+	if( xmlSecKeysMngrAdoptKeysStore( keyMngr, keyStore ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+			"xmlSecKeysMngrAdoptKeyStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeyStoreDestroy( keyStore ) ;
-+		xmlSecKeysMngrDestroy( keyMngr ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * Initialize crypto library specific data in keys manager
-+	 */
-+	if( xmlSecMSCryptoKeysMngrInit( keyMngr ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecMSCryptoKeysMngrInit" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeysMngrDestroy( keyMngr ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * Set certificate databse to X509 key data store
-+	 */
-+	/*-
-+	 * At present, MS Crypto engine do not provide a way to setup a cert store.
-+	 */
-+
-+	/*-
-+	 * Set the getKey callback
-+	 */
-+	keyMngr->getKey = xmlSecKeysMngrGetKey ;
-+
-+	return keyMngr ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrSymKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCRYPTKEY			symKey
-+) {
-+	/*TODO: import the key into keys manager.*/
-+	return(0) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrPubKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCRYPTKEY	pubKey
-+) {
-+	/*TODO: import the key into keys manager.*/
-+	return(0) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrPriKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCRYPTKEY	priKey
-+) {
-+	/*TODO: import the key into keys manager.*/
-+	return(0) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCERTSTORE keyStore
-+) {
-+	xmlSecKeyDataStorePtr x509Store ;
-+
-+	xmlSecAssert2( mngr != NULL, -1 ) ;
-+	xmlSecAssert2( keyStore != NULL, -1 ) ;
-+
-+    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId ) ;
-+	if( x509Store == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrGetDataStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 ) ;
-+	}
-+
-+	if( xmlSecMSCryptoX509StoreAdoptKeyStore( x509Store, keyStore ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
-+			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 ) ;
-+	}
-+
-+	return( 0 ) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore (
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCERTSTORE trustedStore
-+) {
-+	xmlSecKeyDataStorePtr x509Store ;
-+
-+	xmlSecAssert2( mngr != NULL, -1 ) ;
-+	xmlSecAssert2( trustedStore != NULL, -1 ) ;
-+
-+    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId ) ;
-+	if( x509Store == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrGetDataStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 ) ;
-+	}
-+
-+	if( xmlSecMSCryptoX509StoreAdoptTrustedStore( x509Store, trustedStore ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
-+			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 ) ;
-+	}
-+
-+	return( 0 ) ;
-+}
-+
-+int
-+xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore (
-+	xmlSecKeysMngrPtr	mngr ,
-+	HCERTSTORE untrustedStore
-+) {
-+	xmlSecKeyDataStorePtr x509Store ;
-+
-+	xmlSecAssert2( mngr != NULL, -1 ) ;
-+	xmlSecAssert2( untrustedStore != NULL, -1 ) ;
-+
-+    x509Store = xmlSecKeysMngrGetDataStore( mngr, xmlSecMSCryptoX509StoreId ) ;
-+	if( x509Store == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrGetDataStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 ) ;
-+	}
-+
-+	if( xmlSecMSCryptoX509StoreAdoptUntrustedStore( x509Store, untrustedStore ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyDataStoreGetName( x509Store ) ) ,
-+			"xmlSecMSCryptoX509StoreAdoptKeyStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 ) ;
-+	}
-+
-+	return( 0 ) ;
-+}
-+
---- misc/xmlsec1-1.2.14/src/nss/Makefile.am	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am	2009-09-21 14:02:48.591560472 +0200
-@@ -35,6 +35,9 @@
- 	kw_des.c \
- 	kw_aes.c \
- 	globals.h \
-+	akmngr.c \
-+	keywrapers.c \
-+	tokens.c \
- 	$(NULL)
- 
- if SHAREDLIB_HACK
---- misc/xmlsec1-1.2.14/src/nss/Makefile.in	2009-06-25 22:53:33.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.in	2009-09-21 14:02:48.599339718 +0200
-@@ -72,7 +72,8 @@
- am__libxmlsec1_nss_la_SOURCES_DIST = app.c bignum.c ciphers.c crypto.c \
- 	digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \
- 	x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \
--	../strings.c
-+	../strings.c \
-+	akmngr.c keywrapers.c tokens.c
- am__objects_1 =
- @SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_nss_la-strings.lo
- am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
-@@ -83,6 +84,8 @@
- 	libxmlsec1_nss_la-x509.lo libxmlsec1_nss_la-x509vfy.lo \
- 	libxmlsec1_nss_la-keysstore.lo libxmlsec1_nss_la-keytrans.lo \
- 	libxmlsec1_nss_la-kw_des.lo libxmlsec1_nss_la-kw_aes.lo \
-+	libxmlsec1_nss_la-akmngr.lo libxmlsec1_nss_la-keywrapers.lo \
-+	libxmlsec1_nss_la-tokens.lo \
- 	$(am__objects_1) $(am__objects_2)
- libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
- libxmlsec1_nss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -333,6 +336,7 @@
- libxmlsec1_nss_la_SOURCES = app.c bignum.c ciphers.c crypto.c \
- 	digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \
- 	x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \
-+	akmngr.c keywrapers.c tokens.c \
- 	$(NULL) $(am__append_1)
- libxmlsec1_nss_la_LIBADD = \
- 	../libxmlsec1.la \
-@@ -439,6 +443,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-akmngr.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-keywrapers.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-tokens.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -468,6 +475,27 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
- 
-+libxmlsec1_nss_la-akmngr.lo: akmngr.c
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo" -c -o libxmlsec1_nss_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-akmngr.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='akmngr.c' object='libxmlsec1_nss_la-akmngr.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
-+
-+libxmlsec1_nss_la-keywrapers.lo: keywrapers.c
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-keywrapers.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-keywrapers.Tpo" -c -o libxmlsec1_nss_la-keywrapers.lo `test -f 'keywrapers.c' || echo '$(srcdir)/'`keywrapers.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-keywrapers.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-keywrapers.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-keywrapers.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keywrapers.c' object='libxmlsec1_nss_la-keywrapers.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-keywrapers.lo `test -f 'keywrapers.c' || echo '$(srcdir)/'`keywrapers.c
-+
-+libxmlsec1_nss_la-tokens.lo: tokens.c
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-tokens.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-tokens.Tpo" -c -o libxmlsec1_nss_la-tokens.lo `test -f 'tokens.c' || echo '$(srcdir)/'`tokens.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_nss_la-tokens.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-tokens.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-tokens.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tokens.c' object='libxmlsec1_nss_la-tokens.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-tokens.lo `test -f 'tokens.c' || echo '$(srcdir)/'`tokens.c
-+
- libxmlsec1_nss_la-bignum.lo: bignum.c
- @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-bignum.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo -c -o libxmlsec1_nss_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo $(DEPDIR)/libxmlsec1_nss_la-bignum.Plo
---- misc/xmlsec1-1.2.14/src/nss/akmngr.c	2009-09-21 14:07:19.197249962 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/akmngr.c	2009-09-21 14:02:48.539616129 +0200
-@@ -1 +1,384 @@
--dummy
-+/** 
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright.........................
-+ */
-+#include "globals.h"
-+
-+#include <nspr.h>
-+#include <nss.h>
-+#include <pk11func.h>
-+#include <cert.h>
-+#include <keyhi.h>
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/keys.h>
-+#include <xmlsec/transforms.h>
-+#include <xmlsec/errors.h>
-+
-+#include <xmlsec/nss/crypto.h>
-+#include <xmlsec/nss/tokens.h>
-+#include <xmlsec/nss/akmngr.h>
-+#include <xmlsec/nss/pkikeys.h>
-+#include <xmlsec/nss/ciphers.h>
-+#include <xmlsec/nss/keysstore.h>
-+
-+/**
-+ * xmlSecNssAppliedKeysMngrCreate:
-+ * @slot:			array of pointers to NSS PKCS#11 slot infomation.
-+ * @cSlots:			number of slots in the array
-+ * @handler:		the pointer to NSS certificate database.
-+ *
-+ * Create and load NSS crypto slot and certificate database into keys manager
-+ *
-+ * Returns keys manager pointer on success or NULL otherwise.
-+ */
-+xmlSecKeysMngrPtr
-+xmlSecNssAppliedKeysMngrCreate(
-+	PK11SlotInfo** slots, 
-+	int cSlots,
-+	CERTCertDBHandle* handler
-+) {
-+	xmlSecKeyDataStorePtr	certStore = NULL ;
-+	xmlSecKeysMngrPtr		keyMngr = NULL ;
-+	xmlSecKeyStorePtr		keyStore = NULL ;
-+	int islot = 0;
-+	keyStore = xmlSecKeyStoreCreate( xmlSecNssKeysStoreId ) ;
-+	if( keyStore == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeyStoreCreate" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return NULL ;
-+	}
-+
-+	for (islot = 0; islot < cSlots; islot++)
-+	{
-+		xmlSecNssKeySlotPtr		keySlot ;
-+
-+		/* Create a key slot */
-+		keySlot = xmlSecNssKeySlotCreate() ;
-+		if( keySlot == NULL ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+				"xmlSecNssKeySlotCreate" ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+			xmlSecKeyStoreDestroy( keyStore ) ;
-+			return NULL ;
-+		}
-+
-+		/* Set slot */
-+		if( xmlSecNssKeySlotSetSlot( keySlot , slots[islot] ) < 0 ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+				"xmlSecNssKeySlotSetSlot" ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+			xmlSecKeyStoreDestroy( keyStore ) ;
-+			xmlSecNssKeySlotDestroy( keySlot ) ;
-+			return NULL ;
-+		}
-+
-+		/* Adopt keySlot */
-+		if( xmlSecNssKeysStoreAdoptKeySlot( keyStore , keySlot ) < 0 ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+				"xmlSecNssKeysStoreAdoptKeySlot" ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+			xmlSecKeyStoreDestroy( keyStore ) ;
-+			xmlSecNssKeySlotDestroy( keySlot ) ;
-+			return NULL ;
-+		}
-+	}
-+
-+	keyMngr = xmlSecKeysMngrCreate() ;
-+	if( keyMngr == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrCreate" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeyStoreDestroy( keyStore ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * Add key store to manager, from now on keys manager destroys the store if
-+	 * needed
-+	 */
-+	if( xmlSecKeysMngrAdoptKeysStore( keyMngr, keyStore ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+			"xmlSecKeysMngrAdoptKeyStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeyStoreDestroy( keyStore ) ;
-+		xmlSecKeysMngrDestroy( keyMngr ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * Initialize crypto library specific data in keys manager
-+	 */
-+	if( xmlSecNssKeysMngrInit( keyMngr ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrCreate" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeysMngrDestroy( keyMngr ) ;
-+		return NULL ;
-+	}
-+
-+	/*-
-+	 * Set certificate databse to X509 key data store
-+	 */
-+	/**
-+	 * Because Tej's implementation of certDB use the default DB, so I ignore
-+	 * the certDB handler at present. I'll modify the cert store sources to
-+	 * accept particular certDB instead of default ones.
-+	certStore = xmlSecKeysMngrGetDataStore( keyMngr , xmlSecNssKeyDataStoreX509Id ) ;
-+	if( certStore == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+			"xmlSecKeysMngrGetDataStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeysMngrDestroy( keyMngr ) ;
-+		return NULL ;
-+	}
-+
-+	if( xmlSecNssKeyDataStoreX509SetCertDb( certStore , handler ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			xmlSecErrorsSafeString( xmlSecKeyStoreGetName( keyStore ) ) ,
-+			"xmlSecNssKeyDataStoreX509SetCertDb" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+		xmlSecKeysMngrDestroy( keyMngr ) ;
-+		return NULL ;
-+	}
-+	*/
-+
-+	/*-
-+	 * Set the getKey callback
-+	 */
-+	keyMngr->getKey = xmlSecKeysMngrGetKey ;
-+
-+	return keyMngr ;
-+}
-+
-+int
-+xmlSecNssAppliedKeysMngrSymKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	PK11SymKey*			symKey
-+) {
-+	xmlSecKeyPtr		key ;
-+	xmlSecKeyDataPtr	data ;
-+	xmlSecKeyStorePtr	keyStore ;
-+
-+	xmlSecAssert2( mngr != NULL , -1 ) ;
-+	xmlSecAssert2( symKey != NULL , -1 ) ;
-+
-+	keyStore = xmlSecKeysMngrGetKeysStore( mngr ) ;
-+	if( keyStore == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrGetKeysStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1) ;
-+	}
-+	xmlSecAssert2( xmlSecKeyStoreCheckId( keyStore , xmlSecNssKeysStoreId ) , -1 ) ;
-+
-+	data = xmlSecNssSymKeyDataKeyAdopt( symKey ) ;
-+	if( data == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1) ;
-+	}
-+
-+	key = xmlSecKeyCreate() ;
-+	if( key == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDataDestroy( data ) ;
-+		return(-1) ;
-+	}
-+
-+	if( xmlSecKeySetValue( key , data ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDataDestroy( data ) ;
-+		return(-1) ;
-+	}
-+
-+	if( xmlSecNssKeysStoreAdoptKey( keyStore, key ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDestroy( key ) ;
-+		return(-1) ;
-+	}
-+
-+	return(0) ;
-+}
-+
-+int
-+xmlSecNssAppliedKeysMngrPubKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	SECKEYPublicKey*	pubKey
-+) {
-+	xmlSecKeyPtr		key ;
-+	xmlSecKeyDataPtr	data ;
-+	xmlSecKeyStorePtr	keyStore ;
-+
-+	xmlSecAssert2( mngr != NULL , -1 ) ;
-+	xmlSecAssert2( pubKey != NULL , -1 ) ;
-+
-+	keyStore = xmlSecKeysMngrGetKeysStore( mngr ) ;
-+	if( keyStore == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrGetKeysStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1) ;
-+	}
-+	xmlSecAssert2( xmlSecKeyStoreCheckId( keyStore , xmlSecNssKeysStoreId ) , -1 ) ;
-+
-+	data = xmlSecNssPKIAdoptKey( NULL, pubKey ) ;
-+	if( data == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssPKIAdoptKey" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1) ;
-+	}
-+
-+	key = xmlSecKeyCreate() ;
-+	if( key == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDataDestroy( data ) ;
-+		return(-1) ;
-+	}
-+
-+	if( xmlSecKeySetValue( key , data ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDataDestroy( data ) ;
-+		return(-1) ;
-+	}
-+
-+	if( xmlSecNssKeysStoreAdoptKey( keyStore, key ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDestroy( key ) ;
-+		return(-1) ;
-+	}
-+
-+	return(0) ;
-+}
-+
-+int
-+xmlSecNssAppliedKeysMngrPriKeyLoad(
-+	xmlSecKeysMngrPtr	mngr ,
-+	SECKEYPrivateKey*	priKey
-+) {
-+	xmlSecKeyPtr		key ;
-+	xmlSecKeyDataPtr	data ;
-+	xmlSecKeyStorePtr	keyStore ;
-+
-+	xmlSecAssert2( mngr != NULL , -1 ) ;
-+	xmlSecAssert2( priKey != NULL , -1 ) ;
-+
-+	keyStore = xmlSecKeysMngrGetKeysStore( mngr ) ;
-+	if( keyStore == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecKeysMngrGetKeysStore" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1) ;
-+	}
-+	xmlSecAssert2( xmlSecKeyStoreCheckId( keyStore , xmlSecNssKeysStoreId ) , -1 ) ;
-+
-+	data = xmlSecNssPKIAdoptKey( priKey, NULL ) ;
-+	if( data == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssPKIAdoptKey" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1) ;
-+	}
-+
-+	key = xmlSecKeyCreate() ;
-+	if( key == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDataDestroy( data ) ;
-+		return(-1) ;
-+	}
-+
-+	if( xmlSecKeySetValue( key , data ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDataDestroy( data ) ;
-+		return(-1) ;
-+	}
-+
-+	if( xmlSecNssKeysStoreAdoptKey( keyStore, key ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecNssSymKeyDataKeyAdopt" ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecKeyDestroy( key ) ;
-+		return(-1) ;
-+	}
-+
-+	return(0) ;
-+}
-+
---- misc/xmlsec1-1.2.14/src/nss/hmac.c	2009-06-26 06:18:13.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/hmac.c	2009-09-21 14:02:48.649065288 +0200
-@@ -23,8 +23,8 @@
- #include <xmlsec/transforms.h>
- #include <xmlsec/errors.h>
- 
--#include <xmlsec/nss/app.h>
- #include <xmlsec/nss/crypto.h>
-+#include <xmlsec/nss/tokens.h>
- 
- /* sizes in bits */
- #define XMLSEC_NSS_MIN_HMAC_SIZE		80
-@@ -286,13 +286,13 @@
-     keyItem.data = xmlSecBufferGetData(buffer);
-     keyItem.len  = xmlSecBufferGetSize(buffer); 
- 
--    slot = PK11_GetBestSlot(ctx->digestType, NULL);
-+    slot = xmlSecNssSlotGet(ctx->digestType);
-     if(slot == NULL) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
--		    "PK11_GetBestSlot",
-+		    "xmlSecNssSlotGet",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
-+		    "error code=%d", PORT_GetError());
- 	return(-1);
-     }
- 	
---- misc/xmlsec1-1.2.14/src/nss/keysstore.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/keysstore.c	2009-09-21 14:02:48.633533885 +0200
-@@ -1,36 +1,56 @@
- /** 
-  * XMLSec library
-  * 
-- * Nss keys store that uses Simple Keys Store under the hood. Uses the
-- * Nss DB as a backing store for the finding keys, but the NSS DB is
-- * not written to by the keys store.
-- * So, if store->findkey is done and the key is not found in the simple
-- * keys store, the NSS DB is looked up.
-- * If store is called to adopt a key, that key is not written to the NSS
-- * DB.
-- * Thus, the NSS DB can be used to pre-load keys and becomes an alternate 
-- * source of keys for xmlsec
-- * 
-  * This is free software; see Copyright file in the source
-  * distribution for precise wording.
-  * 
-  * Copyright (c) 2003 America Online, Inc.  All rights reserved.
-  */
-+
-+/**
-+ * NSS key store uses a key list and a slot list as the key repository. NSS slot
-+ * list is a backup repository for the finding keys. If a key is not found from
-+ * the key list, the NSS slot list is looked up.
-+ *
-+ * Any key in the key list will not save to pkcs11 slot. When a store to called
-+ * to adopt a key, the key is resident in the key list; While a store to called
-+ * to set a is resident in the key list; While a store to called to set a slot 
-+ * list, which means that the keys in the listed slot can be used for xml sign-
-+ * nature or encryption.
-+ *
-+ * Then, a user can adjust slot list to effect the crypto behaviors of xmlSec.
-+ *
-+ * The framework will decrease the user interfaces to administrate xmlSec crypto
-+ * engine. He can only focus on NSS layer functions. For examples, after the
-+ * user set up a slot list handler to the keys store, he do not need to do any
-+ * other work atop xmlSec interfaces, his action on the slot list handler, such
-+ * as add a token to, delete a token from the list, will directly effect the key
-+ * store behaviors.
-+ *
-+ * For example, a scenariio:
-+ * 0. Create a slot list;( NSS interfaces )
-+ * 1. Create a keys store;( xmlSec interfaces )
-+ * 2. Set slot list with the keys store;( xmlSec Interfaces )
-+ * 3. Add a slot to the slot list;( NSS interfaces )
-+ * 4. Perform xml signature; ( xmlSec Interfaces )
-+ * 5. Deleter a slot from the slot list;( NSS interfaces )
-+ * 6. Perform xml encryption; ( xmlSec Interfaces )
-+ * 7. Perform xml signature;( xmlSec Interfaces )
-+ * 8. Destroy the keys store;( xmlSec Interfaces )
-+ * 8. Destroy the slot list.( NSS Interfaces )
-+ */
- #include "globals.h"
- 
- #include <stdlib.h>
- #include <string.h>
- 
- #include <nss.h> 
--#include <cert.h> 
- #include <pk11func.h> 
-+#include <prinit.h>
- #include <keyhi.h> 
- 
--#include <libxml/tree.h> 
--
- #include <xmlsec/xmlsec.h>
--#include <xmlsec/buffer.h>
--#include <xmlsec/base64.h>
-+#include <xmlsec/keys.h>
- #include <xmlsec/errors.h>
- #include <xmlsec/xmltree.h>
- 
-@@ -38,82 +58,461 @@
- 
- #include <xmlsec/nss/crypto.h>
- #include <xmlsec/nss/keysstore.h>
--#include <xmlsec/nss/x509.h>
-+#include <xmlsec/nss/tokens.h>
-+#include <xmlsec/nss/ciphers.h>
- #include <xmlsec/nss/pkikeys.h>
- 
- /****************************************************************************
-  *
-- * Nss Keys Store. Uses Simple Keys Store under the hood
-+ * Internal NSS key store context
-  * 
-- * Simple Keys Store ptr is located after xmlSecKeyStore
-+ * This context is located after xmlSecKeyStore
-  *
-  ***************************************************************************/
-+typedef struct _xmlSecNssKeysStoreCtx  xmlSecNssKeysStoreCtx ;
-+typedef struct _xmlSecNssKeysStoreCtx* xmlSecNssKeysStoreCtxPtr ;
-+
-+struct _xmlSecNssKeysStoreCtx {
-+       xmlSecPtrListPtr                keyList ;
-+       xmlSecPtrListPtr                slotList ;
-+} ;
-+
- #define xmlSecNssKeysStoreSize \
--	(sizeof(xmlSecKeyStore) + sizeof(xmlSecKeyStorePtr))
-+	( sizeof( xmlSecKeyStore ) + sizeof( xmlSecNssKeysStoreCtx ) )
- 
--#define xmlSecNssKeysStoreGetSS(store) \
--    ((xmlSecKeyStoreCheckSize((store), xmlSecNssKeysStoreSize)) ? \
--     (xmlSecKeyStorePtr*)(((xmlSecByte*)(store)) + sizeof(xmlSecKeyStore)) : \
--     (xmlSecKeyStorePtr*)NULL)
--
--static int			xmlSecNssKeysStoreInitialize	(xmlSecKeyStorePtr store);
--static void			xmlSecNssKeysStoreFinalize	(xmlSecKeyStorePtr store);
--static xmlSecKeyPtr 		xmlSecNssKeysStoreFindKey	(xmlSecKeyStorePtr store, 
--								 const xmlChar* name, 
--								 xmlSecKeyInfoCtxPtr keyInfoCtx);
-+#define xmlSecNssKeysStoreGetCtx( data ) \
-+       ( ( xmlSecNssKeysStoreCtxPtr )( ( ( xmlSecByte* )( data ) ) + sizeof( xmlSecKeyStore ) ) )
- 
--static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = {
--    sizeof(xmlSecKeyStoreKlass),
--    xmlSecNssKeysStoreSize,
-+int xmlSecNssKeysStoreAdoptKeySlot(
-+       xmlSecKeyStorePtr               store ,
-+       xmlSecNssKeySlotPtr             keySlot
-+) {
-+       xmlSecNssKeysStoreCtxPtr context = NULL ;
-+
-+       xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , -1 ) ;
-+       xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , -1 ) ;
-+       context = xmlSecNssKeysStoreGetCtx( store ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecNssKeysStoreGetCtx" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
-+
-+       if( context->slotList == NULL ) {
-+               if( ( context->slotList = xmlSecPtrListCreate( xmlSecNssKeySlotListId ) ) == NULL ) {
-+                       xmlSecError( XMLSEC_ERRORS_HERE ,
-+                               xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                               "xmlSecPtrListCreate" ,
-+                               XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
-+                       return -1 ;
-+               }
-+       }
-+
-+       if( !xmlSecPtrListCheckId( context->slotList , xmlSecNssKeySlotListId ) ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecPtrListCheckId" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
-+
-+       if( xmlSecPtrListAdd( context->slotList , keySlot ) < 0 ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecPtrListAdd" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
-+       return 0 ;
-+}
- 
--    /* data */
--    BAD_CAST "NSS-keys-store",		/* const xmlChar* name; */ 
--        
--    /* constructors/destructor */
--    xmlSecNssKeysStoreInitialize,	/* xmlSecKeyStoreInitializeMethod initialize; */
--    xmlSecNssKeysStoreFinalize,		/* xmlSecKeyStoreFinalizeMethod finalize; */
--    xmlSecNssKeysStoreFindKey,		/* xmlSecKeyStoreFindKeyMethod findKey; */
--
--    /* reserved for the future */
--    NULL,				/* void* reserved0; */
--    NULL,				/* void* reserved1; */
--};
-+int xmlSecNssKeysStoreAdoptKey(
-+       xmlSecKeyStorePtr       store ,
-+       xmlSecKeyPtr            key
-+) {
-+       xmlSecNssKeysStoreCtxPtr context = NULL ;
-+
-+       xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , -1 ) ;
-+       xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , -1 ) ;
-+
-+       context = xmlSecNssKeysStoreGetCtx( store ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecNssKeysStoreGetCtx" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
-+
-+       if( context->keyList == NULL ) {
-+               if( ( context->keyList = xmlSecPtrListCreate( xmlSecKeyPtrListId ) ) == NULL ) {
-+                       xmlSecError( XMLSEC_ERRORS_HERE ,
-+                               xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                               "xmlSecPtrListCreate" ,
-+                               XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
-+                       return -1 ;
-+               }
-+       }
-+
-+       if( !xmlSecPtrListCheckId( context->keyList , xmlSecKeyPtrListId ) ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecPtrListCheckId" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
-+
-+       if( xmlSecPtrListAdd( context->keyList , key ) < 0 ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecPtrListAdd" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
- 
--/**
-- * xmlSecNssKeysStoreGetKlass:
-- * 
-- * The Nss list based keys store klass.
-+       return 0 ;
-+}
-+
-+/*
-+ * xmlSecKeyStoreInitializeMethod:
-+ * @store:             the store.
-+ *
-+ * Keys store specific initialization method.
-  *
-- * Returns: Nss list based keys store klass.
-+ * Returns 0 on success or a negative value if an error occurs.
-  */
--xmlSecKeyStoreId 
--xmlSecNssKeysStoreGetKlass(void) {
--    return(&xmlSecNssKeysStoreKlass);
-+static int
-+xmlSecNssKeysStoreInitialize(
-+       xmlSecKeyStorePtr store
-+) {
-+       xmlSecNssKeysStoreCtxPtr context = NULL ;
-+
-+       xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , -1 ) ;
-+       xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , -1 ) ;
-+
-+       context = xmlSecNssKeysStoreGetCtx( store ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecNssKeysStoreGetCtx" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;
-+       }
-+
-+       context->keyList = NULL ;
-+       context->slotList = NULL ;
-+
-+       return 0 ;
- }
- 
- /**
-- * xmlSecNssKeysStoreAdoptKey:
-- * @store:		the pointer to Nss keys store.
-- * @key:		the pointer to key.
-- * 
-- * Adds @key to the @store. 
-  *
-- * Returns: 0 on success or a negative value if an error occurs.
-+ * xmlSecKeyStoreFinalizeMethod:
-+ * @store:             the store.
-+ *
-+ * Keys store specific finalization (destroy) method.
-  */
--int 
--xmlSecNssKeysStoreAdoptKey(xmlSecKeyStorePtr store, xmlSecKeyPtr key) {
--    xmlSecKeyStorePtr *ss;
--    
--    xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1);
--    xmlSecAssert2((key != NULL), -1);
-+void
-+xmlSecNssKeysStoreFinalize(
-+       xmlSecKeyStorePtr store
-+) {
-+       xmlSecNssKeysStoreCtxPtr context = NULL ;
-+
-+       xmlSecAssert( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) ) ;
-+       xmlSecAssert( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) ) ;
-+
-+       context = xmlSecNssKeysStoreGetCtx( store ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                       "xmlSecNssKeysStoreGetCtx" ,
-+                       XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return ;
-+       }
-+
-+       if( context->keyList != NULL ) {
-+               xmlSecPtrListDestroy( context->keyList ) ;
-+               context->keyList = NULL ;
-+       }
-+
-+       if( context->slotList != NULL ) {
-+               xmlSecPtrListDestroy( context->slotList ) ;
-+               context->slotList = NULL ;
-+       }
-+}
-+
-+xmlSecKeyPtr
-+xmlSecNssKeysStoreFindKeyFromSlot(
-+       PK11SlotInfo* slot,
-+       const xmlChar* name,
-+       xmlSecKeyInfoCtxPtr keyInfoCtx
-+) {
-+       xmlSecKeyPtr            key = NULL ;
-+       xmlSecKeyDataPtr        data = NULL ;
-+       int                                     length ;
-+
-+       xmlSecAssert2( slot != NULL , NULL ) ;
-+       xmlSecAssert2( name != NULL , NULL ) ;
-+       xmlSecAssert2( keyInfoCtx != NULL , NULL ) ;
-+
-+       if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypeSymmetric ) == xmlSecKeyDataTypeSymmetric ) {
-+               PK11SymKey*                     symKey ;
-+               PK11SymKey*                     curKey ;
-+
-+               /* Find symmetric key from the slot by name */
-+               symKey = PK11_ListFixedKeysInSlot( slot , ( char* )name , NULL ) ;
-+               for( curKey = symKey ; curKey != NULL ; curKey = PK11_GetNextSymKey( curKey ) ) {
-+                       /* Check the key request */
-+                       length = PK11_GetKeyLength( curKey ) ;
-+                       length *= 8 ;
-+                       if( ( keyInfoCtx->keyReq.keyBitsSize > 0 ) &&
-+                               ( length > 0 ) &&
-+                               ( length < keyInfoCtx->keyReq.keyBitsSize ) )
-+                               continue ;
-+
-+                       /* We find a eligible key */
-+                       data = xmlSecNssSymKeyDataKeyAdopt( curKey ) ;
-+                       if( data == NULL ) {
-+                               /* Do nothing */
-+                       }
-+                       break ;
-+               }
-+
-+               /* Destroy the sym key list */
-+               for( curKey = symKey ; curKey != NULL ; ) {
-+                       symKey = curKey ;
-+                       curKey = PK11_GetNextSymKey( symKey ) ;
-+                       PK11_FreeSymKey( symKey ) ;
-+               }
-+       } else if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic ) == xmlSecKeyDataTypePublic ) {
-+               SECKEYPublicKeyList*            pubKeyList ;
-+               SECKEYPublicKey*                        pubKey ;
-+               SECKEYPublicKeyListNode*        curPub ;
-+
-+               /* Find asymmetric key from the slot by name */
-+               pubKeyList = PK11_ListPublicKeysInSlot( slot , ( char* )name ) ;
-+               pubKey = NULL ;
-+               curPub = PUBKEY_LIST_HEAD(pubKeyList);
-+               for( ; !PUBKEY_LIST_END(curPub, pubKeyList) ; curPub = PUBKEY_LIST_NEXT( curPub ) ) {
-+                       /* Check the key request */
-+                       length = SECKEY_PublicKeyStrength( curPub->key ) ;
-+                       length *= 8 ;
-+                       if( ( keyInfoCtx->keyReq.keyBitsSize > 0 ) &&
-+                               ( length > 0 ) &&
-+                               ( length < keyInfoCtx->keyReq.keyBitsSize ) )
-+                               continue ;
-+
-+                       /* We find a eligible key */
-+                       pubKey = curPub->key ;
-+                       break ;
-+               }
-+
-+               if( pubKey != NULL ) {
-+                       data = xmlSecNssPKIAdoptKey( NULL, pubKey ) ;
-+                       if( data == NULL ) {
-+                               /* Do nothing */
-+                       }
-+               }
-+
-+               /* Destroy the public key list */
-+               SECKEY_DestroyPublicKeyList( pubKeyList ) ;
-+       } else if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+               SECKEYPrivateKeyList*           priKeyList = NULL ;
-+               SECKEYPrivateKey*                       priKey = NULL ;
-+               SECKEYPrivateKeyListNode*       curPri ;
-+
-+               /* Find asymmetric key from the slot by name */
-+               priKeyList = PK11_ListPrivKeysInSlot( slot , ( char* )name , NULL ) ;
-+               priKey = NULL ;
-+               curPri = PRIVKEY_LIST_HEAD(priKeyList);
-+               for( ; !PRIVKEY_LIST_END(curPri, priKeyList) ; curPri = PRIVKEY_LIST_NEXT( curPri ) ) {
-+                       /* Check the key request */
-+                       length = PK11_SignatureLen( curPri->key ) ;
-+                       length *= 8 ;
-+                       if( ( keyInfoCtx->keyReq.keyBitsSize > 0 ) &&
-+                               ( length > 0 ) &&
-+                               ( length < keyInfoCtx->keyReq.keyBitsSize ) )
-+                               continue ;
-+
-+                       /* We find a eligible key */
-+                       priKey = curPri->key ;
-+                       break ;
-+               }
-+
-+               if( priKey != NULL ) {
-+                       data = xmlSecNssPKIAdoptKey( priKey, NULL ) ;
-+                       if( data == NULL ) {
-+                               /* Do nothing */
-+                       }
-+               }
-+
-+               /* Destroy the private key list */
-+               SECKEY_DestroyPrivateKeyList( priKeyList ) ;
-+       }
-+
-+       /* If we have gotten the key value */
-+       if( data != NULL ) {
-+               if( ( key = xmlSecKeyCreate() ) == NULL ) {
-+                       xmlSecError( XMLSEC_ERRORS_HERE ,
-+                               NULL ,
-+                               "xmlSecKeyCreate" ,
-+                               XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+                       xmlSecKeyDataDestroy( data ) ;
-+                       return NULL ;
-+               }
-+
-+               if( xmlSecKeySetValue( key , data ) < 0 ) {
-+                       xmlSecError( XMLSEC_ERRORS_HERE ,
-+                               NULL ,
-+                               "xmlSecKeySetValue" ,
-+                               XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+                       xmlSecKeyDestroy( key ) ;
-+                       xmlSecKeyDataDestroy( data ) ;
-+                       return NULL ;
-+               }
-+       }
- 
--    ss = xmlSecNssKeysStoreGetSS(store);
--    xmlSecAssert2(((ss != NULL) && (*ss != NULL) && 
--		   (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1);
-+    return(key);
-+}
-+
-+/** 
-+ * xmlSecKeyStoreFindKeyMethod:
-+ * @store:             the store.
-+ * @name:              the desired key name.
-+ * @keyInfoCtx:        the pointer to key info context.
-+ *
-+ * Keys store specific find method. The caller is responsible for destroying 
-+ * the returned key using #xmlSecKeyDestroy method.
-+ *
-+ * Returns the pointer to a key or NULL if key is not found or an error occurs.
-+ */
-+static xmlSecKeyPtr
-+xmlSecNssKeysStoreFindKey(
-+       xmlSecKeyStorePtr store ,
-+       const xmlChar* name ,
-+       xmlSecKeyInfoCtxPtr keyInfoCtx
-+) {
-+    xmlSecNssKeysStoreCtxPtr context = NULL ;
-+    xmlSecKeyPtr    key = NULL ;
-+    xmlSecNssKeySlotPtr     keySlot = NULL ;
-+    xmlSecSize              pos ;
-+    xmlSecSize              size ;
-+
-+    xmlSecAssert2( xmlSecKeyStoreCheckId( store , xmlSecNssKeysStoreId ) , NULL ) ;
-+    xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ) , NULL ) ;
-+    xmlSecAssert2( keyInfoCtx != NULL , NULL ) ;
-+
-+    context = xmlSecNssKeysStoreGetCtx( store ) ;
-+    if( context == NULL ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                    xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                    "xmlSecNssKeysStoreGetCtx" ,
-+                    XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return NULL ;
-+    }
-+
-+    /*-
-+     * Look for key at keyList at first.
-+     */
-+    if( context->keyList != NULL ) {
-+            size = xmlSecPtrListGetSize( context->keyList ) ;
-+            for( pos = 0 ; pos < size ; pos ++ ) {
-+                    key = ( xmlSecKeyPtr )xmlSecPtrListGetItem( context->keyList , pos ) ;
-+                    if( key != NULL && xmlSecKeyMatch( key , name , &( keyInfoCtx->keyReq ) ) ) {
-+                            return xmlSecKeyDuplicate( key ) ;
-+                    }
-+            }
-+    }
-+
-+    /*-
-+     * Find the key from slotList
-+     */
-+    if( context->slotList != NULL ) {
-+            PK11SlotInfo*                   slot = NULL ;
-+
-+            size = xmlSecPtrListGetSize( context->slotList ) ;
-+            for( pos = 0 ; pos < size ; pos ++ ) {
-+                    keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( context->slotList , pos ) ;
-+                    slot = xmlSecNssKeySlotGetSlot( keySlot ) ;
-+                    if( slot == NULL ) {
-+                            continue ;
-+                    } else {
-+                            key = xmlSecNssKeysStoreFindKeyFromSlot( slot, name, keyInfoCtx ) ;
-+                            if( key == NULL ) {
-+                                    continue ;
-+                            } else {
-+                                    return( key ) ;
-+                            }
-+                    }
-+            }
-+    }
-+
-+    /*-
-+     * Create a session key if we can not find the key from keyList and slotList
-+     */
-+    if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypeSession ) == xmlSecKeyDataTypeSession ) {
-+            key = xmlSecKeyGenerate( keyInfoCtx->keyReq.keyId , keyInfoCtx->keyReq.keyBitsSize , xmlSecKeyDataTypeSession ) ;
-+            if( key == NULL ) {
-+                    xmlSecError( XMLSEC_ERRORS_HERE ,
-+                            xmlSecErrorsSafeString( xmlSecKeyStoreGetName( store ) ) ,
-+                            "xmlSecKeySetValue" ,
-+                            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+                            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+                    return NULL ;
-+            }
-+
-+            return key ;
-+    }
-+ 
-+   /**
-+    * We have no way to find the key any more.
-+    */
-+    return NULL ;
-+}
-+
-+static xmlSecKeyStoreKlass xmlSecNssKeysStoreKlass = {
-+       sizeof( xmlSecKeyStoreKlass ) ,
-+       xmlSecNssKeysStoreSize ,
-+       BAD_CAST "implicit_nss_keys_store" ,
-+       xmlSecNssKeysStoreInitialize ,
-+       xmlSecNssKeysStoreFinalize ,
-+       xmlSecNssKeysStoreFindKey ,
-+       NULL ,
-+       NULL
-+} ;
- 
--    return (xmlSecSimpleKeysStoreAdoptKey(*ss, key));
-+/**
-+ * xmlSecNssKeysStoreGetKlass:
-+ * 
-+ * The simple list based keys store klass.
-+ *
-+ */
-+xmlSecKeyStoreId 
-+xmlSecNssKeysStoreGetKlass( void ) {
-+    return &xmlSecNssKeysStoreKlass ;
- }
- 
-+/**************************
-+ * Application routines
-+ */
-+
- /** 
-  * xmlSecNssKeysStoreLoad:
-  * @store:		the pointer to Nss keys store.
-@@ -252,234 +651,147 @@
-  */
- int
- xmlSecNssKeysStoreSave(xmlSecKeyStorePtr store, const char *filename, xmlSecKeyDataType type) {
--    xmlSecKeyStorePtr *ss;
-+    xmlSecKeyInfoCtx keyInfoCtx;
-+    xmlSecNssKeysStoreCtxPtr context ;
-+    xmlSecPtrListPtr list;
-+    xmlSecKeyPtr key;
-+    xmlSecSize i, keysSize;    
-+    xmlDocPtr doc;
-+    xmlNodePtr cur;
-+    xmlSecKeyDataPtr data;
-+    xmlSecPtrListPtr idsList;
-+    xmlSecKeyDataId dataId;
-+    xmlSecSize idsSize, j;
-+    int ret;
- 
-     xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1);
--    xmlSecAssert2((filename != NULL), -1);    
--    
--    ss = xmlSecNssKeysStoreGetSS(store);
--    xmlSecAssert2(((ss != NULL) && (*ss != NULL) && 
--		   (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1);
--
--    return (xmlSecSimpleKeysStoreSave(*ss, filename, type));
--}
--
--static int
--xmlSecNssKeysStoreInitialize(xmlSecKeyStorePtr store) {
--    xmlSecKeyStorePtr *ss;
-+    xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ), -1 ) ;
-+    xmlSecAssert2(filename != NULL, -1);   
- 
--    xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1);
-+    context = xmlSecNssKeysStoreGetCtx( store ) ;
-+    xmlSecAssert2( context != NULL, -1 );
- 
--    ss = xmlSecNssKeysStoreGetSS(store);
--    xmlSecAssert2((*ss == NULL), -1);
-+    list = context->keyList ;
-+       xmlSecAssert2( list != NULL, -1 );
-+    xmlSecAssert2(xmlSecPtrListCheckId(list, xmlSecKeyPtrListId), -1);
- 
--    *ss = xmlSecKeyStoreCreate(xmlSecSimpleKeysStoreId);
--    if(*ss == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
-+    /* create doc */
-+    doc = xmlSecCreateTree(BAD_CAST "Keys", xmlSecNs);
-+    if(doc == NULL) {
-+	    xmlSecError(XMLSEC_ERRORS_HERE,
- 		    xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
--		    "xmlSecKeyStoreCreate",
-+		    "xmlSecCreateTree",
- 		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "xmlSecSimpleKeysStoreId");
-+		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
- 
--    return(0);    
--}
--
--static void
--xmlSecNssKeysStoreFinalize(xmlSecKeyStorePtr store) {
--    xmlSecKeyStorePtr *ss;
--    
--    xmlSecAssert(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId));
--    
--    ss = xmlSecNssKeysStoreGetSS(store);
--    xmlSecAssert((ss != NULL) && (*ss != NULL));
--    
--    xmlSecKeyStoreDestroy(*ss);
--}
--
--static xmlSecKeyPtr 
--xmlSecNssKeysStoreFindKey(xmlSecKeyStorePtr store, const xmlChar* name, 
--		          xmlSecKeyInfoCtxPtr keyInfoCtx) {
--    xmlSecKeyStorePtr* ss;
--    xmlSecKeyPtr key = NULL;
--    xmlSecKeyPtr retval = NULL;
--    xmlSecKeyReqPtr keyReq = NULL;
--    CERTCertificate *cert = NULL;
--    SECKEYPublicKey *pubkey = NULL;
--    SECKEYPrivateKey *privkey = NULL;
--    xmlSecKeyDataPtr data = NULL;
--    xmlSecKeyDataPtr x509Data = NULL;
--    int ret;
--
--    xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), NULL);
--    xmlSecAssert2(keyInfoCtx != NULL, NULL);
--
--    ss = xmlSecNssKeysStoreGetSS(store);
--    xmlSecAssert2(((ss != NULL) && (*ss != NULL)), NULL);
--
--    key = xmlSecKeyStoreFindKey(*ss, name, keyInfoCtx);
--    if (key != NULL) {
--	return (key);
--    }
--
--    /* Try to find the key in the NSS DB, and construct an xmlSecKey.
--     * we must have a name to lookup keys in NSS DB.
--     */
--    if (name == NULL) {
--	goto done;
--    }
-+    idsList = xmlSecKeyDataIdsGet();   
-+    xmlSecAssert2(idsList != NULL, -1);
- 
--    /* what type of key are we looking for? 
--     * TBD: For now, we'll look only for public/private keys using the
--     * name as a cert nickname. Later on, we can attempt to find
--     * symmetric keys using PK11_FindFixedKey 
--     */
--    keyReq = &(keyInfoCtx->keyReq);
--    if (keyReq->keyType & 
--	(xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate)) {
--	cert = CERT_FindCertByNickname (CERT_GetDefaultCertDB(), (char *)name);
--	if (cert == NULL) {
--	    goto done;
--	}
-+    keysSize = xmlSecPtrListGetSize(list);
-+    idsSize = xmlSecPtrListGetSize(idsList);
-+    for(i = 0; i < keysSize; ++i) {
-+        key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, i);
-+        xmlSecAssert2(key != NULL, -1);
- 
--	if (keyReq->keyType & xmlSecKeyDataTypePublic) {
-- 	    pubkey = CERT_ExtractPublicKey(cert);
--	    if (pubkey == NULL) {
-+        cur = xmlSecAddChild(xmlDocGetRootElement(doc), xmlSecNodeKeyInfo, xmlSecDSigNs);
-+        if(cur == NULL) {
- 		xmlSecError(XMLSEC_ERRORS_HERE,
--			    NULL,
--			    "CERT_ExtractPublicKey",
--			    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--			    XMLSEC_ERRORS_NO_MESSAGE);
--		goto done;
--	    }
-+                    xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-+                    "xmlSecAddChild",
-+                    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+                    "node=%s",
-+                    xmlSecErrorsSafeString(xmlSecNodeKeyInfo));
-+            xmlFreeDoc(doc); 
-+            return(-1);
- 	} 
- 
--	if (keyReq->keyType & xmlSecKeyDataTypePrivate) { 
-- 	    privkey = PK11_FindKeyByAnyCert(cert, NULL);
--	    if (privkey == NULL) {
-+        /* special data key name */
-+        if(xmlSecKeyGetName(key) != NULL) {
-+            if(xmlSecAddChild(cur, xmlSecNodeKeyName, xmlSecDSigNs) == NULL) {
- 		xmlSecError(XMLSEC_ERRORS_HERE,
--			    NULL,
--			    "PK11_FindKeyByAnyCert",
--			    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--			    XMLSEC_ERRORS_NO_MESSAGE);
--		goto done;
-+                xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-+                "xmlSecAddChild",
-+                XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+                "node=%s",
-+                xmlSecErrorsSafeString(xmlSecNodeKeyName));
-+            xmlFreeDoc(doc); 
-+            return(-1);
- 	    }
- 	}
- 
--	data = xmlSecNssPKIAdoptKey(privkey, pubkey);
--	if(data == NULL) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecNssPKIAdoptKey",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			XMLSEC_ERRORS_NO_MESSAGE);
--	    goto done;
--	}    
--	privkey = NULL;
--	pubkey = NULL;
--
--        key = xmlSecKeyCreate();
--        if (key == NULL) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecKeyCreate",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			XMLSEC_ERRORS_NO_MESSAGE);
--	    return (NULL);
--        }
--
--	x509Data = xmlSecKeyDataCreate(xmlSecNssKeyDataX509Id);
--	if(x509Data == NULL) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecKeyDataCreate",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"transform=%s",
--			xmlSecErrorsSafeString(xmlSecTransformKlassGetName(xmlSecNssKeyDataX509Id)));
--	    goto done;
--	}
-+        /* create nodes for other keys data */
-+        for(j = 0; j < idsSize; ++j) {
-+            dataId = (xmlSecKeyDataId)xmlSecPtrListGetItem(idsList, j);
-+            xmlSecAssert2(dataId != xmlSecKeyDataIdUnknown, -1);
-+
-+            if(dataId->dataNodeName == NULL) {
-+                continue;
-+            }
-+
-+            data = xmlSecKeyGetData(key, dataId);
-+            if(data == NULL) {
-+                continue;
-+	    }
- 
--	ret = xmlSecNssKeyDataX509AdoptKeyCert(x509Data, cert);
--	if (ret < 0) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecNssKeyDataX509AdoptKeyCert",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"data=%s",
--			xmlSecErrorsSafeString(xmlSecKeyDataGetName(x509Data)));
--	    goto done;
--	}
--	cert = CERT_DupCertificate(cert);
--	if (cert == NULL) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"CERT_DupCertificate",
--			XMLSEC_ERRORS_R_CRYPTO_FAILED,
--			"data=%s",
--			xmlSecErrorsSafeString(xmlSecKeyDataGetName(x509Data)));
--	    goto done;
-+            if(xmlSecAddChild(cur, dataId->dataNodeName, dataId->dataNodeNs) == NULL) {
-+	        xmlSecError(XMLSEC_ERRORS_HERE,
-+                xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-+                "xmlSecAddChild",
-+		XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+                "node=%s", 
-+                xmlSecErrorsSafeString(dataId->dataNodeName));
-+                xmlFreeDoc(doc); 
-+                return(-1);
-+	    }
- 	}
- 
--	ret = xmlSecNssKeyDataX509AdoptCert(x509Data, cert);
-+	ret = xmlSecKeyInfoCtxInitialize(&keyInfoCtx, NULL);
- 	if (ret < 0) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecNssKeyDataX509AdoptCert",
-+            xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-+            "xmlSecKeyInfoCtxInitialize",
- 			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"data=%s",
--			xmlSecErrorsSafeString(xmlSecKeyDataGetName(x509Data)));
--	    goto done;
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+            xmlFreeDoc(doc);
-+            return(-1);
- 	}
--	cert = NULL;
- 
--	ret = xmlSecKeySetValue(key, data);
--	if (ret < 0) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecKeySetValue",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"data=%s", 
--			xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)));
--	    goto done;
--	}
--	data = NULL;
-+        keyInfoCtx.mode                 = xmlSecKeyInfoModeWrite;
-+        keyInfoCtx.keyReq.keyId         = xmlSecKeyDataIdUnknown;
-+        keyInfoCtx.keyReq.keyType       = type;
-+        keyInfoCtx.keyReq.keyUsage      = xmlSecKeyDataUsageAny;
- 
--	ret = xmlSecKeyAdoptData(key, x509Data);
-+        /* finally write key in the node */
-+        ret = xmlSecKeyInfoNodeWrite(cur, key, &keyInfoCtx);
- 	if (ret < 0) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecKeyAdoptData",
-+            xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-+            "xmlSecKeyInfoNodeWrite",
- 			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"data=%s",
--			xmlSecErrorsSafeString(xmlSecKeyDataGetName(x509Data)));
--	    goto done;
--	}
--	x509Data = NULL;
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+        xmlSecKeyInfoCtxFinalize(&keyInfoCtx);
-+        xmlFreeDoc(doc); 
-+        return(-1);
-+        }
- 
--	retval = key;
--	key = NULL;
-+        xmlSecKeyInfoCtxFinalize(&keyInfoCtx);
-     }
- 
--done:
--    if (cert != NULL) {
--	CERT_DestroyCertificate(cert);
--    }
--    if (pubkey != NULL) {
--	SECKEY_DestroyPublicKey(pubkey);
--    }
--    if (privkey != NULL) {
--	SECKEY_DestroyPrivateKey(privkey);
--    }
--    if (data != NULL) {
--	xmlSecKeyDataDestroy(data);
--    }
--    if (x509Data != NULL) {
--	xmlSecKeyDataDestroy(x509Data);
--    }
--    if (key != NULL) {
--	xmlSecKeyDestroy(key);
-+    /* now write result */
-+    ret = xmlSaveFormatFile(filename, doc, 1);
-+    if (ret < 0) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+                    xmlSecErrorsSafeString(xmlSecKeyStoreGetName(store)),
-+            "xmlSaveFormatFile",
-+            XMLSEC_ERRORS_R_XML_FAILED,
-+            "filename=%s", 
-+            xmlSecErrorsSafeString(filename));
-+        xmlFreeDoc(doc); 
-+        return(-1);
-     }
- 
--    return (retval);
-+    xmlFreeDoc(doc);
-+    return(0);
- }
---- misc/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-21 14:07:19.223802688 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-21 14:02:48.548869372 +0200
-@@ -1 +1,1213 @@
--dummy
-+/** 
-+ *
-+ * XMLSec library
-+ * 
-+ * AES Algorithm support
-+ * 
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ * 
-+ * Copyright .................................
-+ */
-+#include "globals.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+
-+#include <nss.h>
-+#include <pk11func.h>
-+#include <hasht.h>
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/xmltree.h>
-+#include <xmlsec/keys.h>
-+#include <xmlsec/transforms.h>
-+#include <xmlsec/errors.h>
-+
-+#include <xmlsec/nss/crypto.h>
-+#include <xmlsec/nss/ciphers.h>
-+
-+#define XMLSEC_NSS_AES128_KEY_SIZE		16
-+#define XMLSEC_NSS_AES192_KEY_SIZE		24
-+#define XMLSEC_NSS_AES256_KEY_SIZE		32
-+#define XMLSEC_NSS_DES3_KEY_SIZE		24
-+#define XMLSEC_NSS_DES3_KEY_LENGTH      24
-+#define XMLSEC_NSS_DES3_IV_LENGTH       8
-+#define XMLSEC_NSS_DES3_BLOCK_LENGTH    8
-+
-+static xmlSecByte xmlSecNssKWDes3Iv[XMLSEC_NSS_DES3_IV_LENGTH] = { 
-+    0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 
-+};
-+
-+/*********************************************************************
-+ *
-+ * key wrap transforms
-+ *
-+ ********************************************************************/
-+typedef struct _xmlSecNssKeyWrapCtx			xmlSecNssKeyWrapCtx ;
-+typedef struct _xmlSecNssKeyWrapCtx*		xmlSecNssKeyWrapCtxPtr ;
-+
-+#define xmlSecNssKeyWrapSize	\
-+	( sizeof( xmlSecTransform ) + sizeof( xmlSecNssKeyWrapCtx ) )
-+
-+#define xmlSecNssKeyWrapGetCtx( transform ) \
-+	( ( xmlSecNssKeyWrapCtxPtr )( ( ( xmlSecByte* )( transform ) ) + sizeof( xmlSecTransform ) ) )
-+
-+struct _xmlSecNssKeyWrapCtx {
-+	CK_MECHANISM_TYPE		cipher ;
-+	PK11SymKey*				symkey ;
-+	xmlSecKeyDataId			keyId ;
-+	xmlSecBufferPtr			material ; /* to be encrypted/decrypted key material */
-+} ;
-+
-+static int 		xmlSecNssKeyWrapInitialize(xmlSecTransformPtr transform);
-+static void 	xmlSecNssKeyWrapFinalize(xmlSecTransformPtr transform);
-+static int  	xmlSecNssKeyWrapSetKeyReq(xmlSecTransformPtr transform, 
-+							 xmlSecKeyReqPtr keyReq);
-+static int  	xmlSecNssKeyWrapSetKey(xmlSecTransformPtr transform, 
-+							 xmlSecKeyPtr key);
-+static int  	xmlSecNssKeyWrapExecute(xmlSecTransformPtr transform, 
-+							 int last,
-+							 xmlSecTransformCtxPtr transformCtx);
-+static xmlSecSize  	xmlSecNssKeyWrapGetKeySize(xmlSecTransformPtr transform);
-+
-+static int
-+xmlSecNssKeyWrapCheckId(
-+	xmlSecTransformPtr transform
-+) {
-+	#ifndef XMLSEC_NO_DES
-+	if( xmlSecTransformCheckId( transform, xmlSecNssTransformKWDes3Id ) ) {
-+		return(1);
-+	}
-+	#endif /* XMLSEC_NO_DES */
-+
-+	#ifndef XMLSEC_NO_AES
-+	if( xmlSecTransformCheckId( transform, xmlSecNssTransformKWAes128Id ) ||
-+		xmlSecTransformCheckId( transform, xmlSecNssTransformKWAes192Id ) ||
-+		xmlSecTransformCheckId( transform, xmlSecNssTransformKWAes256Id ) ) {
-+
-+		return(1);
-+    }
-+	#endif /* XMLSEC_NO_AES */
-+    
-+    return(0);
-+}
-+
-+static xmlSecSize  
-+xmlSecNssKeyWrapGetKeySize(xmlSecTransformPtr transform) {
-+#ifndef XMLSEC_NO_DES
-+	if( xmlSecTransformCheckId( transform, xmlSecNssTransformKWDes3Id ) ) {
-+		return(XMLSEC_NSS_DES3_KEY_SIZE);
-+	} else
-+#endif /* XMLSEC_NO_DES */
-+
-+#ifndef XMLSEC_NO_AES
-+    if(xmlSecTransformCheckId(transform, xmlSecNssTransformKWAes128Id)) {
-+		return(XMLSEC_NSS_AES128_KEY_SIZE);
-+    } else if(xmlSecTransformCheckId(transform, xmlSecNssTransformKWAes192Id)) {
-+		return(XMLSEC_NSS_AES192_KEY_SIZE);
-+    } else if(xmlSecTransformCheckId(transform, xmlSecNssTransformKWAes256Id)) {
-+		return(XMLSEC_NSS_AES256_KEY_SIZE);
-+    } else if(xmlSecTransformCheckId(transform, xmlSecNssTransformKWAes256Id)) {
-+		return(XMLSEC_NSS_AES256_KEY_SIZE);
-+    } else
-+#endif /* XMLSEC_NO_AES */
-+
-+	if(1)
-+   		return(0);
-+}
-+
-+
-+static int 
-+xmlSecNssKeyWrapInitialize(xmlSecTransformPtr transform) {
-+	xmlSecNssKeyWrapCtxPtr context ;
-+    int ret;
-+    
-+    xmlSecAssert2(xmlSecNssKeyWrapCheckId(transform), -1);
-+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssKeyWrapSize), -1);
-+    
-+	context = xmlSecNssKeyWrapGetCtx( transform ) ;
-+	xmlSecAssert2( context != NULL , -1 ) ;
-+
-+	#ifndef XMLSEC_NO_DES
-+	if( transform->id == xmlSecNssTransformKWDes3Id ) {
-+		context->cipher = CKM_DES3_CBC ;
-+		context->keyId = xmlSecNssKeyDataDesId ;
-+	} else
-+	#endif		/* XMLSEC_NO_DES */
-+
-+	#ifndef XMLSEC_NO_AES
-+	if( transform->id == xmlSecNssTransformKWAes128Id ) {
-+	/*	context->cipher = CKM_NETSCAPE_AES_KEY_WRAP ;*/
-+		context->cipher = CKM_AES_CBC ;
-+		context->keyId = xmlSecNssKeyDataAesId ;
-+	} else
-+	if( transform->id == xmlSecNssTransformKWAes192Id ) {
-+	/*	context->cipher = CKM_NETSCAPE_AES_KEY_WRAP ;*/
-+		context->cipher = CKM_AES_CBC ;
-+		context->keyId = xmlSecNssKeyDataAesId ;
-+	} else
-+	if( transform->id == xmlSecNssTransformKWAes256Id ) {
-+	/*	context->cipher = CKM_NETSCAPE_AES_KEY_WRAP ;*/
-+		context->cipher = CKM_AES_CBC ;
-+		context->keyId = xmlSecNssKeyDataAesId ;
-+	} else
-+	#endif		/* XMLSEC_NO_AES */
-+
-+
-+	if( 1 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
-+		    NULL ,
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+		    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	context->symkey = NULL ;
-+	context->material = NULL ;
-+
-+    return(0);
-+}
-+
-+static void 
-+xmlSecNssKeyWrapFinalize(xmlSecTransformPtr transform) {
-+	xmlSecNssKeyWrapCtxPtr context ;
-+    
-+    xmlSecAssert(xmlSecNssKeyWrapCheckId(transform));
-+    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecNssKeyWrapSize));
-+    
-+	context = xmlSecNssKeyWrapGetCtx( transform ) ;
-+	xmlSecAssert( context != NULL ) ;
-+
-+	if( context->symkey != NULL ) {
-+		PK11_FreeSymKey( context->symkey ) ;
-+		context->symkey = NULL ;
-+	}
-+
-+	if( context->material != NULL ) {
-+		xmlSecBufferDestroy(context->material);
-+		context->material = NULL ;
-+	}
-+}
-+
-+static int  
-+xmlSecNssKeyWrapSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
-+	xmlSecNssKeyWrapCtxPtr context ;
-+	xmlSecSize cipherSize = 0 ;
-+
-+    
-+    xmlSecAssert2(xmlSecNssKeyWrapCheckId(transform), -1);
-+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssKeyWrapSize), -1);
-+    xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-+    xmlSecAssert2(keyReq != NULL, -1);
-+    
-+	context = xmlSecNssKeyWrapGetCtx( transform ) ;
-+	xmlSecAssert2( context != NULL , -1 ) ;
-+
-+    keyReq->keyId 	 = context->keyId;
-+    keyReq->keyType  = xmlSecKeyDataTypeSymmetric;
-+    if(transform->operation == xmlSecTransformOperationEncrypt) {
-+		keyReq->keyUsage = xmlSecKeyUsageEncrypt;
-+    } else {
-+		keyReq->keyUsage = xmlSecKeyUsageDecrypt;
-+    }
-+
-+	keyReq->keyBitsSize = xmlSecNssKeyWrapGetKeySize( transform ) ;
-+
-+    return(0);
-+}
-+
-+static int  	
-+xmlSecNssKeyWrapSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
-+	xmlSecNssKeyWrapCtxPtr context = NULL ;
-+	xmlSecKeyDataPtr	keyData = NULL ;
-+	PK11SymKey*			symkey = NULL ;
-+
-+    xmlSecAssert2(xmlSecNssKeyWrapCheckId(transform), -1);
-+    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssKeyWrapSize), -1);
-+    xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-+    xmlSecAssert2(key != NULL, -1);
-+
-+	context = xmlSecNssKeyWrapGetCtx( transform ) ;
-+	if( context == NULL || context->keyId == NULL || context->symkey != NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+		    xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+		    "xmlSecNssKeyWrapGetCtx" ,
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+		    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+	xmlSecAssert2( xmlSecKeyCheckId( key, context->keyId ), -1 ) ;
-+
-+	keyData = xmlSecKeyGetValue( key ) ;
-+	if( keyData == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+		    xmlSecErrorsSafeString( xmlSecKeyGetName( key ) ) ,
-+		    "xmlSecKeyGetValue" ,
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+		    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	if( ( symkey = xmlSecNssSymKeyDataGetKey( keyData ) ) == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+		    xmlSecErrorsSafeString( xmlSecKeyDataGetName( keyData ) ) ,
-+		    "xmlSecNssSymKeyDataGetKey" ,
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+		    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	context->symkey = symkey ;
-+
-+	return(0) ;
-+}
-+
-+/**
-+ * key wrap transform
-+ */
-+static int 
-+xmlSecNssKeyWrapCtxInit(
-+	xmlSecNssKeyWrapCtxPtr		ctx ,
-+	xmlSecBufferPtr 			in ,
-+	xmlSecBufferPtr 			out ,
-+	int 						encrypt ,
-+	xmlSecTransformCtxPtr 		transformCtx
-+) {
-+	xmlSecSize			blockSize ;
-+
-+	xmlSecAssert2( ctx != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+	xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-+	xmlSecAssert2( in != NULL , -1 ) ;
-+	xmlSecAssert2( out != NULL , -1 ) ;
-+	xmlSecAssert2( transformCtx != NULL , -1 ) ;
-+
-+	if( ctx->material != NULL ) {
-+		xmlSecBufferDestroy( ctx->material ) ;
-+		ctx->material = NULL ;
-+	}
-+
-+	if( ( blockSize = PK11_GetBlockSize( ctx->cipher , NULL ) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_GetBlockSize" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	ctx->material = xmlSecBufferCreate( blockSize ) ;
-+	if( ctx->material == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferCreate" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	/* read raw key material into context */
-+	if( xmlSecBufferSetData( ctx->material, xmlSecBufferGetData(in), xmlSecBufferGetSize(in) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferSetData" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	if( xmlSecBufferRemoveHead( in , xmlSecBufferGetSize(in) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferRemoveHead" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	return(0);
-+}
-+
-+/**
-+ * key wrap transform update
-+ */
-+static int 
-+xmlSecNssKeyWrapCtxUpdate(
-+	xmlSecNssKeyWrapCtxPtr		ctx ,
-+	xmlSecBufferPtr 			in ,
-+	xmlSecBufferPtr 			out ,
-+	int 						encrypt ,
-+	xmlSecTransformCtxPtr 		transformCtx
-+) {
-+	xmlSecAssert2( ctx != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+	xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->material != NULL , -1 ) ;
-+	xmlSecAssert2( in != NULL , -1 ) ;
-+	xmlSecAssert2( out != NULL , -1 ) ;
-+	xmlSecAssert2( transformCtx != NULL , -1 ) ;
-+
-+	/* read raw key material and append into context */
-+	if( xmlSecBufferAppend( ctx->material, xmlSecBufferGetData(in), xmlSecBufferGetSize(in) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferAppend" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	if( xmlSecBufferRemoveHead( in , xmlSecBufferGetSize(in) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferRemoveHead" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	return(0);
-+}
-+
-+static int 
-+xmlSecNssKWDes3BufferReverse(xmlSecByte *buf, xmlSecSize size) {
-+    xmlSecSize s;
-+    xmlSecSize i;
-+    xmlSecByte c;
-+    
-+    xmlSecAssert2(buf != NULL, -1);
-+    
-+    s = size / 2;
-+    --size;
-+    for(i = 0; i < s; ++i) {
-+	c = buf[i];
-+	buf[i] = buf[size - i];
-+	buf[size - i] = c;
-+    }
-+    return(0);
-+}
-+
-+static xmlSecByte *
-+xmlSecNssComputeSHA1(const xmlSecByte *in, xmlSecSize inSize, 
-+		     xmlSecByte *out, xmlSecSize outSize)
-+{
-+    PK11Context *context = NULL;
-+    SECStatus s;
-+    xmlSecByte *digest = NULL;
-+    unsigned int len;
-+
-+    xmlSecAssert2(in != NULL, NULL);
-+    xmlSecAssert2(out != NULL, NULL);
-+    xmlSecAssert2(outSize >= SHA1_LENGTH, NULL);
-+
-+    /* Create a context for hashing (digesting) */
-+    context = PK11_CreateDigestContext(SEC_OID_SHA1);
-+    if (context == NULL) {
-+	xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_CreateDigestContext",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "error code = %d", PORT_GetError());
-+	goto done;
-+    }
-+
-+    s = PK11_DigestBegin(context);
-+    if (s != SECSuccess) { 
-+	xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_DigestBegin",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "error code = %d", PORT_GetError());
-+	goto done;
-+    }
-+
-+    s = PK11_DigestOp(context, in, inSize);
-+    if (s != SECSuccess) {
-+	xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_DigestOp",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "error code = %d", PORT_GetError());
-+	goto done;
-+    }
-+
-+    s = PK11_DigestFinal(context, out, &len, outSize);
-+    if (s != SECSuccess) {
-+	xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_DigestFinal",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "error code = %d", PORT_GetError());
-+	goto done;
-+    }
-+    xmlSecAssert2(len == SHA1_LENGTH, NULL);
-+
-+    digest = out;
-+
-+done:
-+    if (context != NULL) {
-+	PK11_DestroyContext(context, PR_TRUE);
-+    }
-+    return (digest);
-+}
-+
-+static int
-+xmlSecNssKWDes3Encrypt(
-+	PK11SymKey*					symKey ,
-+	CK_MECHANISM_TYPE			cipherMech ,
-+    const xmlSecByte*			iv ,
-+	xmlSecSize					ivSize ,
-+    const xmlSecByte*			in ,
-+	xmlSecSize					inSize ,
-+    xmlSecByte*     			out ,
-+	xmlSecSize					outSize ,
-+	int							enc
-+) {
-+    PK11Context*        EncContext = NULL;
-+	SECItem				ivItem ;
-+	SECItem*			secParam = NULL ;
-+    int					tmp1_outlen;
-+    unsigned int		tmp2_outlen;
-+	int                 result_len = -1;
-+	SECStatus           rv;
-+
-+	xmlSecAssert2( cipherMech != CKM_INVALID_MECHANISM , -1 ) ;
-+	xmlSecAssert2( symKey != NULL , -1 ) ;
-+    xmlSecAssert2(iv != NULL, -1);
-+    xmlSecAssert2(ivSize == XMLSEC_NSS_DES3_IV_LENGTH, -1);
-+    xmlSecAssert2(in != NULL, -1);
-+    xmlSecAssert2(inSize > 0, -1);
-+    xmlSecAssert2(out != NULL, -1);
-+    xmlSecAssert2(outSize >= inSize, -1);
-+ 
-+	/* Prepare IV */
-+	ivItem.data = ( unsigned char* )iv ;
-+	ivItem.len = ivSize ;
-+
-+    secParam = PK11_ParamFromIV(cipherMech, &ivItem);
-+    if (secParam == NULL) {
-+		xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_ParamFromIV",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "Error code = %d", PORT_GetError());
-+		goto done;
-+    }
-+
-+    EncContext = PK11_CreateContextBySymKey(cipherMech, 
-+		    			    enc ? CKA_ENCRYPT : CKA_DECRYPT,
-+					    symKey, secParam);
-+    if (EncContext == NULL) {
-+		xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_CreateContextBySymKey",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "Error code = %d", PORT_GetError());
-+		goto done;
-+    }
-+
-+    tmp1_outlen = tmp2_outlen = 0;
-+    rv = PK11_CipherOp(EncContext, out, &tmp1_outlen, outSize,
-+		       (unsigned char *)in, inSize);
-+    if (rv != SECSuccess) {
-+		xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_CipherOp",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "Error code = %d", PORT_GetError());
-+		goto done;
-+    }
-+
-+    rv = PK11_DigestFinal(EncContext, out+tmp1_outlen, 
-+		    	  &tmp2_outlen, outSize-tmp1_outlen);
-+    if (rv != SECSuccess) {
-+		xmlSecError(XMLSEC_ERRORS_HERE,
-+		    NULL,
-+		    "PK11_DigestFinal",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    "Error code = %d", PORT_GetError());
-+		goto done;
-+    }
-+
-+    result_len = tmp1_outlen + tmp2_outlen;
-+
-+done:
-+    if (secParam) {
-+		SECITEM_FreeItem(secParam, PR_TRUE);
-+    }
-+    if (EncContext) {
-+	PK11_DestroyContext(EncContext, PR_TRUE);
-+    }
-+
-+    return(result_len);
-+}
-+
-+static int
-+xmlSecNssKeyWrapDesOp(
-+	xmlSecNssKeyWrapCtxPtr		ctx ,
-+	int 						encrypt ,
-+	xmlSecBufferPtr 			result
-+) {
-+    xmlSecByte sha1[SHA1_LENGTH];    
-+    xmlSecByte iv[XMLSEC_NSS_DES3_IV_LENGTH];
-+    xmlSecByte* in;    
-+    xmlSecSize inSize;    
-+    xmlSecByte* out;    
-+    xmlSecSize outSize;    
-+    xmlSecSize s;    
-+    int ret;
-+    SECStatus status;
-+
-+	xmlSecAssert2( ctx != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+	xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->material != NULL , -1 ) ;
-+	xmlSecAssert2( result != NULL , -1 ) ;
-+
-+	in = xmlSecBufferGetData(ctx->material);
-+	inSize = xmlSecBufferGetSize(ctx->material) ;
-+	out = xmlSecBufferGetData(result);
-+	outSize = xmlSecBufferGetMaxSize(result) ;
-+	if( encrypt ) {
-+    	/* step 2: calculate sha1 and CMS */
-+    	if(xmlSecNssComputeSHA1(in, inSize, sha1, SHA1_LENGTH) == NULL) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+			    NULL,
-+			    "xmlSecNssComputeSHA1",
-+			    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+			    XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+
-+	    /* step 3: construct WKCKS */
-+    	memcpy(out, in, inSize);
-+	    memcpy(out + inSize, sha1, XMLSEC_NSS_DES3_BLOCK_LENGTH);
-+
-+    	/* step 4: generate random iv */
-+    	status = PK11_GenerateRandom(iv, XMLSEC_NSS_DES3_IV_LENGTH);
-+    	if(status != SECSuccess) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+		    	NULL,
-+		    	"PK11_GenerateRandom",
-+		    	XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    	"error code = %d", PORT_GetError());
-+			return(-1);    
-+    	}	
-+
-+    	/* step 5: first encryption, result is TEMP1 */
-+    	ret = xmlSecNssKWDes3Encrypt( ctx->symkey, ctx->cipher,
-+				    iv, XMLSEC_NSS_DES3_IV_LENGTH, 
-+					out, inSize + XMLSEC_NSS_DES3_IV_LENGTH,
-+					out, outSize, 1);
-+    	if(ret < 0) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+		    	NULL,
-+		    	"xmlSecNssKWDes3Encrypt",
-+		    	XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+		    	XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+
-+    	/* step 6: construct TEMP2=IV || TEMP1 */
-+    	memmove(out + XMLSEC_NSS_DES3_IV_LENGTH, out, 
-+	    	inSize + XMLSEC_NSS_DES3_IV_LENGTH);
-+    	memcpy(out, iv, XMLSEC_NSS_DES3_IV_LENGTH);
-+    		s = ret + XMLSEC_NSS_DES3_IV_LENGTH; 
-+    
-+    	/* step 7: reverse octets order, result is TEMP3 */
-+	    ret = xmlSecNssKWDes3BufferReverse(out, s);
-+   	 	if(ret < 0) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+			    NULL,
-+			    "xmlSecNssKWDes3BufferReverse",
-+			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+
-+    	/* step 8: second encryption with static IV */
-+    	ret = xmlSecNssKWDes3Encrypt( ctx->symkey, ctx->cipher,
-+				    xmlSecNssKWDes3Iv, XMLSEC_NSS_DES3_IV_LENGTH, 
-+					out, s,
-+					out, outSize, 1);
-+    	if(ret < 0) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+			    NULL,
-+			    "xmlSecNssKWDes3Encrypt",
-+			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+		s = ret;
-+
-+		if( xmlSecBufferSetSize( result , s ) < 0 ) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+			    NULL,
-+			    "xmlSecBufferSetSize",
-+			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+		}
-+	} else {
-+    	/* step 2: first decryption with static IV, result is TEMP3 */
-+    	ret = xmlSecNssKWDes3Encrypt( ctx->symkey, ctx->cipher,
-+				    xmlSecNssKWDes3Iv, XMLSEC_NSS_DES3_IV_LENGTH, 
-+					in, inSize,
-+					out, outSize, 0);
-+    	if((ret < 0) || (ret < XMLSEC_NSS_DES3_IV_LENGTH)) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+		    	NULL,
-+		    	"xmlSecNssKWDes3Encrypt",
-+		    	XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+		    	XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+    	s = ret; 
-+    
-+    	/* step 3: reverse octets order in TEMP3, result is TEMP2 */
-+    	ret = xmlSecNssKWDes3BufferReverse(out, s);
-+    	if(ret < 0) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+		    	NULL,
-+		    	"xmlSecNssKWDes3BufferReverse",
-+		    	XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+		    	XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+
-+    	/* steps 4 and 5: get IV and decrypt second time, result is WKCKS */
-+    	ret = xmlSecNssKWDes3Encrypt( ctx->symkey, ctx->cipher,
-+				    out, XMLSEC_NSS_DES3_IV_LENGTH, 
-+					out+XMLSEC_NSS_DES3_IV_LENGTH, s-XMLSEC_NSS_DES3_IV_LENGTH,
-+					out, outSize, 0);
-+    	if((ret < 0) || (ret < XMLSEC_NSS_DES3_BLOCK_LENGTH)) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+		    	NULL,
-+		    	"xmlSecNssKWDes3Encrypt",
-+		    	XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+		    	XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+    	}
-+		s = ret - XMLSEC_NSS_DES3_IV_LENGTH;
-+    
-+    	/* steps 6 and 7: calculate SHA1 and validate it */
-+    	if(xmlSecNssComputeSHA1(out, s, sha1, SHA1_LENGTH) == NULL) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+		    	NULL,
-+		    	"xmlSecNssComputeSHA1",
-+		    	XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    	XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+   		 }
-+
-+		if(memcmp(sha1, out + s, XMLSEC_NSS_DES3_BLOCK_LENGTH) != 0) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+			    NULL,
-+		   		 NULL,
-+			    XMLSEC_ERRORS_R_INVALID_DATA,
-+			    "SHA1 does not match");
-+			return(-1);	    
-+		}
-+
-+		if( xmlSecBufferSetSize( result , s ) < 0 ) {
-+			xmlSecError(XMLSEC_ERRORS_HERE,
-+			    NULL,
-+			    "xmlSecBufferSetSize",
-+			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_NO_MESSAGE);
-+			return(-1);	    
-+		}
-+	}
-+
-+	return(0);
-+}
-+
-+static int
-+xmlSecNssKeyWrapAesOp(
-+	xmlSecNssKeyWrapCtxPtr		ctx ,
-+	int 						encrypt ,
-+	xmlSecBufferPtr 			result
-+) {
-+    PK11Context*        cipherCtx = NULL;
-+	SECItem				ivItem ;
-+	SECItem*			secParam = NULL ;
-+	xmlSecSize			inSize ;
-+	xmlSecSize			inBlocks ;
-+	int					blockSize ;
-+	int					midSize ;
-+	int					finSize ;
-+	xmlSecByte*			out ;
-+    xmlSecSize			outSize;    
-+
-+	xmlSecAssert2( ctx != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+	xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->material != NULL , -1 ) ;
-+	xmlSecAssert2( result != NULL , -1 ) ;
-+
-+	/* Do not set any IV */
-+    memset(&ivItem, 0, sizeof(ivItem));
-+
-+	/* Get block size */
-+	if( ( blockSize = PK11_GetBlockSize( ctx->cipher , NULL ) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_GetBlockSize" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	inSize = xmlSecBufferGetSize( ctx->material ) ;
-+	if( xmlSecBufferSetMaxSize( result , inSize + blockSize ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferSetMaxSize" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	/* Get Param for context initialization */
-+	if( ( secParam = PK11_ParamFromIV( ctx->cipher , &ivItem ) ) == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_ParamFromIV" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	cipherCtx = PK11_CreateContextBySymKey( ctx->cipher , encrypt ? CKA_ENCRYPT : CKA_DECRYPT , ctx->symkey , secParam ) ;
-+	if( cipherCtx == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_CreateContextBySymKey" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		SECITEM_FreeItem( secParam , PR_TRUE ) ;
-+		return(-1);    
-+	}
-+
-+	out = xmlSecBufferGetData(result) ;
-+	outSize = xmlSecBufferGetMaxSize(result) ;
-+	if( PK11_CipherOp( cipherCtx , out, &midSize , outSize , xmlSecBufferGetData( ctx->material ) , inSize ) != SECSuccess ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_CipherOp" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	if( PK11_DigestFinal( cipherCtx , out + midSize , &finSize , outSize - midSize ) != SECSuccess ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_DigestFinal" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	if( xmlSecBufferSetSize( result , midSize + finSize ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferSetSize" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	return 0 ;
-+}
-+
-+/**
-+ * Block cipher transform final
-+ */
-+static int 
-+xmlSecNssKeyWrapCtxFinal(
-+	xmlSecNssKeyWrapCtxPtr		ctx ,
-+	xmlSecBufferPtr 			in ,
-+	xmlSecBufferPtr 			out ,
-+	int 						encrypt ,
-+	xmlSecTransformCtxPtr 		transformCtx
-+) {
-+	PK11SymKey*			targetKey ;
-+	xmlSecSize			blockSize ;
-+	xmlSecBufferPtr		result ;
-+
-+	xmlSecAssert2( ctx != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+	xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-+	xmlSecAssert2( ctx->material != NULL , -1 ) ;
-+	xmlSecAssert2( in != NULL , -1 ) ;
-+	xmlSecAssert2( out != NULL , -1 ) ;
-+	xmlSecAssert2( transformCtx != NULL , -1 ) ;
-+
-+	/* read raw key material and append into context */
-+	if( xmlSecBufferAppend( ctx->material, xmlSecBufferGetData(in), xmlSecBufferGetSize(in) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferAppend" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	if( xmlSecBufferRemoveHead( in , xmlSecBufferGetSize(in) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferRemoveHead" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	/* Now we get all of the key materail */
-+	/* from now on we will wrap or unwrap the key */
-+	if( ( blockSize = PK11_GetBlockSize( ctx->cipher , NULL ) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"PK11_GetBlockSize" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	result = xmlSecBufferCreate( blockSize ) ;
-+	if( result == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferCreate" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	switch( ctx->cipher ) {
-+		case CKM_DES3_CBC :
-+			if( xmlSecNssKeyWrapDesOp(ctx, encrypt, result) < 0 ) {
-+				xmlSecError( XMLSEC_ERRORS_HERE ,
-+					NULL ,
-+					"xmlSecNssKeyWrapDesOp" ,
-+					XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+					XMLSEC_ERRORS_NO_MESSAGE ) ;
-+				xmlSecBufferDestroy(result);
-+				return(-1);    
-+			}
-+			break ;
-+	/*	case CKM_NETSCAPE_AES_KEY_WRAP :*/
-+		case CKM_AES_CBC :
-+			if( xmlSecNssKeyWrapAesOp(ctx, encrypt, result) < 0 ) {
-+				xmlSecError( XMLSEC_ERRORS_HERE ,
-+					NULL ,
-+					"xmlSecNssKeyWrapAesOp" ,
-+					XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+					XMLSEC_ERRORS_NO_MESSAGE ) ;
-+				xmlSecBufferDestroy(result);
-+				return(-1);    
-+			}
-+			break ;
-+	}
-+
-+	/* Write output */
-+	if( xmlSecBufferAppend( out, xmlSecBufferGetData(result), xmlSecBufferGetSize(result) ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			"xmlSecBufferAppend" ,
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		xmlSecBufferDestroy(result);
-+		return(-1);    
-+	}
-+	xmlSecBufferDestroy(result);
-+
-+	return(0);
-+}
-+
-+static int 
-+xmlSecNssKeyWrapExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
-+	xmlSecNssKeyWrapCtxPtr 	context = NULL ;
-+	xmlSecBufferPtr			inBuf, outBuf ; 
-+	int						operation ;
-+	int						rtv ;
-+
-+	xmlSecAssert2( xmlSecNssKeyWrapCheckId( transform ), -1 ) ;
-+	xmlSecAssert2( xmlSecTransformCheckSize( transform, xmlSecNssKeyWrapSize ), -1 ) ;
-+    xmlSecAssert2( ( transform->operation == xmlSecTransformOperationEncrypt ) || ( transform->operation == xmlSecTransformOperationDecrypt ), -1 ) ;
-+	xmlSecAssert2( transformCtx != NULL , -1 ) ;
-+
-+	context = xmlSecNssKeyWrapGetCtx( transform ) ;
-+	if( context == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+		    xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+		    "xmlSecNssKeyWrapGetCtx" ,
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+		    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return(-1);    
-+	}
-+
-+	inBuf = &( transform->inBuf ) ;
-+	outBuf = &( transform->outBuf ) ;
-+
-+	if( transform->status == xmlSecTransformStatusNone ) {
-+		transform->status = xmlSecTransformStatusWorking ;
-+	}
-+
-+	operation = ( transform->operation == xmlSecTransformOperationEncrypt ) ? 1 : 0 ;
-+	if( transform->status == xmlSecTransformStatusWorking ) {
-+		if( context->material == NULL ) {
-+			rtv = xmlSecNssKeyWrapCtxInit( context, inBuf , outBuf , operation , transformCtx ) ;
-+			if( rtv < 0 ) {
-+				xmlSecError( XMLSEC_ERRORS_HERE , 
-+					xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+					"xmlSecNssKeyWrapCtxInit" ,
-+					XMLSEC_ERRORS_R_INVALID_STATUS ,
-+					XMLSEC_ERRORS_NO_MESSAGE ) ;
-+				return(-1);
-+			}
-+		}
-+
-+		if( context->material == NULL && last != 0 ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE , 
-+				xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_INVALID_STATUS ,
-+				"No enough data to intialize transform" ) ;
-+			return(-1);
-+		}
-+
-+		if( context->material != NULL ) {
-+			rtv = xmlSecNssKeyWrapCtxUpdate( context, inBuf , outBuf , operation , transformCtx ) ;
-+			if( rtv < 0 ) {
-+				xmlSecError( XMLSEC_ERRORS_HERE , 
-+					xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+					"xmlSecNssKeyWrapCtxUpdate" ,
-+					XMLSEC_ERRORS_R_INVALID_STATUS ,
-+					XMLSEC_ERRORS_NO_MESSAGE ) ;
-+				return(-1);
-+			}
-+		}
-+		
-+		if( last ) {
-+			rtv = xmlSecNssKeyWrapCtxFinal( context, inBuf , outBuf , operation , transformCtx ) ;
-+			if( rtv < 0 ) {
-+				xmlSecError( XMLSEC_ERRORS_HERE , 
-+					xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+					"xmlSecNssKeyWrapCtxFinal" ,
-+					XMLSEC_ERRORS_R_INVALID_STATUS ,
-+					XMLSEC_ERRORS_NO_MESSAGE ) ;
-+				return(-1);
-+			}
-+			transform->status = xmlSecTransformStatusFinished ;
-+		}
-+	} else if( transform->status == xmlSecTransformStatusFinished ) {
-+		if( xmlSecBufferGetSize( inBuf ) != 0 ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE , 
-+				xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_INVALID_STATUS ,
-+				"status=%d", transform->status ) ;
-+			return(-1);
-+		}
-+	} else {
-+		xmlSecError( XMLSEC_ERRORS_HERE , 
-+			xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+			NULL ,
-+			XMLSEC_ERRORS_R_INVALID_STATUS ,
-+			"status=%d", transform->status ) ;
-+		return(-1);
-+	}
-+
-+	return(0);
-+}
-+
-+#ifndef XMLSEC_NO_AES
-+
-+
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssKWAes128Klass = {
-+#else
-+static xmlSecTransformKlass xmlSecNssKWAes128Klass = {
-+#endif
-+    /* klass/object sizes */
-+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-+    xmlSecNssKeyWrapSize,				/* xmlSecSize objSize */
-+
-+    xmlSecNameKWAes128,				/* const xmlChar* name; */
-+    xmlSecHrefKWAes128,				/* const xmlChar* href; */
-+    xmlSecTransformUsageEncryptionMethod,	/* xmlSecAlgorithmUsage usage; */
-+
-+    xmlSecNssKeyWrapInitialize, 			/* xmlSecTransformInitializeMethod initialize; */
-+    xmlSecNssKeyWrapFinalize,			/* xmlSecTransformFinalizeMethod finalize; */
-+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
-+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
-+    xmlSecNssKeyWrapSetKeyReq,			/* xmlSecTransformSetKeyMethod setKeyReq; */
-+    xmlSecNssKeyWrapSetKey,			/* xmlSecTransformSetKeyMethod setKey; */
-+    NULL,					/* xmlSecTransformValidateMethod validate; */
-+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
-+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
-+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
-+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
-+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
-+    xmlSecNssKeyWrapExecute,			/* xmlSecTransformExecuteMethod execute; */
-+    
-+    NULL,					/* void* reserved0; */
-+    NULL,					/* void* reserved1; */
-+};
-+
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssKWAes192Klass = {
-+#else
-+static xmlSecTransformKlass xmlSecNssKWAes192Klass = {
-+#endif
-+    /* klass/object sizes */
-+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-+    xmlSecNssKeyWrapSize,				/* xmlSecSize objSize */
-+
-+    xmlSecNameKWAes192,				/* const xmlChar* name; */
-+    xmlSecHrefKWAes192,				/* const xmlChar* href; */
-+    xmlSecTransformUsageEncryptionMethod,	/* xmlSecAlgorithmUsage usage; */
-+
-+    xmlSecNssKeyWrapInitialize, 			/* xmlSecTransformInitializeMethod initialize; */
-+    xmlSecNssKeyWrapFinalize,			/* xmlSecTransformFinalizeMethod finalize; */
-+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
-+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
-+    xmlSecNssKeyWrapSetKeyReq,			/* xmlSecTransformSetKeyMethod setKeyReq; */
-+    xmlSecNssKeyWrapSetKey,			/* xmlSecTransformSetKeyMethod setKey; */
-+    NULL,					/* xmlSecTransformValidateMethod validate; */
-+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
-+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
-+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
-+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
-+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
-+    xmlSecNssKeyWrapExecute,			/* xmlSecTransformExecuteMethod execute; */
-+    
-+    NULL,					/* void* reserved0; */
-+    NULL,					/* void* reserved1; */
-+};
-+
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssKWAes256Klass = {
-+#else
-+static xmlSecTransformKlass xmlSecNssKWAes256Klass = {
-+#endif
-+    /* klass/object sizes */
-+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-+    xmlSecNssKeyWrapSize,				/* xmlSecSize objSize */
-+
-+    xmlSecNameKWAes256,				/* const xmlChar* name; */
-+    xmlSecHrefKWAes256,				/* const xmlChar* href; */
-+    xmlSecTransformUsageEncryptionMethod,	/* xmlSecAlgorithmUsage usage; */
-+
-+    xmlSecNssKeyWrapInitialize, 			/* xmlSecTransformInitializeMethod initialize; */
-+    xmlSecNssKeyWrapFinalize,			/* xmlSecTransformFinalizeMethod finalize; */
-+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
-+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
-+    xmlSecNssKeyWrapSetKeyReq,			/* xmlSecTransformSetKeyMethod setKeyReq; */
-+    xmlSecNssKeyWrapSetKey,			/* xmlSecTransformSetKeyMethod setKey; */
-+    NULL,					/* xmlSecTransformValidateMethod validate; */
-+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
-+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
-+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
-+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
-+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
-+    xmlSecNssKeyWrapExecute,			/* xmlSecTransformExecuteMethod execute; */
-+    
-+    NULL,					/* void* reserved0; */
-+    NULL,					/* void* reserved1; */
-+};
-+
-+/** 
-+ * xmlSecNssTransformKWAes128GetKlass:
-+ *
-+ * The AES-128 key wrapper transform klass.
-+ *
-+ * Returns AES-128 key wrapper transform klass.
-+ */
-+xmlSecTransformId 
-+xmlSecNssTransformKWAes128GetKlass(void) {
-+    return(&xmlSecNssKWAes128Klass);
-+}
-+
-+/** 
-+ * xmlSecNssTransformKWAes192GetKlass:
-+ *
-+ * The AES-192 key wrapper transform klass.
-+ *
-+ * Returns AES-192 key wrapper transform klass.
-+ */
-+xmlSecTransformId 
-+xmlSecNssTransformKWAes192GetKlass(void) {
-+    return(&xmlSecNssKWAes192Klass);
-+}
-+
-+/** 
-+ *
-+ * The AES-256 key wrapper transform klass.
-+ *
-+ * Returns AES-256 key wrapper transform klass.
-+ */
-+xmlSecTransformId 
-+xmlSecNssTransformKWAes256GetKlass(void) {
-+    return(&xmlSecNssKWAes256Klass);
-+}
-+
-+#endif /* XMLSEC_NO_AES */
-+
-+
-+#ifndef XMLSEC_NO_DES
-+
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecNssKWDes3Klass = {
-+#else
-+static xmlSecTransformKlass xmlSecNssKWDes3Klass = {
-+#endif
-+    /* klass/object sizes */
-+    sizeof(xmlSecTransformKlass),		/* xmlSecSize klassSize */
-+    xmlSecNssKeyWrapSize,			/* xmlSecSize objSize */
-+
-+    xmlSecNameKWDes3,				/* const xmlChar* name; */
-+    xmlSecHrefKWDes3, 				/* const xmlChar* href; */
-+    xmlSecTransformUsageEncryptionMethod,	/* xmlSecAlgorithmUsage usage; */
-+
-+    xmlSecNssKeyWrapInitialize, 			/* xmlSecTransformInitializeMethod initialize; */
-+    xmlSecNssKeyWrapFinalize,			/* xmlSecTransformFinalizeMethod finalize; */
-+    NULL,					/* xmlSecTransformNodeReadMethod readNode; */
-+    NULL,					/* xmlSecTransformNodeWriteMethod writeNode; */
-+    xmlSecNssKeyWrapSetKeyReq,			/* xmlSecTransformSetKeyMethod setKeyReq; */
-+    xmlSecNssKeyWrapSetKey,			/* xmlSecTransformSetKeyMethod setKey; */
-+    NULL,					/* xmlSecTransformValidateMethod validate; */
-+    xmlSecTransformDefaultGetDataType,		/* xmlSecTransformGetDataTypeMethod getDataType; */
-+    xmlSecTransformDefaultPushBin,		/* xmlSecTransformPushBinMethod pushBin; */
-+    xmlSecTransformDefaultPopBin,		/* xmlSecTransformPopBinMethod popBin; */
-+    NULL,					/* xmlSecTransformPushXmlMethod pushXml; */
-+    NULL,					/* xmlSecTransformPopXmlMethod popXml; */
-+    xmlSecNssKeyWrapExecute,			/* xmlSecTransformExecuteMethod execute; */
-+    
-+    NULL,					/* void* reserved0; */
-+    NULL,					/* void* reserved1; */
-+};
-+
-+/** 
-+ * xmlSecNssTransformKWDes3GetKlass:
-+ * 
-+ * The Triple DES key wrapper transform klass.
-+ *
-+ * Returns Triple DES key wrapper transform klass.
-+ */
-+xmlSecTransformId 
-+xmlSecNssTransformKWDes3GetKlass(void) {
-+    return(&xmlSecNssKWDes3Klass);
-+}
-+
-+#endif /* XMLSEC_NO_DES */
-+
---- misc/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/pkikeys.c	2009-09-21 14:02:48.657352624 +0200
-@@ -24,6 +24,7 @@
- #include <xmlsec/nss/crypto.h>
- #include <xmlsec/nss/bignum.h>
- #include <xmlsec/nss/pkikeys.h>
-+#include <xmlsec/nss/tokens.h>
- 
- /**************************************************************************
-  *
-@@ -115,6 +116,8 @@
-                           xmlSecNssPKIKeyDataCtxPtr ctxSrc)
- {
-     xmlSecNSSPKIKeyDataCtxFree(ctxDst);
-+    ctxDst->privkey = NULL ;
-+    ctxDst->pubkey = NULL ;
-     if (ctxSrc->privkey != NULL) {
- 	ctxDst->privkey = SECKEY_CopyPrivateKey(ctxSrc->privkey);
- 	if(ctxDst->privkey == NULL) {
-@@ -588,13 +591,13 @@
- 	goto done;
-     }
- 
--    slot = PK11_GetBestSlot(CKM_DSA, NULL);
-+    slot = xmlSecNssSlotGet(CKM_DSA);
-     if(slot == NULL) {
- 	xmlSecError(XMLSEC_ERRORS_HERE,
- 		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--		    "PK11_GetBestSlot",
-+		    "xmlSecNssSlotGet",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
-+		    "error code=%d", PORT_GetError());
- 	ret = -1;
- 	goto done;
-     }
-@@ -792,14 +795,14 @@
-     if (slot != NULL) {
- 	PK11_FreeSlot(slot);
-     }
--    if (ret != 0) {
-+
- 	if (pubkey != NULL) {
- 	    SECKEY_DestroyPublicKey(pubkey);
- 	}
- 	if (data != NULL) {
- 	    xmlSecKeyDataDestroy(data);
- 	}
--    }
-+
-     return(ret);
- }
- 
-@@ -818,7 +821,7 @@
- 
-     ctx = xmlSecNssPKIKeyDataGetCtx(xmlSecKeyGetValue(key));
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);
-+/*    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);*/
- 
-     if(((xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate) & keyInfoCtx->keyReq.keyType) == 0) {
- 	/* we can have only private key or public key */
-@@ -940,7 +943,8 @@
- 		    xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 		    "PK11_PQG_ParamGen",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--		    "size=%d", sizeBits);
-+		    "size=%d, error code=%d", sizeBits, PORT_GetError());
-+	ret = -1;
- 	goto done;
-     }
- 
-@@ -950,11 +954,12 @@
- 		    xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 		    "PK11_PQG_VerifyParams",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--		    "size=%d", sizeBits);
-+		    "size=%d, error code=%d", sizeBits, PORT_GetError());
-+	ret = -1;
- 	goto done;
-     }
- 
--    slot = PK11_GetBestSlot(CKM_DSA_KEY_PAIR_GEN, NULL);
-+    slot = xmlSecNssSlotGet(CKM_DSA_KEY_PAIR_GEN);
-     PK11_Authenticate(slot, PR_TRUE, NULL /* default pwd callback */);
-     privkey = PK11_GenerateKeyPair(slot, CKM_DSA_KEY_PAIR_GEN, pqgParams,
- 				   &pubkey, PR_FALSE, PR_TRUE, NULL);
-@@ -964,8 +969,9 @@
- 		    xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 		    "PK11_GenerateKeyPair",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
-+		    "error code=%d", PORT_GetError());
-         
-+	ret = -1;
- 	goto done;
-     }
- 
-@@ -979,6 +985,8 @@
- 	goto done;
-     }
- 
-+    privkey = NULL ;
-+    pubkey = NULL ;
-     ret = 0;
- 
- done:
-@@ -991,16 +999,13 @@
-     if (pqgVerify != NULL) {
- 	PK11_PQG_DestroyVerify(pqgVerify);
-     }
--    if (ret == 0) {
--	return (0);
--    }
-     if (pubkey != NULL) {
- 	SECKEY_DestroyPublicKey(pubkey);
-     }
-     if (privkey != NULL) {
- 	SECKEY_DestroyPrivateKey(privkey);
-     }
--    return(-1);
-+    return(ret);
- }
- 
- static xmlSecKeyDataType
-@@ -1010,10 +1015,10 @@
-     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDsaId), xmlSecKeyDataTypeUnknown);
-     ctx = xmlSecNssPKIKeyDataGetCtx(data);
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);
-+/*    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);*/
-     if (ctx->privkey != NULL) {
- 	return(xmlSecKeyDataTypePrivate | xmlSecKeyDataTypePublic);
--    } else {
-+    } else if( ctx->pubkey != NULL ) {
- 	return(xmlSecKeyDataTypePublic);
-     }
-        
-@@ -1027,7 +1032,7 @@
-     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDsaId), 0);
-     ctx = xmlSecNssPKIKeyDataGetCtx(data);
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);
-+/*    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == dsaKey, -1);*/
- 
-     return(8 * SECKEY_PublicKeyStrength(ctx->pubkey));
- }
-@@ -1216,13 +1221,13 @@
- 	goto done;
-     }
- 
--    slot = PK11_GetBestSlot(CKM_RSA_PKCS, NULL);
-+    slot = xmlSecNssSlotGet(CKM_RSA_PKCS);
-     if(slot == NULL) {
-         xmlSecError(XMLSEC_ERRORS_HERE,
-                     xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--                    "PK11_GetBestSlot",
-+                    "xmlSecNssSlotGet",
-                     XMLSEC_ERRORS_R_CRYPTO_FAILED,
--                    XMLSEC_ERRORS_NO_MESSAGE);
-+                    "error code=%d", PORT_GetError());
-         ret = -1;
-         goto done;
-     }
-@@ -1384,7 +1389,7 @@
- 
-     ctx = xmlSecNssPKIKeyDataGetCtx(xmlSecKeyGetValue(key));
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);
-+/*    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);*/
- 
- 
-     if(((xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate) & keyInfoCtx->keyReq.keyType) == 0) {
-@@ -1455,7 +1460,7 @@
-     params.keySizeInBits = sizeBits;
-     params.pe = 65537;
- 
--    slot = PK11_GetBestSlot(CKM_RSA_PKCS_KEY_PAIR_GEN, NULL);
-+    slot = xmlSecNssSlotGet(CKM_RSA_PKCS_KEY_PAIR_GEN);
-     PK11_Authenticate(slot, PR_TRUE, NULL /* default pwd callback */);
-     privkey = PK11_GenerateKeyPair(slot, CKM_RSA_PKCS_KEY_PAIR_GEN, &params,
- 				   &pubkey, PR_FALSE, PR_TRUE, NULL);
-@@ -1525,7 +1530,7 @@
- 
-     ctx = xmlSecNssPKIKeyDataGetCtx(data);
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);
-+/*    xmlSecAssert2(SECKEY_GetPublicKeyType(ctx->pubkey) == rsaKey, -1);*/
- 
-     return(8 * SECKEY_PublicKeyStrength(ctx->pubkey));
- }
---- misc/xmlsec1-1.2.14/src/nss/symkeys.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/symkeys.c	2009-09-21 14:02:48.620574832 +0200
-@@ -15,20 +15,41 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#include <pk11func.h>
-+#include <nss.h>
-+
- #include <xmlsec/xmlsec.h>
- #include <xmlsec/xmltree.h>
-+#include <xmlsec/base64.h>
- #include <xmlsec/keys.h>
- #include <xmlsec/keyinfo.h>
- #include <xmlsec/transforms.h>
- #include <xmlsec/errors.h>
- 
- #include <xmlsec/nss/crypto.h>
-+#include <xmlsec/nss/ciphers.h>
-+#include <xmlsec/nss/tokens.h>
- 
- /*****************************************************************************
-  * 
-- * Symmetic (binary) keys - just a wrapper for xmlSecKeyDataBinary
-+ * Symmetic (binary) keys - a wrapper over slot information and PK11SymKey
-  *
-  ****************************************************************************/
-+typedef struct _xmlSecNssSymKeyDataCtx      xmlSecNssSymKeyDataCtx ;
-+typedef struct _xmlSecNssSymKeyDataCtx*     xmlSecNssSymKeyDataCtxPtr ;
-+
-+struct _xmlSecNssSymKeyDataCtx {
-+    CK_MECHANISM_TYPE       cipher ;    /* the symmetic key mechanism */
-+    PK11SlotInfo*           slot ;      /* the key resident slot */
-+    PK11SymKey*             symkey ;    /* the symmetic key */
-+} ;
-+
-+#define xmlSecNssSymKeyDataSize \
-+    ( sizeof( xmlSecKeyData ) + sizeof( xmlSecNssSymKeyDataCtx ) )
-+
-+#define xmlSecNssSymKeyDataGetCtx( data ) \
-+    ( ( xmlSecNssSymKeyDataCtxPtr )( ( ( xmlSecByte* )( data ) ) + sizeof( xmlSecKeyData ) ) )
-+
- static int	xmlSecNssSymKeyDataInitialize		(xmlSecKeyDataPtr data);
- static int	xmlSecNssSymKeyDataDuplicate		(xmlSecKeyDataPtr dst,
- 							 xmlSecKeyDataPtr src);
-@@ -67,107 +88,743 @@
-     (xmlSecKeyDataIsValid((data)) && \
-      xmlSecNssSymKeyDataKlassCheck((data)->id))
- 
-+/**
-+ * xmlSecNssSymKeyDataAdoptKey:
-+ * @data:                              the pointer to symmetric key data.
-+ * @symkey:                            the symmetric key
-+ *
-+ * Set the value of symmetric key data.
-+ *
-+ * Returns 0 on success or a negative value if an error occurs.
-+ */
-+int
-+xmlSecNssSymKeyDataAdoptKey(
-+       xmlSecKeyDataPtr data ,
-+       PK11SymKey* symkey
-+) {
-+       xmlSecNssSymKeyDataCtxPtr context = NULL ;
-+
-+       xmlSecAssert2( xmlSecNssSymKeyDataCheckId( data ), -1 ) ;
-+       xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), -1 ) ;
-+       xmlSecAssert2( symkey != NULL, -1 ) ;
-+
-+       context = xmlSecNssSymKeyDataGetCtx( data ) ;
-+       xmlSecAssert2(context != NULL, -1);
-+
-+       context->cipher = PK11_GetMechanism( symkey ) ;
-+
-+       if( context->slot != NULL ) {
-+               PK11_FreeSlot( context->slot ) ;
-+               context->slot = NULL ;
-+       }
-+       context->slot = PK11_GetSlotFromKey( symkey ) ;
-+
-+       if( context->symkey != NULL ) {
-+               PK11_FreeSymKey( context->symkey ) ;
-+               context->symkey = NULL ;
-+       }
-+       context->symkey = PK11_ReferenceSymKey( symkey ) ;
-+
-+       return 0 ;
-+}
-+
-+xmlSecKeyDataPtr xmlSecNssSymKeyDataKeyAdopt(
-+    PK11SymKey*     symKey
-+) {
-+       xmlSecKeyDataPtr        data = NULL ;
-+       CK_MECHANISM_TYPE       mechanism = CKM_INVALID_MECHANISM ;
-+
-+       xmlSecAssert2( symKey != NULL , NULL ) ;
-+
-+       mechanism = PK11_GetMechanism( symKey ) ;
-+       switch( mechanism ) {
-+               case CKM_DES3_KEY_GEN :
-+               case CKM_DES3_CBC :
-+               case CKM_DES3_MAC :
-+                       data = xmlSecKeyDataCreate( xmlSecNssKeyDataDesId ) ;
-+                       if( data == NULL ) {
-+                               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                                       NULL ,
-+                                       "xmlSecKeyDataCreate" ,
-+                                       XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                                       "xmlSecNssKeyDataDesId" ) ;
-+                               return NULL ;
-+                       }
-+                       break ;
-+               case CKM_AES_KEY_GEN :
-+               case CKM_AES_CBC :
-+               case CKM_AES_MAC :
-+                       data = xmlSecKeyDataCreate( xmlSecNssKeyDataAesId ) ;
-+                       if( data == NULL ) {
-+                               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                                       NULL ,
-+                                       "xmlSecKeyDataCreate" ,
-+                                       XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                                       "xmlSecNssKeyDataDesId" ) ;
-+                               return NULL ;
-+                       }
-+                       break ;
-+               default :
-+                       xmlSecError( XMLSEC_ERRORS_HERE ,
-+                               NULL ,
-+                               NULL ,
-+                               XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                               "Unsupported mechanism" ) ;
-+                       return NULL ;
-+       }
-+
-+       if( xmlSecNssSymKeyDataAdoptKey( data , symKey ) < 0 ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                       NULL ,
-+                       "xmlSecNssSymKeyDataAdoptKey" ,
-+                       XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                       XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+               xmlSecKeyDataDestroy( data ) ;
-+               return NULL ;
-+       }
-+
-+       return data ;
-+}
-+
-+
-+PK11SymKey*
-+xmlSecNssSymKeyDataGetKey(
-+    xmlSecKeyDataPtr data
-+) {
-+    xmlSecNssSymKeyDataCtxPtr ctx;
-+    PK11SymKey* symkey ;
-+
-+    xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), NULL);
-+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecNssSymKeyDataSize), NULL);
-+
-+    ctx = xmlSecNssSymKeyDataGetCtx(data);
-+    xmlSecAssert2(ctx != NULL, NULL);
-+
-+    if( ctx->symkey != NULL ) {
-+        symkey = PK11_ReferenceSymKey( ctx->symkey ) ;
-+    } else {
-+        symkey = NULL ;
-+    }
-+
-+    return(symkey);
-+}
-+
- static int
- xmlSecNssSymKeyDataInitialize(xmlSecKeyDataPtr data) {
-+    xmlSecNssSymKeyDataCtxPtr ctx;
-+
-     xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), -1);
--    
--    return(xmlSecKeyDataBinaryValueInitialize(data));
-+    xmlSecAssert2(xmlSecKeyDataCheckSize(data, xmlSecNssSymKeyDataSize), -1);
-+
-+    ctx = xmlSecNssSymKeyDataGetCtx(data);
-+    xmlSecAssert2(ctx != NULL, -1);
-+
-+    memset( ctx, 0, sizeof(xmlSecNssSymKeyDataCtx));
-+
-+    /* Set the block cipher mechanism */
-+#ifndef XMLSEC_NO_DES
-+    if(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDesId)) {
-+        ctx->cipher = CKM_DES3_KEY_GEN;
-+    } else
-+#endif  /* XMLSEC_NO_DES */
-+
-+#ifndef XMLSEC_NO_AES
-+    if(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataDesId)) {
-+        ctx->cipher = CKM_AES_KEY_GEN;
-+    } else
-+#endif  /* XMLSEC_NO_AES */
-+
-+    if(1) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-+            NULL ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            "Unsupported block cipher" ) ;
-+        return(-1) ;
-+    }
-+
-+    return(0);
- }
- 
- static int
- xmlSecNssSymKeyDataDuplicate(xmlSecKeyDataPtr dst, xmlSecKeyDataPtr src) {
-+    xmlSecNssSymKeyDataCtxPtr ctxDst;
-+    xmlSecNssSymKeyDataCtxPtr ctxSrc;
-+
-     xmlSecAssert2(xmlSecNssSymKeyDataCheckId(dst), -1);
-+    xmlSecAssert2(xmlSecKeyDataCheckSize(dst, xmlSecNssSymKeyDataSize), -1);
-     xmlSecAssert2(xmlSecNssSymKeyDataCheckId(src), -1);
-+    xmlSecAssert2(xmlSecKeyDataCheckSize(src, xmlSecNssSymKeyDataSize), -1);
-     xmlSecAssert2(dst->id == src->id, -1);
--        
--    return(xmlSecKeyDataBinaryValueDuplicate(dst, src));
-+
-+    ctxDst = xmlSecNssSymKeyDataGetCtx(dst);
-+    xmlSecAssert2(ctxDst != NULL, -1);
-+
-+    ctxSrc = xmlSecNssSymKeyDataGetCtx(src);
-+    xmlSecAssert2(ctxSrc != NULL, -1);
-+
-+    ctxDst->cipher = ctxSrc->cipher ;
-+
-+    if( ctxSrc->slot != NULL ) {
-+        if( ctxDst->slot != NULL && ctxDst->slot != ctxSrc->slot ) {
-+            PK11_FreeSlot( ctxDst->slot ) ;
-+            ctxDst->slot = NULL ;
-+        }
-+
-+        if( ctxDst->slot == NULL && ctxSrc->slot != NULL )
-+            ctxDst->slot = PK11_ReferenceSlot( ctxSrc->slot ) ;
-+    } else {
-+        if( ctxDst->slot != NULL ) {
-+            PK11_FreeSlot( ctxDst->slot ) ;
-+            ctxDst->slot = NULL ;
-+        }
-+    }
-+
-+    if( ctxSrc->symkey != NULL ) {
-+        if( ctxDst->symkey != NULL && ctxDst->symkey != ctxSrc->symkey ) {
-+            PK11_FreeSymKey( ctxDst->symkey ) ;
-+            ctxDst->symkey = NULL ;
-+        }
-+
-+        if( ctxDst->symkey == NULL && ctxSrc->symkey != NULL )
-+            ctxDst->symkey = PK11_ReferenceSymKey( ctxSrc->symkey ) ;
-+    } else {
-+        if( ctxDst->symkey != NULL ) {
-+            PK11_FreeSymKey( ctxDst->symkey ) ;
-+            ctxDst->symkey = NULL ;
-+        }
-+    }
-+
-+    return(0);
- }
- 
- static void
- xmlSecNssSymKeyDataFinalize(xmlSecKeyDataPtr data) {
-+    xmlSecNssSymKeyDataCtxPtr ctx;
-+
-     xmlSecAssert(xmlSecNssSymKeyDataCheckId(data));
--    
--    xmlSecKeyDataBinaryValueFinalize(data);
-+    xmlSecAssert(xmlSecKeyDataCheckSize(data, xmlSecNssSymKeyDataSize));
-+
-+    ctx = xmlSecNssSymKeyDataGetCtx(data);
-+    xmlSecAssert(ctx != NULL);
-+
-+    if( ctx->slot != NULL ) {
-+        PK11_FreeSlot( ctx->slot ) ;
-+        ctx->slot = NULL ;
-+    }
-+
-+    if( ctx->symkey != NULL ) {
-+        PK11_FreeSymKey( ctx->symkey ) ;
-+        ctx->symkey = NULL ;
-+    }
-+
-+    ctx->cipher = CKM_INVALID_MECHANISM ;
- }
- 
- static int
- xmlSecNssSymKeyDataXmlRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
- 			       xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
--    xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1);
-+    PK11SymKey* symKey ;
-+    PK11SlotInfo* slot ;
-+    xmlSecBufferPtr keyBuf;
-+    xmlSecSize len;
-+    xmlSecKeyDataPtr data;
-+    xmlSecNssSymKeyDataCtxPtr ctx;
-+    SECItem keyItem ;
-+    int ret;
-+    
-+    xmlSecAssert2(id != xmlSecKeyDataIdUnknown, -1);
-+    xmlSecAssert2(key != NULL, -1);
-+    xmlSecAssert2(node != NULL, -1);
-+    xmlSecAssert2(keyInfoCtx != NULL, -1);
-+
-+    /* Create a new KeyData from a id */
-+    data = xmlSecKeyDataCreate(id);
-+    if(data == NULL ) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeyDataCreate",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+        return(-1);
-+    }
-+
-+    ctx = xmlSecNssSymKeyDataGetCtx(data);
-+    xmlSecAssert2(ctx != NULL, -1);
-+
-+    /* Create a buffer for raw symmetric key value */
-+    if( ( keyBuf = xmlSecBufferCreate( 128 ) ) == NULL ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecBufferCreate" ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1) ;
-+    }
-+
-+    /* Read the raw key value */
-+    if( xmlSecBufferBase64NodeContentRead( keyBuf , node ) < 0 ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            xmlSecErrorsSafeString(xmlSecNodeGetName(node)),
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+        xmlSecBufferDestroy( keyBuf ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1) ;
-+    }
-+
-+    /* Get slot */
-+    slot = xmlSecNssSlotGet(ctx->cipher);
-+    if( slot == NULL ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecNssSlotGet" ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+        xmlSecBufferDestroy( keyBuf ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1) ;
-+    }
-+
-+    /* Wrap the raw key value SECItem */
-+    keyItem.type = siBuffer ;
-+    keyItem.data = xmlSecBufferGetData( keyBuf ) ;
-+    keyItem.len = xmlSecBufferGetSize( keyBuf ) ;
-+
-+    /* Import the raw key into slot temporalily and get the key handler*/
-+    symKey = PK11_ImportSymKey(slot, ctx->cipher, PK11_OriginGenerated, CKA_VALUE, &keyItem, NULL ) ;
-+    if( symKey == NULL ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "PK11_ImportSymKey" ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+               PK11_FreeSlot( slot ) ;
-+        xmlSecBufferDestroy( keyBuf ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1) ;
-+    }
-+       PK11_FreeSlot( slot ) ;
-+
-+    /* raw key material has been copied into symKey, it isn't used any more */
-+    xmlSecBufferDestroy( keyBuf ) ;
-+    
-+    /* Adopt the symmetric key into key data */
-+    ret = xmlSecNssSymKeyDataAdoptKey(data, symKey);
-+    if(ret < 0) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeyDataBinaryValueSetBuffer",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+        PK11_FreeSymKey( symKey ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1);
-+    }
-+    /* symKey has been duplicated into data, it isn't used any more */
-+    PK11_FreeSymKey( symKey ) ;
-+
-+    /* Check value */
-+    if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), data) != 1) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeyReqMatchKeyValue",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(0);
-+    }
-     
--    return(xmlSecKeyDataBinaryValueXmlRead(id, key, node, keyInfoCtx));
-+    ret = xmlSecKeySetValue(key, data);
-+    if(ret < 0) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeySetValue",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1);
-+    }
-+
-+    return(0);
- }
- 
- static int 
- xmlSecNssSymKeyDataXmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
- 				    xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-+    PK11SymKey* symKey ;
-+
-     xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1);
--    
--    return(xmlSecKeyDataBinaryValueXmlWrite(id, key, node, keyInfoCtx));
-+    xmlSecAssert2(key != NULL, -1);
-+    xmlSecAssert2(node != NULL, -1);
-+    xmlSecAssert2(keyInfoCtx != NULL, -1);
-+
-+       /* Get symmetric key from "key" */
-+    symKey = xmlSecNssSymKeyDataGetKey(xmlSecKeyGetValue(key)); 
-+    if( symKey != NULL ) {
-+        SECItem* keyItem ;
-+               xmlSecBufferPtr keyBuf ;
-+
-+               /* Extract raw key data from symmetric key */
-+               if( PK11_ExtractKeyValue( symKey ) != SECSuccess ) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               "PK11_ExtractKeyValue",
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+               XMLSEC_ERRORS_NO_MESSAGE);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+               }
-+
-+               /* Get raw key data from "symKey" */
-+        keyItem = PK11_GetKeyData( symKey ) ;
-+           if(keyItem == NULL) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               "PK11_GetKeyData",
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+               XMLSEC_ERRORS_NO_MESSAGE);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+       }
-+
-+               /* Create key data buffer with raw kwy material */
-+               keyBuf = xmlSecBufferCreate(keyItem->len) ;
-+           if(keyBuf == NULL) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               "xmlSecBufferCreate",
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+               XMLSEC_ERRORS_NO_MESSAGE);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+       }
-+
-+               xmlSecBufferSetData( keyBuf , keyItem->data , keyItem->len ) ;
-+
-+               /* Write raw key material into current xml node */
-+               if( xmlSecBufferBase64NodeContentWrite( keyBuf, node, XMLSEC_BASE64_LINESIZE ) < 0 ) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               "xmlSecBufferBase64NodeContentWrite",
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+               XMLSEC_ERRORS_NO_MESSAGE);
-+                       xmlSecBufferDestroy(keyBuf);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+               }
-+               xmlSecBufferDestroy(keyBuf);
-+               PK11_FreeSymKey( symKey ) ;
-+    }
-+
-+    return 0 ;
- }
- 
- static int
- xmlSecNssSymKeyDataBinRead(xmlSecKeyDataId id, xmlSecKeyPtr key,
- 				    const xmlSecByte* buf, xmlSecSize bufSize,
- 				    xmlSecKeyInfoCtxPtr keyInfoCtx) {
--    xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1);
-+    PK11SymKey* symKey ;
-+    PK11SlotInfo* slot ;
-+    xmlSecKeyDataPtr data;
-+    xmlSecNssSymKeyDataCtxPtr ctx;
-+    SECItem keyItem ;
-+    int ret;
-+
-+    xmlSecAssert2(id != xmlSecKeyDataIdUnknown, -1);
-+    xmlSecAssert2(key != NULL, -1);
-+    xmlSecAssert2(buf != NULL, -1);
-+    xmlSecAssert2(bufSize != 0, -1);
-+    xmlSecAssert2(keyInfoCtx != NULL, -1);
-+
-+    /* Create a new KeyData from a id */
-+    data = xmlSecKeyDataCreate(id);
-+    if(data == NULL ) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeyDataCreate",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+        return(-1);
-+    }
-+
-+    ctx = xmlSecNssSymKeyDataGetCtx(data);
-+    xmlSecAssert2(ctx != NULL, -1);
-+
-+    /* Get slot */
-+    slot = xmlSecNssSlotGet(ctx->cipher);
-+    if( slot == NULL ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecNssSlotGet" ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1) ;
-+    }
-+
-+    /* Wrap the raw key value SECItem */
-+    keyItem.type = siBuffer ;
-+    keyItem.data = buf ;
-+    keyItem.len = bufSize ;
-+
-+    /* Import the raw key into slot temporalily and get the key handler*/
-+    symKey = PK11_ImportSymKey(slot, ctx->cipher, PK11_OriginGenerated, CKA_VALUE, &keyItem, NULL ) ;
-+    if( symKey == NULL ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "PK11_ImportSymKey" ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               PK11_FreeSlot( slot ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1) ;
-+    }
-+
-+    /* Adopt the symmetric key into key data */
-+    ret = xmlSecNssSymKeyDataAdoptKey(data, symKey);
-+    if(ret < 0) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeyDataBinaryValueSetBuffer",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        PK11_FreeSymKey( symKey ) ;
-+               PK11_FreeSlot( slot ) ;
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1);
-+    }
-+    /* symKey has been duplicated into data, it isn't used any more */
-+    PK11_FreeSymKey( symKey ) ;
-+       PK11_FreeSlot( slot ) ;
-+
-+    /* Check value */
-+    if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), data) != 1) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeyReqMatchKeyValue",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(0);
-+    }
-     
--    return(xmlSecKeyDataBinaryValueBinRead(id, key, buf, bufSize, keyInfoCtx));
-+    ret = xmlSecKeySetValue(key, data);
-+    if(ret < 0) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+            xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+            "xmlSecKeySetValue",
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+            XMLSEC_ERRORS_NO_MESSAGE);
-+               xmlSecKeyDataDestroy( data ) ;
-+        return(-1);
-+    }
-+
-+    return(0);
- }
- 
- static int
- xmlSecNssSymKeyDataBinWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
- 				    xmlSecByte** buf, xmlSecSize* bufSize,
- 				    xmlSecKeyInfoCtxPtr keyInfoCtx) {
-+    PK11SymKey* symKey ;
-+
-     xmlSecAssert2(xmlSecNssSymKeyDataKlassCheck(id), -1);
-+    xmlSecAssert2(key != NULL, -1);
-+    xmlSecAssert2(buf != NULL, -1);
-+    xmlSecAssert2(bufSize != 0, -1);
-+    xmlSecAssert2(keyInfoCtx != NULL, -1);
-+
-+       /* Get symmetric key from "key" */
-+    symKey = xmlSecNssSymKeyDataGetKey(xmlSecKeyGetValue(key)); 
-+    if( symKey != NULL ) {
-+        SECItem* keyItem ;
-+
-+               /* Extract raw key data from symmetric key */
-+               if( PK11_ExtractKeyValue( symKey ) != SECSuccess ) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               "PK11_ExtractKeyValue",
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+               XMLSEC_ERRORS_NO_MESSAGE);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+               }
-+
-+               /* Get raw key data from "symKey" */
-+        keyItem = PK11_GetKeyData( symKey ) ;
-+           if(keyItem == NULL) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               "PK11_GetKeyData",
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+                       XMLSEC_ERRORS_NO_MESSAGE);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+       }
-+
-+               *bufSize = keyItem->len;
-+               *buf = ( xmlSecByte* )xmlMalloc( *bufSize );
-+               if( *buf == NULL ) {
-+               xmlSecError(XMLSEC_ERRORS_HERE,
-+               xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+               NULL,
-+               XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+               XMLSEC_ERRORS_NO_MESSAGE);
-+                       PK11_FreeSymKey( symKey ) ;
-+               return(-1);
-+       }
-+
-+       memcpy((*buf), keyItem->data, (*bufSize));
-+       PK11_FreeSymKey( symKey ) ;
-+    }
-     
--    return(xmlSecKeyDataBinaryValueBinWrite(id, key, buf, bufSize, keyInfoCtx));
-+    return 0 ;
- }
- 
- static int
- xmlSecNssSymKeyDataGenerate(xmlSecKeyDataPtr data, xmlSecSize sizeBits, xmlSecKeyDataType type ATTRIBUTE_UNUSED) {
--    xmlSecBufferPtr buffer;
-+    PK11SymKey* symkey ;
-+    PK11SlotInfo* slot ;
-+    xmlSecNssSymKeyDataCtxPtr ctx;
-+    int ret;
- 
-     xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), -1);
-     xmlSecAssert2(sizeBits > 0, -1);
- 
--    buffer = xmlSecKeyDataBinaryValueGetBuffer(data);
--    xmlSecAssert2(buffer != NULL, -1);
--    
--    return(xmlSecNssGenerateRandom(buffer, (sizeBits + 7) / 8));
-+    ctx = xmlSecNssSymKeyDataGetCtx(data);
-+    xmlSecAssert2(ctx != NULL, -1);
-+
-+    if( sizeBits % 8 != 0 ) {
-+            xmlSecError(XMLSEC_ERRORS_HERE,
-+         xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-+         NULL,
-+         XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+         "Symmetric key size must be octuple");
-+     return(-1);
-+    }
-+
-+    /* Get slot */
-+    slot = xmlSecNssSlotGet(ctx->cipher);
-+    if( slot == NULL ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
-+            "xmlSecNssSlotGet" ,
-+            XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        return(-1) ;
-+    }
-+
-+    if( PK11_Authenticate( slot, PR_FALSE , NULL ) != SECSuccess ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                "PK11_Authenticate" ,
-+                XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            PK11_FreeSlot( slot ) ;
-+            return -1 ;
-+    }
-+
-+    symkey = PK11_KeyGen( slot , ctx->cipher , NULL , sizeBits/8 , NULL ) ;
-+    if( symkey == NULL ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                "PK11_KeyGen" ,
-+                XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            PK11_FreeSlot( slot ) ;
-+            return -1 ;
-+    }
-+
-+    if( ctx->slot != NULL ) {
-+            PK11_FreeSlot( ctx->slot ) ;
-+            ctx->slot = NULL ;
-+    }
-+    ctx->slot = slot ;
-+
-+    if( ctx->symkey != NULL ) {
-+            PK11_FreeSymKey( ctx->symkey ) ;
-+            ctx->symkey = NULL ;
-+    }
-+    ctx->symkey = symkey ;
-+
-+    return 0;
- }
- 
- static xmlSecKeyDataType
- xmlSecNssSymKeyDataGetType(xmlSecKeyDataPtr data) {
--    xmlSecBufferPtr buffer;
-+    xmlSecNssSymKeyDataCtxPtr context = NULL ;
-+    xmlSecKeyDataType type = xmlSecKeyDataTypeUnknown ;
- 
-     xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), xmlSecKeyDataTypeUnknown);
-+    xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), xmlSecKeyDataTypeUnknown ) ;
- 
--    buffer = xmlSecKeyDataBinaryValueGetBuffer(data);
--    xmlSecAssert2(buffer != NULL, xmlSecKeyDataTypeUnknown);
-+    context = xmlSecNssSymKeyDataGetCtx( data ) ;
-+    if( context == NULL ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                "xmlSecNssSymKeyDataGetCtx" ,
-+                XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return xmlSecKeyDataTypeUnknown ;
-+    }
- 
--    return((xmlSecBufferGetSize(buffer) > 0) ? xmlSecKeyDataTypeSymmetric : xmlSecKeyDataTypeUnknown);
-+    if( context->symkey != NULL ) {
-+            type |= xmlSecKeyDataTypeSymmetric ;
-+    } else {
-+            type |= xmlSecKeyDataTypeUnknown ;
-+    }
-+
-+    return type ;
- }
- 
- static xmlSecSize 
- xmlSecNssSymKeyDataGetSize(xmlSecKeyDataPtr data) {
-+    xmlSecNssSymKeyDataCtxPtr context ;
-+    unsigned int    length = 0 ;
-+
-     xmlSecAssert2(xmlSecNssSymKeyDataCheckId(data), 0);
-+    xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), 0 ) ;
-+    context = xmlSecNssSymKeyDataGetCtx( data ) ;
-+    if( context == NULL ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                "xmlSecNssSymKeyDataGetCtx" ,
-+                XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return 0 ;
-+    }
-+
-+    if( context->symkey != NULL ) {
-+            length = PK11_GetKeyLength( context->symkey ) ;
-+            length *= 8 ;
-+    }
-     
--    return(xmlSecKeyDataBinaryValueGetSize(data));
-+    return length ;
- }
- 
- static void 
- xmlSecNssSymKeyDataDebugDump(xmlSecKeyDataPtr data, FILE* output) {
-     xmlSecAssert(xmlSecNssSymKeyDataCheckId(data));
-     
--    xmlSecKeyDataBinaryValueDebugDump(data, output);    
-+    /* print only size, everything else is sensitive */
-+    fprintf( output , "=== %s: size=%d\n" , data->id->dataNodeName ,
-+        xmlSecKeyDataGetSize(data)) ;
- }
- 
- static void
- xmlSecNssSymKeyDataDebugXmlDump(xmlSecKeyDataPtr data, FILE* output) {
-     xmlSecAssert(xmlSecNssSymKeyDataCheckId(data));
--    
--    xmlSecKeyDataBinaryValueDebugXmlDump(data, output);    
-+
-+    /* print only size, everything else is sensitive */
-+    fprintf( output , "<%s size=\"%d\" />\n" , data->id->dataNodeName ,
-+        xmlSecKeyDataGetSize(data)) ;
- }
- 
- static int 
-@@ -201,7 +858,7 @@
-  *************************************************************************/
- static xmlSecKeyDataKlass xmlSecNssKeyDataAesKlass = {
-     sizeof(xmlSecKeyDataKlass),
--    xmlSecKeyDataBinarySize,
-+    xmlSecNssSymKeyDataSize,
- 
-     /* data */
-     xmlSecNameAESKeyValue,
-@@ -282,7 +939,7 @@
-  *************************************************************************/
- static xmlSecKeyDataKlass xmlSecNssKeyDataDesKlass = {
-     sizeof(xmlSecKeyDataKlass),
--    xmlSecKeyDataBinarySize,
-+    xmlSecNssSymKeyDataSize,
- 
-     /* data */
-     xmlSecNameDESKeyValue,
-@@ -364,7 +1021,7 @@
-  *************************************************************************/
- static xmlSecKeyDataKlass xmlSecNssKeyDataHmacKlass = {
-     sizeof(xmlSecKeyDataKlass),
--    xmlSecKeyDataBinarySize,
-+    xmlSecNssSymKeyDataSize,
- 
-     /* data */
-     xmlSecNameHMACKeyValue,
---- misc/xmlsec1-1.2.14/src/nss/tokens.c	2009-09-21 14:07:19.249145861 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/tokens.c	2009-09-21 14:02:48.556772442 +0200
-@@ -1 +1,548 @@
--dummy
-+/**
-+ * XMLSec library
-+ *
-+ * This is free software; see Copyright file in the source
-+ * distribution for preciese wording.
-+ *
-+ * Copyright..................................
-+ *
-+ * Contributor(s): _____________________________
-+ *
-+ */
-+
-+/**
-+ * In order to ensure that particular crypto operation is performed on
-+ * particular crypto device, a subclass of xmlSecList is used to store slot and 
-+ * mechanism information.
-+ *
-+ * In the list, a slot is bound with a mechanism. If the mechanism is available,
-+ * this mechanism only can perform on the slot; otherwise, it can perform on
-+ * every eligibl slot in the list.
-+ *
-+ * When try to find a slot for a particular mechanism, the slot bound with
-+ * avaliable mechanism will be looked up firstly.
-+ */
-+#include "globals.h"
-+#include <string.h>
-+
-+#include <xmlsec/xmlsec.h>
-+#include <xmlsec/errors.h>
-+#include <xmlsec/list.h>
-+
-+#include <xmlsec/nss/tokens.h>
-+
-+int
-+xmlSecNssKeySlotSetMechList(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE_PTR mechanismList
-+) {
-+	int counter ;
-+
-+	xmlSecAssert2( keySlot != NULL , -1 ) ;
-+
-+	if( keySlot->mechanismList != CK_NULL_PTR ) {
-+		xmlFree( keySlot->mechanismList ) ;
-+
-+		for( counter = 0 ; *( mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) ;
-+		keySlot->mechanismList = ( CK_MECHANISM_TYPE_PTR )xmlMalloc( ( counter + 1 ) * sizeof( CK_MECHANISM_TYPE ) ) ;
-+		if( keySlot->mechanismList == NULL ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			return( -1 );
-+		}
-+		for( ; counter >= 0 ; counter -- )
-+			*( keySlot->mechanismList + counter ) = *(  mechanismList + counter ) ;
-+	}
-+
-+	return( 0 );
-+}
-+
-+int
-+xmlSecNssKeySlotEnableMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE mechanism
-+) {
-+	int counter ;
-+	CK_MECHANISM_TYPE_PTR newList ;
-+
-+	xmlSecAssert2( keySlot != NULL , -1 ) ;
-+
-+	if( mechanism != CKM_INVALID_MECHANISM ) {
-+		for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) ;
-+		newList = ( CK_MECHANISM_TYPE_PTR )xmlMalloc( ( counter + 1 + 1 ) * sizeof( CK_MECHANISM_TYPE ) ) ;
-+		if( newList == NULL ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			return( -1 );
-+		}
-+		*( newList + counter + 1 ) = CKM_INVALID_MECHANISM ;
-+		*( newList + counter ) = mechanism ;
-+		for( counter -= 1 ; counter >= 0 ; counter -- )
-+			*( newList + counter ) = *(  keySlot->mechanismList + counter ) ;
-+
-+		xmlFree( keySlot->mechanismList ) ;
-+		keySlot->mechanismList = newList ;
-+	}
-+
-+	return(0);
-+}
-+
-+int
-+xmlSecNssKeySlotDisableMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE mechanism
-+) {
-+	int counter ;
-+
-+	xmlSecAssert2( keySlot != NULL , -1 ) ;
-+
-+	for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) {
-+		if( *( keySlot->mechanismList + counter ) == mechanism ) {
-+			for( ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) {
-+				*( keySlot->mechanismList + counter ) = *( keySlot->mechanismList + counter + 1 ) ;
-+			}
-+
-+			break ;
-+		}
-+	}
-+
-+	return(0); 
-+}
-+
-+CK_MECHANISM_TYPE_PTR
-+xmlSecNssKeySlotGetMechList(
-+    xmlSecNssKeySlotPtr keySlot
-+) {
-+	if( keySlot != NULL )
-+		return keySlot->mechanismList ;
-+	else
-+		return NULL ;
-+}
-+
-+int
-+xmlSecNssKeySlotSetSlot(
-+    xmlSecNssKeySlotPtr keySlot ,
-+	PK11SlotInfo* slot
-+) {
-+	xmlSecAssert2( keySlot != NULL , -1 ) ;
-+
-+	if( slot != NULL && keySlot->slot != slot ) {
-+		if( keySlot->slot != NULL )
-+			PK11_FreeSlot( keySlot->slot ) ;
-+
-+		if( keySlot->mechanismList != NULL ) {
-+			xmlFree( keySlot->mechanismList ) ;
-+			keySlot->mechanismList = NULL ;
-+		}
-+
-+		keySlot->slot = PK11_ReferenceSlot( slot ) ;
-+	}
-+
-+	return(0);
-+}
-+
-+int
-+xmlSecNssKeySlotInitialize(
-+    xmlSecNssKeySlotPtr keySlot ,
-+	PK11SlotInfo* slot
-+) {
-+	xmlSecAssert2( keySlot != NULL , -1 ) ;
-+	xmlSecAssert2( keySlot->slot == NULL , -1 ) ;
-+	xmlSecAssert2( keySlot->mechanismList == NULL , -1 ) ;
-+
-+	if( slot != NULL ) {
-+		keySlot->slot = PK11_ReferenceSlot( slot ) ;
-+	}
-+
-+	return(0);
-+}
-+
-+void
-+xmlSecNssKeySlotFinalize(
-+    xmlSecNssKeySlotPtr keySlot
-+) {
-+	xmlSecAssert( keySlot != NULL ) ;
-+
-+	if( keySlot->mechanismList != NULL ) {
-+		xmlFree( keySlot->mechanismList ) ;
-+		keySlot->mechanismList = NULL ;
-+	}
-+
-+	if( keySlot->slot != NULL ) {
-+		PK11_FreeSlot( keySlot->slot ) ;
-+		keySlot->slot = NULL ;
-+	}
-+		
-+}
-+
-+PK11SlotInfo*
-+xmlSecNssKeySlotGetSlot(
-+	xmlSecNssKeySlotPtr keySlot
-+) {
-+	if( keySlot != NULL )
-+		return keySlot->slot ;
-+	else
-+		return NULL ;
-+}
-+
-+xmlSecNssKeySlotPtr
-+xmlSecNssKeySlotCreate() {
-+	xmlSecNssKeySlotPtr keySlot ;
-+
-+	/* Allocates a new xmlSecNssKeySlot and fill the fields */
-+	keySlot = ( xmlSecNssKeySlotPtr )xmlMalloc( sizeof( xmlSecNssKeySlot ) ) ;
-+	if( keySlot == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			NULL ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( NULL );
-+	}
-+	memset( keySlot, 0, sizeof( xmlSecNssKeySlot ) ) ;
-+
-+	return( keySlot ) ;
-+}
-+
-+int
-+xmlSecNssKeySlotCopy(
-+	xmlSecNssKeySlotPtr newKeySlot ,
-+	xmlSecNssKeySlotPtr keySlot
-+) {
-+	CK_MECHANISM_TYPE_PTR mech ;
-+	int counter ;
-+
-+	xmlSecAssert2( newKeySlot != NULL , -1 ) ;
-+	xmlSecAssert2( keySlot != NULL , -1 ) ;
-+
-+	if( keySlot->slot != NULL && newKeySlot->slot != keySlot->slot ) {
-+		if( newKeySlot->slot != NULL )
-+			PK11_FreeSlot( newKeySlot->slot ) ;
-+
-+		newKeySlot->slot = PK11_ReferenceSlot( keySlot->slot ) ;
-+	}
-+
-+	if( keySlot->mechanismList != CK_NULL_PTR ) {
-+		xmlFree( newKeySlot->mechanismList ) ;
-+
-+		for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) ;
-+		newKeySlot->mechanismList = ( CK_MECHANISM_TYPE_PTR )xmlMalloc( ( counter + 1 ) * sizeof( CK_MECHANISM_TYPE ) ) ;
-+		if( newKeySlot->mechanismList == NULL ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			return( -1 );
-+		}
-+		for( ; counter >= 0 ; counter -- )
-+			*( newKeySlot->mechanismList + counter ) = *(  keySlot->mechanismList + counter ) ;
-+	}
-+
-+	return( 0 );
-+}
-+
-+xmlSecNssKeySlotPtr
-+xmlSecNssKeySlotDuplicate(
-+	xmlSecNssKeySlotPtr keySlot
-+) {
-+	xmlSecNssKeySlotPtr newKeySlot ;
-+	int ret ;
-+
-+	xmlSecAssert2( keySlot != NULL , NULL ) ;
-+
-+	newKeySlot = xmlSecNssKeySlotCreate() ;
-+	if( newKeySlot == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			NULL ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( NULL );
-+	}
-+
-+	if( xmlSecNssKeySlotCopy( newKeySlot, keySlot ) < 0 ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			NULL ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( NULL );
-+	}
-+
-+	return( newKeySlot );
-+}
-+
-+void
-+xmlSecNssKeySlotDestroy(
-+	    xmlSecNssKeySlotPtr keySlot
-+) {
-+	xmlSecAssert( keySlot != NULL ) ;
-+
-+	if( keySlot->mechanismList != NULL )
-+		xmlFree( keySlot->mechanismList ) ;
-+
-+	if( keySlot->slot != NULL )
-+		PK11_FreeSlot( keySlot->slot ) ;
-+		
-+	xmlFree( keySlot ) ;
-+}
-+
-+int
-+xmlSecNssKeySlotBindMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE type
-+) {
-+	int counter ;
-+
-+	xmlSecAssert2( keySlot != NULL , 0 ) ;
-+	xmlSecAssert2( keySlot->slot != NULL , 0 ) ;
-+	xmlSecAssert2( type != CKM_INVALID_MECHANISM , 0 ) ;
-+
-+	for( counter = 0 ; *( keySlot->mechanismList + counter ) != CKM_INVALID_MECHANISM ; counter ++ ) {
-+		if( *( keySlot->mechanismList + counter ) == type )
-+			return(1) ;
-+	}
-+
-+	return( 0 ) ;
-+}
-+
-+int
-+xmlSecNssKeySlotSupportMech(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	CK_MECHANISM_TYPE type
-+) {
-+	xmlSecAssert2( keySlot != NULL , 0 ) ;
-+	xmlSecAssert2( keySlot->slot != NULL , 0 ) ;
-+	xmlSecAssert2( type != CKM_INVALID_MECHANISM , 0 ) ;
-+
-+	if( PK11_DoesMechanism( keySlot->slot , type ) == PR_TRUE ) {
-+		return(1);
-+	} else
-+		return(0);
-+}
-+
-+void
-+xmlSecNssKeySlotDebugDump(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	FILE* output
-+) {
-+	xmlSecAssert( keySlot != NULL ) ;
-+	xmlSecAssert( output != NULL ) ;
-+
-+	fprintf( output, "== KEY SLOT\n" );
-+}
-+
-+void
-+xmlSecNssKeySlotDebugXmlDump(
-+	xmlSecNssKeySlotPtr keySlot ,
-+	FILE* output
-+) {
-+}
-+
-+/**
-+ * Key Slot List
-+ */
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = {
-+#else
-+static xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = {
-+#endif
-+    BAD_CAST "mechanism-list",
-+    (xmlSecPtrDuplicateItemMethod)xmlSecNssKeySlotDuplicate,
-+    (xmlSecPtrDestroyItemMethod)xmlSecNssKeySlotDestroy,
-+    (xmlSecPtrDebugDumpItemMethod)xmlSecNssKeySlotDebugDump,
-+    (xmlSecPtrDebugDumpItemMethod)xmlSecNssKeySlotDebugXmlDump,
-+};
-+
-+xmlSecPtrListId 
-+xmlSecNssKeySlotListGetKlass(void) {
-+    return(&xmlSecNssKeySlotPtrListKlass);
-+}
-+
-+
-+/*-
-+ * Global PKCS#11 crypto token repository -- Key slot list
-+ */
-+static xmlSecPtrListPtr _xmlSecNssKeySlotList = NULL ;
-+
-+PK11SlotInfo*
-+xmlSecNssSlotGet(
-+	CK_MECHANISM_TYPE type
-+) {
-+	PK11SlotInfo*			slot = NULL ;
-+	xmlSecNssKeySlotPtr		keySlot ;
-+	xmlSecSize				ksSize ;
-+	xmlSecSize				ksPos ;
-+	char					flag ;
-+
-+	if( _xmlSecNssKeySlotList == NULL ) {
-+		slot = PK11_GetBestSlot( type , NULL ) ;
-+	} else {
-+		ksSize = xmlSecPtrListGetSize( _xmlSecNssKeySlotList ) ;
-+
-+		/*-
-+		 * Firstly, checking whether the mechanism is bound with a special slot.
-+		 * If no bound slot, we try to find the first eligible slot in the list.
-+		 */
-+		for( flag = 0, ksPos = 0 ; ksPos < ksSize ; ksPos ++ ) {
-+			keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( _xmlSecNssKeySlotList, ksPos ) ;
-+			if( keySlot != NULL && xmlSecNssKeySlotBindMech( keySlot, type ) ) {
-+				slot = xmlSecNssKeySlotGetSlot( keySlot ) ;
-+				flag = 2 ;
-+			} else if( flag == 0 && xmlSecNssKeySlotSupportMech( keySlot, type ) ) {
-+				slot = xmlSecNssKeySlotGetSlot( keySlot ) ;
-+				flag = 1 ;
-+			}
-+
-+			if( flag == 2 )
-+				break ;
-+		}
-+		if( slot != NULL )
-+			slot = PK11_ReferenceSlot( slot ) ;
-+	}
-+
-+	if( slot != NULL && PK11_NeedLogin( slot ) ) {
-+		if( PK11_Authenticate( slot , PR_TRUE , NULL ) != SECSuccess ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			PK11_FreeSlot( slot ) ;
-+			return( NULL );
-+		}
-+	}
-+
-+	return slot ;
-+}
-+
-+int
-+xmlSecNssSlotInitialize(
-+	void
-+) {
-+	if( _xmlSecNssKeySlotList != NULL ) {
-+		xmlSecPtrListDestroy( _xmlSecNssKeySlotList ) ;
-+		_xmlSecNssKeySlotList = NULL ;
-+	}
-+
-+	_xmlSecNssKeySlotList = xmlSecPtrListCreate( xmlSecNssKeySlotListId ) ;
-+	if( _xmlSecNssKeySlotList == NULL ) {
-+		xmlSecError( XMLSEC_ERRORS_HERE ,
-+			NULL ,
-+			NULL ,
-+			XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+			XMLSEC_ERRORS_NO_MESSAGE ) ;
-+		return( -1 );
-+	}
-+
-+	return(0);
-+}
-+
-+void
-+xmlSecNssSlotShutdown(
-+	void
-+) {
-+	if( _xmlSecNssKeySlotList != NULL ) {
-+		xmlSecPtrListDestroy( _xmlSecNssKeySlotList ) ;
-+		_xmlSecNssKeySlotList = NULL ;
-+	}
-+}
-+
-+int
-+xmlSecNssSlotAdopt(
-+	PK11SlotInfo* slot,
-+	CK_MECHANISM_TYPE type
-+) {
-+	xmlSecNssKeySlotPtr		keySlot ;
-+	xmlSecSize				ksSize ;
-+	xmlSecSize				ksPos ;
-+	char					flag ;
-+
-+	xmlSecAssert2( _xmlSecNssKeySlotList != NULL, -1 ) ;
-+	xmlSecAssert2( slot != NULL, -1 ) ;
-+
-+	ksSize = xmlSecPtrListGetSize( _xmlSecNssKeySlotList ) ;
-+
-+	/*-
-+	 * Firstly, checking whether the slot is in the repository already.
-+	 */
-+	flag = 0 ;
-+	for( ksPos = 0 ; ksPos < ksSize ; ksPos ++ ) {
-+		keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( _xmlSecNssKeySlotList, ksPos ) ;
-+		/* If find the slot in the list */
-+		if( keySlot != NULL && xmlSecNssKeySlotGetSlot( keySlot ) == slot ) {
-+			/* If mechnism type is valid, bind the slot with the mechanism */
-+			if( type != CKM_INVALID_MECHANISM ) {
-+				if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) {
-+					xmlSecError( XMLSEC_ERRORS_HERE ,
-+						NULL ,
-+						NULL ,
-+						XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+						XMLSEC_ERRORS_NO_MESSAGE ) ;
-+					return(-1);
-+				}
-+			}
-+
-+			flag = 1 ;
-+		}
-+	}
-+
-+	/* If the slot do not in the list, add a new item to the list */
-+	if( flag == 0 ) {
-+		/* Create a new KeySlot */
-+		keySlot = xmlSecNssKeySlotCreate() ;
-+		if( keySlot == NULL ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			return(-1);
-+		}
-+
-+		/* Initialize the keySlot with a slot */
-+		if( xmlSecNssKeySlotInitialize( keySlot, slot ) < 0 ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			xmlSecNssKeySlotDestroy( keySlot ) ;
-+			return(-1);
-+		}
-+
-+		/* If mechnism type is valid, bind the slot with the mechanism */
-+		if( type != CKM_INVALID_MECHANISM ) {
-+			if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) {
-+				xmlSecError( XMLSEC_ERRORS_HERE ,
-+					NULL ,
-+					NULL ,
-+					XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+					XMLSEC_ERRORS_NO_MESSAGE ) ;
-+				xmlSecNssKeySlotDestroy( keySlot ) ;
-+				return(-1);
-+			}
-+		}
-+
-+		/* Add keySlot into the list */
-+		if( xmlSecPtrListAdd( _xmlSecNssKeySlotList, keySlot ) < 0 ) {
-+			xmlSecError( XMLSEC_ERRORS_HERE ,
-+				NULL ,
-+				NULL ,
-+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
-+				XMLSEC_ERRORS_NO_MESSAGE ) ;
-+			xmlSecNssKeySlotDestroy( keySlot ) ;
-+			return(-1);
-+		}
-+	}
-+
-+	return(0);
-+}
-+
---- misc/xmlsec1-1.2.14/src/nss/x509.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/x509.c	2009-09-21 14:02:48.642312431 +0200
-@@ -34,7 +34,6 @@
- #include <xmlsec/keys.h>
- #include <xmlsec/keyinfo.h>
- #include <xmlsec/keysmngr.h>
--#include <xmlsec/x509.h>
- #include <xmlsec/base64.h>
- #include <xmlsec/errors.h>
- 
-@@ -61,33 +60,18 @@
- static int		xmlSecNssX509CertificateNodeRead	(xmlSecKeyDataPtr data,
- 								 xmlNodePtr node,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
--static int		xmlSecNssX509CertificateNodeWrite	(CERTCertificate* cert,
--								 xmlNodePtr node,
--								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- static int		xmlSecNssX509SubjectNameNodeRead	(xmlSecKeyDataPtr data,
- 								 xmlNodePtr node,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
--static int		xmlSecNssX509SubjectNameNodeWrite	(CERTCertificate* cert,
--								 xmlNodePtr node,
--								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- static int		xmlSecNssX509IssuerSerialNodeRead	(xmlSecKeyDataPtr data,
- 								 xmlNodePtr node,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
--static int		xmlSecNssX509IssuerSerialNodeWrite	(CERTCertificate* cert,
--								 xmlNodePtr node,
--								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- static int		xmlSecNssX509SKINodeRead		(xmlSecKeyDataPtr data,
- 								 xmlNodePtr node,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
--static int		xmlSecNssX509SKINodeWrite		(CERTCertificate* cert,
--								 xmlNodePtr node,
--								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- static int		xmlSecNssX509CRLNodeRead		(xmlSecKeyDataPtr data,
- 								 xmlNodePtr node,
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
--static int		xmlSecNssX509CRLNodeWrite		(CERTSignedCrl* crl,
--								 xmlNodePtr node,
--								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- static int		xmlSecNssKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, 
- 								xmlSecKeyPtr key,
- 								xmlSecKeyInfoCtxPtr keyInfoCtx);
-@@ -104,9 +88,6 @@
- 								 xmlSecKeyInfoCtxPtr keyInfoCtx);
- static xmlChar*		xmlSecNssX509CrlBase64DerWrite		(CERTSignedCrl* crl, 
- 								 int base64LineWrap);
--static xmlChar*		xmlSecNssX509NameWrite			(CERTName* nm);
--static xmlChar*		xmlSecNssASN1IntegerWrite		(SECItem *num);
--static xmlChar*		xmlSecNssX509SKIWrite			(CERTCertificate* cert);
- static void		xmlSecNssX509CertDebugDump		(CERTCertificate* cert, 
- 								 FILE* output);
- static void		xmlSecNssX509CertDebugXmlDump		(CERTCertificate* cert, 
-@@ -752,31 +733,22 @@
- xmlSecNssKeyDataX509XmlWrite(xmlSecKeyDataId id, xmlSecKeyPtr key,
- 				xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-     xmlSecKeyDataPtr data;
-+    xmlNodePtr cur;
-+    xmlChar* buf;
-     CERTCertificate* cert;
-     CERTSignedCrl* crl;
-     xmlSecSize size, pos;
--    int content = 0;
--    int ret;
-     				
-     xmlSecAssert2(id == xmlSecNssKeyDataX509Id, -1);
-     xmlSecAssert2(key != NULL, -1);
-     xmlSecAssert2(node != NULL, -1);
-     xmlSecAssert2(keyInfoCtx != NULL, -1);
- 
--    content = xmlSecX509DataGetNodeContent (node, 1, keyInfoCtx);
--    if (content < 0) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--		    "xmlSecX509DataGetNodeContent",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "content=%d", content);
--	return(-1);
--    } else if(content == 0) {
--	/* by default we are writing certificates and crls */
--	content = XMLSEC_X509DATA_DEFAULT;
-+    /* todo: flag in ctx remove all existing content */
-+    if(0) {
-+        xmlNodeSetContent(node, NULL);
-     }
- 
--    /* get x509 data */
-     data = xmlSecKeyGetData(key, id);
-     if(data == NULL) {
- 	/* no x509 data in the key */
-@@ -796,79 +768,74 @@
- 	    return(-1);
- 	}
- 
--	if((content & XMLSEC_X509DATA_CERTIFICATE_NODE) != 0) {
--	    ret = xmlSecNssX509CertificateNodeWrite(cert, node, keyInfoCtx);
--	    if(ret < 0) {
-+	/* set base64 lines size from context */
-+	buf = xmlSecNssX509CertBase64DerWrite(cert, keyInfoCtx->base64LineSize); 
-+	if(buf == NULL) {
- 		xmlSecError(XMLSEC_ERRORS_HERE,
- 			    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--			    "xmlSecNssX509CertificateNodeWrite",
-+			    "xmlSecNssX509CertBase64DerWrite",
- 			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			    "pos=%d", pos);
-+			    XMLSEC_ERRORS_NO_MESSAGE);
- 		return(-1);
--	    }
- 	}
- 
--	if((content & XMLSEC_X509DATA_SUBJECTNAME_NODE) != 0) {
--	    ret = xmlSecNssX509SubjectNameNodeWrite(cert, node, keyInfoCtx);
--	    if(ret < 0) {
-+	cur = xmlSecAddChild(node, xmlSecNodeX509Certificate, xmlSecDSigNs);
-+	if(cur == NULL) {
- 		xmlSecError(XMLSEC_ERRORS_HERE,
- 			    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--			    "xmlSecNssX509SubjectNameNodeWrite",
-+			    "xmlSecAddChild",
- 			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			    "pos=%d", pos);
-+			    "node=%s",
-+			    xmlSecErrorsSafeString(xmlSecNodeX509Certificate));
-+		xmlFree(buf);
- 		return(-1);
--	    }
- 	}
-+	/* todo: add \n around base64 data - from context */
-+	/* todo: add errors check */
-+	xmlNodeSetContent(cur, xmlSecStringCR);
-+	xmlNodeSetContent(cur, buf);
-+	xmlFree(buf);
-+    }
- 
--	if((content & XMLSEC_X509DATA_ISSUERSERIAL_NODE) != 0) {
--	    ret = xmlSecNssX509IssuerSerialNodeWrite(cert, node, keyInfoCtx);
--	    if(ret < 0) {
--		xmlSecError(XMLSEC_ERRORS_HERE,
--			    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--			    "xmlSecNssX509IssuerSerialNodeWrite",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			    "pos=%d", pos);
--		return(-1);
--	    }
-+    /* write crls */
-+    size = xmlSecNssKeyDataX509GetCrlsSize(data);
-+    for(pos = 0; pos < size; ++pos) {
-+	crl = xmlSecNssKeyDataX509GetCrl(data, pos);
-+	if(crl == NULL) {
-+	    xmlSecError(XMLSEC_ERRORS_HERE,
-+		xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+		"xmlSecNssKeyDataX509GetCrl",
-+		XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+		"pos=%d", pos);
-+	    return(-1);
- 	}
- 
--	if((content & XMLSEC_X509DATA_SKI_NODE) != 0) {
--	    ret = xmlSecNssX509SKINodeWrite(cert, node, keyInfoCtx);
--	    if(ret < 0) {
--		xmlSecError(XMLSEC_ERRORS_HERE,
--			    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--			    "xmlSecNssX509SKINodeWrite",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			    "pos=%d", pos);
--		return(-1);
--	    }
-+        /* set base64 lines size from context */
-+        buf = xmlSecNssX509CrlBase64DerWrite(crl, keyInfoCtx->base64LineSize);
-+        if(buf == NULL) {
-+	    xmlSecError(XMLSEC_ERRORS_HERE,
-+		xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+		"xmlSecNssX509CrlBase64DerWrite",
-+		XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+		XMLSEC_ERRORS_NO_MESSAGE);
-+	    return(-1);
- 	}
--    }    
- 
--    /* write crls if needed */
--    if((content & XMLSEC_X509DATA_CRL_NODE) != 0) {
--	size = xmlSecNssKeyDataX509GetCrlsSize(data);
--	for(pos = 0; pos < size; ++pos) {
--	    crl = xmlSecNssKeyDataX509GetCrl(data, pos);
--	    if(crl == NULL) {
--		xmlSecError(XMLSEC_ERRORS_HERE,
--			    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--			    "xmlSecNssKeyDataX509GetCrl",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			    "pos=%d", pos);
--		return(-1);
--	    }
--	    
--	    ret = xmlSecNssX509CRLNodeWrite(crl, node, keyInfoCtx);
--	    if(ret < 0) {
--		xmlSecError(XMLSEC_ERRORS_HERE,
--			    xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
--			    "xmlSecNssX509CRLNodeWrite",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			    "pos=%d", pos);
--		return(-1);
--	    }
--	}
-+        cur = xmlSecAddChild(node, xmlSecNodeX509CRL, xmlSecDSigNs);
-+        if(cur == NULL) {
-+            xmlSecError(XMLSEC_ERRORS_HERE,
-+                        xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
-+                        "xmlSecAddChild",
-+                        XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+                        "new_node=%s",
-+                        xmlSecErrorsSafeString(xmlSecNodeX509CRL));
-+            xmlFree(buf);
-+            return(-1);
-+        }
-+        /* todo: add \n around base64 data - from context */
-+        /* todo: add errors check */
-+        xmlNodeSetContent(cur, xmlSecStringCR);
-+        xmlNodeSetContent(cur, buf);
-     }
- 
-     return(0);
-@@ -1057,46 +1024,6 @@
-     return(0);
- }
- 
--static int 
--xmlSecNssX509CertificateNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
--    xmlChar* buf;
--    xmlNodePtr cur;
--    
--    xmlSecAssert2(cert != NULL, -1);
--    xmlSecAssert2(node != NULL, -1);
--    xmlSecAssert2(keyInfoCtx != NULL, -1);
--    
--    /* set base64 lines size from context */
--    buf = xmlSecNssX509CertBase64DerWrite(cert, keyInfoCtx->base64LineSize); 
--    if(buf == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecNssX509CertBase64DerWrite",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	return(-1);
--    }
--	
--    cur = xmlSecAddChild(node, xmlSecNodeX509Certificate, xmlSecDSigNs);
--    if(cur == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecAddChild",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "node=%s",
--		    xmlSecErrorsSafeString(xmlSecNodeX509Certificate));
--	xmlFree(buf);
--	return(-1);	
--    }
--
--    /* todo: add \n around base64 data - from context */
--    /* todo: add errors check */
--    xmlNodeSetContent(cur, xmlSecStringCR);
--    xmlNodeSetContent(cur, buf);
--    xmlFree(buf);
--    return(0);
--}
--
- static int		
- xmlSecNssX509SubjectNameNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {	
-     xmlSecKeyDataStorePtr x509Store;
-@@ -1120,19 +1047,13 @@
-     }
- 
-     subject = xmlNodeGetContent(node);
--    if((subject == NULL) || (xmlSecIsEmptyString(subject) == 1)) {
--	if(subject != NULL) {
--	    xmlFree(subject);
--	}
--	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) {
-+    if(subject == NULL) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
- 		        xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 			xmlSecErrorsSafeString(xmlSecNodeGetName(node)),
- 			XMLSEC_ERRORS_R_INVALID_NODE_CONTENT,
- 			XMLSEC_ERRORS_NO_MESSAGE);
- 	    return(-1);
--	}
--	return(0);
-     }
- 
-     cert = xmlSecNssX509StoreFindCert(x509Store, subject, NULL, NULL, NULL, keyInfoCtx);
-@@ -1169,40 +1090,6 @@
-     return(0);
- }
- 
--static int
--xmlSecNssX509SubjectNameNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx ATTRIBUTE_UNUSED) {
--    xmlChar* buf = NULL;
--    xmlNodePtr cur = NULL;
--
--    xmlSecAssert2(cert != NULL, -1);
--    xmlSecAssert2(node != NULL, -1);
--
--    buf = xmlSecNssX509NameWrite(&(cert->subject));
--    if(buf == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--	    NULL,
--	    "xmlSecNssX509NameWrite(&(cert->subject))",
--	    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--	    XMLSEC_ERRORS_NO_MESSAGE);
--	return(-1);
--    }
--
--    cur = xmlSecAddChild(node, xmlSecNodeX509SubjectName, xmlSecDSigNs);
--    if(cur == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--	    NULL,
--	    "xmlSecAddChild",
--	    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--	    "node=%s",
--	    xmlSecErrorsSafeString(xmlSecNodeX509SubjectName));
--	xmlFree(buf);
--	return(-1);
--    }
--    xmlSecNodeEncodeAndSetContent(cur, buf);
--    xmlFree(buf);
--    return(0);
--}
--
- static int 
- xmlSecNssX509IssuerSerialNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-     xmlSecKeyDataStorePtr x509Store;
-@@ -1228,21 +1115,9 @@
-     }
- 
-     cur = xmlSecGetNextElementNode(node->children);
--    if(cur == NULL) {
--	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
--			xmlSecErrorsSafeString(xmlSecNodeX509IssuerName),
--			XMLSEC_ERRORS_R_NODE_NOT_FOUND,
--			"node=%s",
--			xmlSecErrorsSafeString(xmlSecNodeGetName(cur)));
--	    return(-1);
--	}
--	return(0);
--    }
-     
-     /* the first is required node X509IssuerName */
--    if(!xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerName, xmlSecDSigNs)) {
-+    if((cur == NULL) || !xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerName, xmlSecDSigNs)) {
- 	xmlSecError(XMLSEC_ERRORS_HERE,
- 		    xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 		    xmlSecErrorsSafeString(xmlSecNodeX509IssuerName),
-@@ -1336,78 +1211,6 @@
-     return(0);
- }
- 
--static int
--xmlSecNssX509IssuerSerialNodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx ATTRIBUTE_UNUSED) {
--    xmlNodePtr cur;
--    xmlNodePtr issuerNameNode;
--    xmlNodePtr issuerNumberNode;
--    xmlChar* buf;
--    
--    xmlSecAssert2(cert != NULL, -1);
--    xmlSecAssert2(node != NULL, -1);
--
--    /* create xml nodes */
--    cur = xmlSecAddChild(node, xmlSecNodeX509IssuerSerial, xmlSecDSigNs);
--    if(cur == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecAddChild",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "node=%s",
--		    xmlSecErrorsSafeString(xmlSecNodeX509IssuerSerial));
--	return(-1);
--    }
--
--    issuerNameNode = xmlSecAddChild(cur, xmlSecNodeX509IssuerName, xmlSecDSigNs);
--    if(issuerNameNode == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecAddChild",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "node=%s",
--		    xmlSecErrorsSafeString(xmlSecNodeX509IssuerName));
--	return(-1);
--    }
--
--    issuerNumberNode = xmlSecAddChild(cur, xmlSecNodeX509SerialNumber, xmlSecDSigNs);
--    if(issuerNumberNode == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecAddChild",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "node=%s",
--		    xmlSecErrorsSafeString(xmlSecNodeX509SerialNumber));
--	return(-1);
--    }
--
--    /* write data */
--    buf = xmlSecNssX509NameWrite(&(cert->issuer));
--    if(buf == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecNssX509NameWrite(&(cert->issuer))",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	return(-1);
--    }
--    xmlSecNodeEncodeAndSetContent(issuerNameNode, buf);
--    xmlFree(buf);
--
--    buf = xmlSecNssASN1IntegerWrite(&(cert->serialNumber));
--    if(buf == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecNssASN1IntegerWrite(&(cert->serialNumber))",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	return(-1);
--    }
--    xmlNodeSetContent(issuerNumberNode, buf);
--    xmlFree(buf);
--
--    return(0);
--}
--
- static int 
- xmlSecNssX509SKINodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-     xmlSecKeyDataStorePtr x509Store;
-@@ -1431,11 +1234,7 @@
-     }
-     
-     ski = xmlNodeGetContent(node);
--    if((ski == NULL) || (xmlSecIsEmptyString(ski) == 1)) {
--	if(ski != NULL) {
--	    xmlFree(ski);
--	}
--	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) {
-+    if(ski == NULL) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
- 			xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 			xmlSecErrorsSafeString(xmlSecNodeGetName(node)),
-@@ -1443,8 +1242,6 @@
- 			"node=%s",
- 			xmlSecErrorsSafeString(xmlSecNodeX509SKI));
- 	    return(-1);
--	}
--	return(0);
-     }
- 
-     cert = xmlSecNssX509StoreFindCert(x509Store, NULL, NULL, NULL, ski, keyInfoCtx);
-@@ -1479,41 +1276,6 @@
-     return(0);
- }
- 
--static int
--xmlSecNssX509SKINodeWrite(CERTCertificate* cert, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx ATTRIBUTE_UNUSED) {
--    xmlChar *buf = NULL;
--    xmlNodePtr cur = NULL;
--
--    xmlSecAssert2(cert != NULL, -1);
--    xmlSecAssert2(node != NULL, -1);
--
--    buf = xmlSecNssX509SKIWrite(cert);
--    if(buf == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecNssX509SKIWrite",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	return(-1);
--    }
--
--    cur = xmlSecAddChild(node, xmlSecNodeX509SKI, xmlSecDSigNs);
--    if(cur == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecAddChild",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "new_node=%s",
--		    xmlSecErrorsSafeString(xmlSecNodeX509SKI));
--	xmlFree(buf);
--	return(-1);
--    }
--    xmlSecNodeEncodeAndSetContent(cur, buf);
--    xmlFree(buf);
--
--    return(0);
--}
--
- static int 
- xmlSecNssX509CRLNodeRead(xmlSecKeyDataPtr data, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
-     xmlChar *content;
-@@ -1524,19 +1286,13 @@
-     xmlSecAssert2(keyInfoCtx != NULL, -1);
- 
-     content = xmlNodeGetContent(node);
--   if((content == NULL) || (xmlSecIsEmptyString(content) == 1)) {
--	if(content != NULL) {
--	    xmlFree(content);
--	}
--	if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE) != 0) {
-+    if(content == NULL){
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
- 			xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 			xmlSecErrorsSafeString(xmlSecNodeGetName(node)),
- 			XMLSEC_ERRORS_R_INVALID_NODE_CONTENT,
- 			XMLSEC_ERRORS_NO_MESSAGE);
- 	    return(-1);
--	}
--	return(0);
-     }
- 
-     crl = xmlSecNssX509CrlBase64DerRead(content, keyInfoCtx);
-@@ -1556,47 +1312,6 @@
- }
- 
- static int
--xmlSecNssX509CRLNodeWrite(CERTSignedCrl* crl, xmlNodePtr node, xmlSecKeyInfoCtxPtr keyInfoCtx) {
--    xmlChar* buf = NULL;
--    xmlNodePtr cur = NULL;
--
--    xmlSecAssert2(crl != NULL, -1);
--    xmlSecAssert2(node != NULL, -1);
--    xmlSecAssert2(keyInfoCtx != NULL, -1);
--
--    /* set base64 lines size from context */
--    buf = xmlSecNssX509CrlBase64DerWrite(crl, keyInfoCtx->base64LineSize); 
--    if(buf == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecNssX509CrlBase64DerWrite",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	return(-1);
--    }
--
--    cur = xmlSecAddChild(node, xmlSecNodeX509CRL, xmlSecDSigNs);
--    if(cur == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecAddChild",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "new_node=%s",
--		    xmlSecErrorsSafeString(xmlSecNodeX509CRL));
--	xmlFree(buf);
--	return(-1);
--    }
--    /* todo: add \n around base64 data - from context */
--    /* todo: add errors check */
--    xmlNodeSetContent(cur, xmlSecStringCR);
--    xmlNodeSetContent(cur, buf);
--    xmlFree(buf);
--
--    return(0);
--}
--
--
--static int
- xmlSecNssKeyDataX509VerifyAndExtractKey(xmlSecKeyDataPtr data, xmlSecKeyPtr key,
- 				    xmlSecKeyInfoCtxPtr keyInfoCtx) {
-     xmlSecNssX509DataCtxPtr ctx;
-@@ -1604,6 +1319,10 @@
-     int ret;
-     SECStatus status;
-     PRTime notBefore, notAfter;
-+
-+    PK11SlotInfo* slot ;
-+    SECKEYPublicKey *pubKey = NULL;
-+    SECKEYPrivateKey *priKey = NULL;
-     
-     xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecNssKeyDataX509Id), -1);
-     xmlSecAssert2(key != NULL, -1);
-@@ -1636,10 +1355,14 @@
- 			    xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
- 			    "CERT_DupCertificate",
- 			    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--			    XMLSEC_ERRORS_NO_MESSAGE);
-+			    "error code=%d", PORT_GetError());
- 		return(-1);
- 	    }
--	
-+
-+          /*-
-+	   * Get Public key from cert, which does not always work for sign
-+	   * action.
-+           *
- 	    keyValue = xmlSecNssX509CertGetKey(ctx->keyCert);
- 	    if(keyValue == NULL) {
- 		xmlSecError(XMLSEC_ERRORS_HERE,
-@@ -1649,6 +1372,54 @@
- 			    XMLSEC_ERRORS_NO_MESSAGE);
- 		return(-1);
- 	    }
-+	   */
-+            /*-
-+             * I'll search key according to KeyReq.
-+             */
-+	    slot = cert->slot ;
-+	    if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+	        if( ( priKey = PK11_FindPrivateKeyFromCert( slot , cert , NULL ) ) == NULL ) {
-+	                xmlSecError( XMLSEC_ERRORS_HERE ,
-+	                    xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+	                    "PK11_FindPrivateKeyFromCert" ,
-+	                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+	                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+	                return -1 ;
-+	            }
-+	    }
-+
-+            if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePublic ) == xmlSecKeyDataTypePublic ) {
-+                if( ( pubKey = CERT_ExtractPublicKey( cert ) ) == NULL ) {
-+                    xmlSecError( XMLSEC_ERRORS_HERE ,
-+                        xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                        "CERT_ExtractPublicKey" ,
-+                        XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                        XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+
-+                    if( priKey != NULL )
-+                        SECKEY_DestroyPrivateKey( priKey ) ;
-+                    return -1 ;
-+                }
-+            }
-+
-+            keyValue = xmlSecNssPKIAdoptKey(priKey, pubKey);
-+            if( keyValue == NULL ) {
-+                xmlSecError( XMLSEC_ERRORS_HERE ,
-+                xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                "xmlSecNssPKIAdoptKey" ,
-+                XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                XMLSEC_ERRORS_NO_MESSAGE ) ;
-+
-+                if( priKey != NULL )
-+                    SECKEY_DestroyPrivateKey( priKey ) ;
-+
-+                if( pubKey != NULL )
-+                    SECKEY_DestroyPublicKey( pubKey ) ;
-+
-+                return -1 ;
-+            }
-+            /* Modify keyValue get Done */
- 	    
- 	    /* verify that the key matches our expectations */
- 	    if(xmlSecKeyReqMatchKeyValue(&(keyInfoCtx->keyReq), keyValue) != 1) {
-@@ -1950,86 +1721,6 @@
-     return(res);
- }
- 
--static xmlChar*
--xmlSecNssX509NameWrite(CERTName* nm) {
--    xmlChar *res = NULL;
--    char *str;
--
--    xmlSecAssert2(nm != NULL, NULL);
--
--    str = CERT_NameToAscii(nm);
--    if (str == NULL) {
--        xmlSecError(XMLSEC_ERRORS_HERE,
--        	    NULL,
--        	    "CERT_NameToAscii",
--        	    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--        	    XMLSEC_ERRORS_NO_MESSAGE);
--        return(NULL);
--    }
--
--    res = xmlStrdup(BAD_CAST str);
--    if(res == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlStrdup",
--		    XMLSEC_ERRORS_R_MALLOC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	PORT_Free(str);
--	return(NULL);
--    }
--    PORT_Free(str);
--    return(res);
--}
--
--static xmlChar*
--xmlSecNssASN1IntegerWrite(SECItem *num) {
--    xmlChar *res = NULL;
--    
--    xmlSecAssert2(num != NULL, NULL);
--
--    /* TODO : to be implemented after 
--     * NSS bug http://bugzilla.mozilla.org/show_bug.cgi?id=212864 is fixed 
--     */
--    return(res);
--}
--
--static xmlChar*
--xmlSecNssX509SKIWrite(CERTCertificate* cert) {
--    xmlChar *res = NULL;
--    SECItem ski;
--    SECStatus rv;
--
--    xmlSecAssert2(cert != NULL, NULL);
--
--    memset(&ski, 0, sizeof(ski));
--
--    rv = CERT_FindSubjectKeyIDExtension(cert, &ski);
--    if (rv != SECSuccess) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "CERT_FindSubjectKeyIDExtension",
--		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	SECITEM_FreeItem(&ski, PR_FALSE);
--	return(NULL);
--    }
--
--    res = xmlSecBase64Encode(ski.data, ski.len, 0);
--    if(res == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "xmlSecBase64Encode",
--	    	    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	SECITEM_FreeItem(&ski, PR_FALSE);
--	return(NULL);
--    }
--    SECITEM_FreeItem(&ski, PR_FALSE);
--    
--    return(res);
--}
--
--
- static void 
- xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) {
-     SECItem *sn;
---- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-21 14:02:48.669245207 +0200
-@@ -30,6 +30,7 @@
- #include <xmlsec/keyinfo.h>
- #include <xmlsec/keysmngr.h>
- #include <xmlsec/base64.h>
-+#include <xmlsec/bn.h>
- #include <xmlsec/errors.h>
- 
- #include <xmlsec/nss/crypto.h>
-@@ -61,17 +62,7 @@
-  
- static int		xmlSecNssX509StoreInitialize	(xmlSecKeyDataStorePtr store);
- static void		xmlSecNssX509StoreFinalize	(xmlSecKeyDataStorePtr store);
--static int 		xmlSecNssX509NameStringRead	(xmlSecByte **str, 
--							 int *strLen, 
--							 xmlSecByte *res, 
--							 int resLen,
--							 xmlSecByte delim, 
--							 int ingoreTrailingSpaces);
--static xmlSecByte * 	xmlSecNssX509NameRead		(xmlSecByte *str, 
--							 int len);
--
--static void 		xmlSecNssNumToItem(SECItem *it, unsigned long num);
--
-+static int		xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ;
- 
- static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
-     sizeof(xmlSecKeyDataStoreKlass),
-@@ -339,40 +330,28 @@
- xmlSecNssX509FindCert(xmlChar *subjectName, xmlChar *issuerName, 
- 		      xmlChar *issuerSerial, xmlChar *ski) {
-     CERTCertificate *cert = NULL;
--    xmlChar         *p = NULL;
-     CERTName *name = NULL;
-     SECItem *nameitem = NULL;
-     PRArenaPool *arena = NULL;
- 
-     if (subjectName != NULL) {
--	p = xmlSecNssX509NameRead(subjectName, xmlStrlen(subjectName));
--	if (p == NULL) {
--            xmlSecError(XMLSEC_ERRORS_HERE,
--                        NULL,
--                        "xmlSecNssX509NameRead",
--                        XMLSEC_ERRORS_R_XMLSEC_FAILED,
--                        "subject=%s",
--                        xmlSecErrorsSafeString(subjectName));
--	    goto done;
--	}
--
- 	arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
- 	if (arena == NULL) {
-             xmlSecError(XMLSEC_ERRORS_HERE,
-                         NULL,
-                         "PORT_NewArena",
-                         XMLSEC_ERRORS_R_CRYPTO_FAILED,
--                        XMLSEC_ERRORS_NO_MESSAGE);
-+                        "error code=%d", PORT_GetError());
- 	    goto done;
- 	}
- 
--	name = CERT_AsciiToName((char*)p);
-+	name = CERT_AsciiToName((char*)subjectName);
- 	if (name == NULL) {
-             xmlSecError(XMLSEC_ERRORS_HERE,
-                         NULL,
-                         "CERT_AsciiToName",
-                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
--                        XMLSEC_ERRORS_NO_MESSAGE);
-+                        "error code=%d", PORT_GetError());
- 	    goto done;
- 	}
- 
-@@ -394,34 +373,23 @@
-     if((issuerName != NULL) && (issuerSerial != NULL)) {
- 	CERTIssuerAndSN issuerAndSN;
- 
--	p = xmlSecNssX509NameRead(issuerName, xmlStrlen(issuerName));
--	if (p == NULL) {
--            xmlSecError(XMLSEC_ERRORS_HERE,
--                        NULL,
--                        "xmlSecNssX509NameRead",
--                        XMLSEC_ERRORS_R_XMLSEC_FAILED,
--                        "issuer=%s",
--                        xmlSecErrorsSafeString(issuerName));
--	    goto done;
--	}
--
- 	arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
- 	if (arena == NULL) {
-             xmlSecError(XMLSEC_ERRORS_HERE,
-                         NULL,
-                         "PORT_NewArena",
-                         XMLSEC_ERRORS_R_CRYPTO_FAILED,
--                        XMLSEC_ERRORS_NO_MESSAGE);
-+                        "error code=%d", PORT_GetError());
- 	    goto done;
- 	}
- 
--	name = CERT_AsciiToName((char*)p);
-+	name = CERT_AsciiToName((char*)issuerName);
- 	if (name == NULL) {
-             xmlSecError(XMLSEC_ERRORS_HERE,
-                         NULL,
-                         "CERT_AsciiToName",
-                         XMLSEC_ERRORS_R_XMLSEC_FAILED,
--                        XMLSEC_ERRORS_NO_MESSAGE);
-+                        "error code=%d", PORT_GetError());
- 	    goto done;
- 	}
- 
-@@ -441,8 +409,15 @@
- 	issuerAndSN.derIssuer.data = nameitem->data;
- 	issuerAndSN.derIssuer.len = nameitem->len;
- 
--	/* TBD: serial num can be arbitrarily long */
--	xmlSecNssNumToItem(&issuerAndSN.serialNumber, PORT_Atoi((char *)issuerSerial));
-+        if( xmlSecNssIntegerToItem( issuerSerial, &issuerAndSN.serialNumber ) < 0 ) {
-+                xmlSecError(XMLSEC_ERRORS_HERE,
-+                        NULL,
-+                        "xmlSecNssIntegerToItem",
-+                        XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+                        "serial number=%s",
-+                        xmlSecErrorsSafeString(issuerSerial));
-+                goto done;
-+        }
- 
- 	cert = CERT_FindCertByIssuerAndSN(CERT_GetDefaultCertDB(), 
- 					  &issuerAndSN);
-@@ -473,9 +448,6 @@
-     }
- 
- done:
--    if (p != NULL) {
--	PORT_Free(p);
--    }
-     if (arena != NULL) {
- 	PORT_FreeArena(arena, PR_FALSE);
-     }
-@@ -486,176 +458,6 @@
-     return(cert);
- }
- 
--static xmlSecByte *
--xmlSecNssX509NameRead(xmlSecByte *str, int len) {
--    xmlSecByte name[256];
--    xmlSecByte value[256];
--    xmlSecByte *retval = NULL;
--    xmlSecByte *p = NULL;
--    int nameLen, valueLen;
--
--    xmlSecAssert2(str != NULL, NULL);
--    
--    /* return string should be no longer than input string */
--    retval = (xmlSecByte *)PORT_Alloc(len+1);
--    if(retval == NULL) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    "PORT_Alloc",
--		    XMLSEC_ERRORS_R_MALLOC_FAILED,
--		    XMLSEC_ERRORS_NO_MESSAGE);
--	return(NULL);
--    }
--    p = retval;
--    
--    while(len > 0) {
--	/* skip spaces after comma or semicolon */
--	while((len > 0) && isspace(*str)) {
--	    ++str; --len;
--	}
--
--	nameLen = xmlSecNssX509NameStringRead(&str, &len, name, sizeof(name), '=', 0);	
--	if(nameLen < 0) {
--	    xmlSecError(XMLSEC_ERRORS_HERE,
--			NULL,
--			"xmlSecNssX509NameStringRead",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			XMLSEC_ERRORS_NO_MESSAGE);
--	    goto done;
--	}
--	memcpy(p, name, nameLen);
--	p+=nameLen;
--	*p++='=';
--	if(len > 0) {
--	    ++str; --len;
--	    if((*str) == '\"') {
--		valueLen = xmlSecNssX509NameStringRead(&str, &len, 
--					value, sizeof(value), '"', 1);	
--		if(valueLen < 0) {
--		    xmlSecError(XMLSEC_ERRORS_HERE,
--				NULL,
--				"xmlSecNssX509NameStringRead",
--				XMLSEC_ERRORS_R_XMLSEC_FAILED,
--				XMLSEC_ERRORS_NO_MESSAGE);
--		    goto done;
--    		}
--		/* skip spaces before comma or semicolon */
--		while((len > 0) && isspace(*str)) {
--		    ++str; --len;
--		}
--		if((len > 0) && ((*str) != ',')) {
--		    xmlSecError(XMLSEC_ERRORS_HERE,
--				NULL,
--				NULL,
--				XMLSEC_ERRORS_R_INVALID_DATA,
--				"comma is expected");
--		    goto done;
--		}
--		if(len > 0) {
--		    ++str; --len;
--		}
--		*p++='\"';
--		memcpy(p, value, valueLen);
--		p+=valueLen;
--		*p++='\"';
--	    } else if((*str) == '#') {
--		/* TODO: read octect values */
--		xmlSecError(XMLSEC_ERRORS_HERE,
--			    NULL,
--			    NULL,
--			    XMLSEC_ERRORS_R_INVALID_DATA,
--			    "reading octect values is not implemented yet");
--		goto done;
--	    } else {
--		valueLen = xmlSecNssX509NameStringRead(&str, &len, 
--					value, sizeof(value), ',', 1);	
--		if(valueLen < 0) {
--		    xmlSecError(XMLSEC_ERRORS_HERE,
--				NULL,
--				"xmlSecNssX509NameStringRead",
--				XMLSEC_ERRORS_R_XMLSEC_FAILED,
--				XMLSEC_ERRORS_NO_MESSAGE);
--		    goto done;
--    		}
--		memcpy(p, value, valueLen);
--		p+=valueLen;
--		if (len > 0)
--		    *p++=',';
--	    } 			
--	} else {
--	    valueLen = 0;
--	}
--	if(len > 0) {
--	    ++str; --len;
--	}	
--    }
--
--    *p = 0;
--    return(retval);
--    
--done:
--    PORT_Free(retval);
--    return (NULL);
--}
--
--static int 
--xmlSecNssX509NameStringRead(xmlSecByte **str, int *strLen, 
--			    xmlSecByte *res, int resLen,
--			    xmlSecByte delim, int ingoreTrailingSpaces) {
--    xmlSecByte *p, *q, *nonSpace; 
--
--    xmlSecAssert2(str != NULL, -1);
--    xmlSecAssert2(strLen != NULL, -1);
--    xmlSecAssert2(res != NULL, -1);
--    
--    p = (*str);
--    nonSpace = q = res;
--    while(((p - (*str)) < (*strLen)) && ((*p) != delim) && ((q - res) < resLen)) { 
--	if((*p) != '\\') {
--	    if(ingoreTrailingSpaces && !isspace(*p)) {
--		nonSpace = q;	
--	    }
--	    *(q++) = *(p++);
--	} else {
--	    ++p;
--	    nonSpace = q;    
--	    if(xmlSecIsHex((*p))) {
--		if((p - (*str) + 1) >= (*strLen)) {
--		    xmlSecError(XMLSEC_ERRORS_HERE,
--				NULL,
--				NULL,
--				XMLSEC_ERRORS_R_INVALID_DATA,
--				"two hex digits expected");
--	    	    return(-1);
--		}
--		*(q++) = xmlSecGetHex(p[0]) * 16 + xmlSecGetHex(p[1]);
--		p += 2;
--	    } else {
--		if(((++p) - (*str)) >= (*strLen)) {
--		    xmlSecError(XMLSEC_ERRORS_HERE,
--				NULL,
--				NULL,
--				XMLSEC_ERRORS_R_INVALID_DATA,
--				"escaped symbol missed");
--		    return(-1);
--		}
--		*(q++) = *(p++); 
--	    }
--	}	    
--    }
--    if(((p - (*str)) < (*strLen)) && ((*p) != delim)) {
--	xmlSecError(XMLSEC_ERRORS_HERE,
--		    NULL,
--		    NULL,
--		    XMLSEC_ERRORS_R_INVALID_SIZE,
--		    "buffer is too small");
--	return(-1);
--    }
--    (*strLen) -= (p - (*str));
--    (*str) = p;
--    return((ingoreTrailingSpaces) ? nonSpace - res + 1 : q - res);
--}
--
- /* code lifted from NSS */
- static void
- xmlSecNssNumToItem(SECItem *it, unsigned long ui)
-@@ -699,6 +501,77 @@
-     it->len = len;
-     PORT_Memcpy(it->data, bb + (sizeof(bb) - len), len);
- }
-+
-+static int
-+xmlSecNssIntegerToItem(
-+       const xmlChar* integer ,
-+       SECItem *item
-+) {
-+    xmlSecBn bn ;
-+    xmlSecSize i, length ;
-+    const xmlSecByte* bnInteger ;
-+
-+    xmlSecAssert2( integer != NULL, -1 ) ;
-+    xmlSecAssert2( item != NULL, -1 ) ;
-+
-+    if( xmlSecBnInitialize( &bn, 0 ) < 0 ) {
-+        xmlSecError(XMLSEC_ERRORS_HERE,
-+                       NULL,
-+                       "xmlSecBnInitialize",
-+                       XMLSEC_ERRORS_R_INVALID_DATA,
-+                       XMLSEC_ERRORS_NO_MESSAGE);
-+           return -1 ;
-+    }
-+
-+    if( xmlSecBnFromDecString( &bn, integer ) < 0 ) {
-+                   xmlSecError(XMLSEC_ERRORS_HERE,
-+                               NULL,
-+                               "xmlSecBnFromDecString",
-+                               XMLSEC_ERRORS_R_INVALID_DATA,
-+                               XMLSEC_ERRORS_NO_MESSAGE);
-+        xmlSecBnFinalize( &bn ) ;
-+        return -1 ;
-+    }
-+
-+    length = xmlSecBnGetSize( &bn ) ;
-+    if( length <= 0 ) {
-+                   xmlSecError(XMLSEC_ERRORS_HERE,
-+                               NULL,
-+                               "xmlSecBnGetSize",
-+                               XMLSEC_ERRORS_R_INVALID_DATA,
-+                               XMLSEC_ERRORS_NO_MESSAGE);
-+    }
-+
-+    bnInteger = xmlSecBnGetData( &bn ) ;
-+    if( bnInteger == NULL ) {
-+                   xmlSecError(XMLSEC_ERRORS_HERE,
-+                               NULL,
-+                               "xmlSecBnGetData",
-+                               XMLSEC_ERRORS_R_INVALID_DATA,
-+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        xmlSecBnFinalize( &bn ) ;
-+        return -1 ;
-+    }
-+
-+    item->data = ( unsigned char * )PORT_Alloc( length );
-+    if( item->data == NULL ) {
-+                   xmlSecError(XMLSEC_ERRORS_HERE,
-+                               NULL,
-+                               "PORT_Alloc",
-+                               XMLSEC_ERRORS_R_INVALID_DATA,
-+                               XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        xmlSecBnFinalize( &bn ) ;
-+        return -1 ;
-+    }
-+
-+    item->len = length;
-+    for( i = 0 ; i < length ; i ++ )
-+        item->data[i] = *( bnInteger + i ) ;
-+
-+    xmlSecBnFinalize( &bn ) ;
-+
-+    return 0 ;
-+}
- #endif /* XMLSEC_NO_X509 */
- 
- 
---- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-09-21 14:02:48.607277908 +0200
-@@ -218,6 +218,9 @@
- 	$(XMLSEC_OPENSSL_INTDIR_A)\x509vfy.obj 
- 
- XMLSEC_NSS_OBJS = \
-+	$(XMLSEC_NSS_INTDIR)\akmngr.obj\
-+	$(XMLSEC_NSS_INTDIR)\keywrapers.obj\
-+	$(XMLSEC_NSS_INTDIR)\tokens.obj\
- 	$(XMLSEC_NSS_INTDIR)\app.obj\
- 	$(XMLSEC_NSS_INTDIR)\bignum.obj\
- 	$(XMLSEC_NSS_INTDIR)\ciphers.obj \
-@@ -253,6 +256,7 @@
- 	$(XMLSEC_NSS_INTDIR_A)\strings.obj
- 
- XMLSEC_MSCRYPTO_OBJS = \
-+	$(XMLSEC_MSCRYPTO_INTDIR)\akmngr.obj\
- 	$(XMLSEC_MSCRYPTO_INTDIR)\app.obj\
- 	$(XMLSEC_MSCRYPTO_INTDIR)\crypto.obj \
- 	$(XMLSEC_MSCRYPTO_INTDIR)\ciphers.obj \
diff --git a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch b/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
deleted file mode 100644
index 8c6349a..0000000
--- a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-06-26 05:53:18.000000000 +0900
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-09-30 18:53:05.373000000 +0900
-@@ -35,6 +35,7 @@
- 	csp_oid.h \
- 	globals.h \
- 	xmlsec-mingw.h \
-+	akmngr.c \
- 	$(NULL)
- 
- if SHAREDLIB_HACK
---- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-06-26 05:53:32.000000000 +0900
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-09-30 19:00:50.107375000 +0900
-@@ -72,7 +72,8 @@
- am__libxmlsec1_mscrypto_la_SOURCES_DIST = app.c certkeys.c ciphers.c \
- 	crypto.c digests.c keysstore.c kt_rsa.c signatures.c symkeys.c \
- 	x509.c x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
--	../strings.c
-+	../strings.c \
-+	akmngr.c
- am__objects_1 =
- @SHAREDLIB_HACK_TRUE@am__objects_2 =  \
- @SHAREDLIB_HACK_TRUE@	libxmlsec1_mscrypto_la-strings.lo
-@@ -86,7 +87,8 @@
- 	libxmlsec1_mscrypto_la-signatures.lo \
- 	libxmlsec1_mscrypto_la-symkeys.lo \
- 	libxmlsec1_mscrypto_la-x509.lo \
--	libxmlsec1_mscrypto_la-x509vfy.lo $(am__objects_1) \
-+	libxmlsec1_mscrypto_la-x509vfy.lo \
-+	libxmlsec1_mscrypto_la-akmngr.lo $(am__objects_1) \
- 	$(am__objects_2)
- libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
- libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -338,6 +340,7 @@
- libxmlsec1_mscrypto_la_SOURCES = app.c certkeys.c ciphers.c crypto.c \
- 	digests.c keysstore.c kt_rsa.c signatures.c symkeys.c x509.c \
- 	x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
-+	akmngr.c \
- 	$(NULL) $(am__append_1)
- libxmlsec1_mscrypto_la_LIBADD = \
- 	../libxmlsec1.la \
-@@ -441,6 +444,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -470,6 +474,13 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
- 
-+libxmlsec1_mscrypto_la-akmngr.lo: akmngr.c
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo" -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='akmngr.c' object='libxmlsec1_mscrypto_la-akmngr.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
-+
- libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c
- @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo
diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch
deleted file mode 100644
index fd71ddf..0000000
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ /dev/null
@@ -1,257 +0,0 @@
---- misc/xmlsec1-1.2.14/configure	2009-09-29 15:55:33.269924586 +0200
-+++ misc/build/xmlsec1-1.2.14/configure	2009-09-29 15:55:08.838176411 +0200
-@@ -13184,7 +13184,9 @@
- 	done
- 
- 	for dir in $ac_nss_lib_dir ; do
--	    if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
-+            case $host_os in
-+            cygwin* | mingw* | pw32*)
-+    	      if test -f $dir/libnspr4.$libext ; then
- 		        	if test "z$dir" = "z/usr/lib" ; then
-             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-     		else
-@@ -13197,6 +13199,25 @@
- 		NSPR_LIBS_FOUND="yes"
- 		break
- 	    fi
-+              ;;
-+
-+            *)
-+
-+              if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
-+		        	if test "z$dir" = "z/usr/lib" ; then
-+            	    NSPR_LIBS="$NSPR_LIBS_LIST"
-+    		else
-+    		    if test "z$with_gnu_ld" = "zyes" ; then
-+    			NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
-+    		    else
-+    			NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
-+		    fi
-+		fi
-+		NSPR_LIBS_FOUND="yes"
-+		break
-+	    fi
-+              ;;
-+            esac
- 	done
-     fi
- 
-@@ -13266,6 +13287,24 @@
-         done
- 
-         for dir in $ac_nss_lib_dir ; do
-+            case $host_os in
-+            cygwin* | mingw* | pw32*)
-+    	      if test -f $dir/libnss3.$libext ; then
-+        	    		if test "z$dir" = "z/usr/lib" ; then
-+        	    NSS_LIBS="$NSS_LIBS_LIST"
-+                else
-+            	    if test "z$with_gnu_ld" = "zyes" ; then
-+    			NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
-+            	    else
-+        		NSS_LIBS="-L$dir $NSS_LIBS_LIST"
-+		    fi
-+		fi
-+    		NSS_LIBS_FOUND="yes"
-+    		break
-+	    fi
-+              ;;
-+
-+            *)
-             if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
-         	    		if test "z$dir" = "z/usr/lib" ; then
-         	    NSS_LIBS="$NSS_LIBS_LIST"
-@@ -13279,6 +13318,8 @@
-     		NSS_LIBS_FOUND="yes"
-     		break
- 	    fi
-+              ;;
-+            esac
- 	done
-     fi
- 
-@@ -13684,7 +13725,7 @@
- $as_echo "$MSCRYPTO_ENABLE" >&6; }
- else
-     LIBS_SAVE="$LIBS"
--    LIBS="$LIBS -lcrypt32"
-+    LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5
- $as_echo_n "checking for mscrypto libraries... " >&6; }
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13711,13 +13752,7 @@
-     XMLSEC_NO_MSCRYPTO="0"
- 
-     MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
--    case $host in
--	*-*-mingw*)
--						MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
--	*)
--		MSCRYPTO_LIBS="-lcrypt32";;
--    esac
--
-+    MSCRYPTO_LIBS="${PSDK_HOME}/lib/crypt32.lib"
-         if test "z$XMLSEC_CRYPTO" = "z" ; then
- 	XMLSEC_CRYPTO="mscrypto"
-     	XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB"
---- misc/xmlsec1-1.2.14/configure.in	2009-09-29 15:55:33.282288142 +0200
-+++ misc/build/xmlsec1-1.2.14/configure.in	2009-09-29 15:49:39.614223428 +0200
-@@ -671,7 +671,9 @@
- 	done
- 	
- 	for dir in $ac_nss_lib_dir ; do
--	    if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
-+            case $host_os in
-+            cygwin* | mingw* | pw32*)
-+    	      if test -f $dir/libnspr4.$libext ; then
- 		dnl do not add -L/usr/lib because compiler does it anyway
-         	if test "z$dir" = "z/usr/lib" ; then
-             	    NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -685,6 +687,26 @@
- 		NSPR_LIBS_FOUND="yes"
- 		break
- 	    fi
-+              ;;
-+
-+            *)
-+
-+              if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
-+		dnl do not add -L/usr/lib because compiler does it anyway
-+        	if test "z$dir" = "z/usr/lib" ; then
-+            	    NSPR_LIBS="$NSPR_LIBS_LIST"
-+    		else
-+    		    if test "z$with_gnu_ld" = "zyes" ; then
-+    			NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
-+    		    else
-+    			NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
-+		    fi
-+		fi
-+		NSPR_LIBS_FOUND="yes"
-+		break
-+	    fi
-+              ;;
-+            esac
- 	done
-     fi
- 
-@@ -742,6 +764,25 @@
-         done
-        
-         for dir in $ac_nss_lib_dir ; do
-+            case $host_os in
-+            cygwin* | mingw* | pw32*)
-+    	      if test -f $dir/libnss3.$libext ; then
-+        	dnl do not add -L/usr/lib because compiler does it anyway
-+    		if test "z$dir" = "z/usr/lib" ; then
-+        	    NSS_LIBS="$NSS_LIBS_LIST"
-+                else
-+            	    if test "z$with_gnu_ld" = "zyes" ; then
-+    			NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
-+            	    else
-+        		NSS_LIBS="-L$dir $NSS_LIBS_LIST"
-+		    fi
-+		fi
-+    		NSS_LIBS_FOUND="yes"
-+    		break
-+	    fi
-+              ;;
-+
-+            *)
-             if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
-         	dnl do not add -L/usr/lib because compiler does it anyway
-     		if test "z$dir" = "z/usr/lib" ; then
-@@ -756,6 +797,8 @@
-     		NSS_LIBS_FOUND="yes"
-     		break
- 	    fi
-+              ;;
-+            esac
- 	done
-     fi
- 
-@@ -926,7 +969,7 @@
- dnl cannot detect __stdcall functions
- dnl    AC_CHECK_LIB(crypt32, CertOpenStore, ....
-     LIBS_SAVE="$LIBS"
--    LIBS="$LIBS -lcrypt32"
-+    LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib"
-     AC_MSG_CHECKING(for mscrypto libraries)
-     AC_LINK_IFELSE([
- 	#include <windows.h>
-@@ -943,15 +986,7 @@
-     XMLSEC_NO_MSCRYPTO="0"
- 
-     MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
--    case $host in
--	*-*-mingw*)
--		dnl since mingw crypt32 library is limited
--		dnl we use own def-file
--		MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';;
--	*)
--		MSCRYPTO_LIBS="-lcrypt32";;
--    esac
--
-+    MSCRYPTO_LIBS="${PSDK_HOME}/lib/crypt32.lib"
-     dnl first crypto library is default one
-     if test "z$XMLSEC_CRYPTO" = "z" ; then
- 	XMLSEC_CRYPTO="mscrypto"
---- misc/xmlsec1-1.2.14/ltmain.sh	2009-06-25 22:53:19.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/ltmain.sh	2009-09-29 15:49:39.628349554 +0200
-@@ -4868,6 +4868,11 @@
- 	fi
- 	;;
- 
-+      *.lib)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       *.$libext)
- 	# An archive.
- 	deplibs="$deplibs $arg"
-@@ -5213,6 +5218,10 @@
- 	  continue
- 	  ;;
- 	*.la) lib="$deplib" ;;
-+	*.lib)
-+	  deplibs="$deplib $deplibs"
-+	  continue
-+	  ;;
- 	*.$libext)
- 	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
---- misc/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-29 15:55:33.430875248 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c	2009-09-29 15:49:39.749963247 +0200
-@@ -1126,6 +1126,7 @@
-     NULL,					/* void* reserved1; */
- };
- 
-+#ifndef __MINGW32__
- /** 
-  * xmlSecNssTransformKWAes128GetKlass:
-  *
-@@ -1160,6 +1161,7 @@
- xmlSecNssTransformKWAes256GetKlass(void) {
-     return(&xmlSecNssKWAes256Klass);
- }
-+#endif /* __MINGW32__ */
- 
- #endif /* XMLSEC_NO_AES */
- 
-@@ -1197,6 +1199,7 @@
-     NULL,					/* void* reserved1; */
- };
- 
-+#ifndef __MINGW32__
- /** 
-  * xmlSecNssTransformKWDes3GetKlass:
-  * 
-@@ -1208,6 +1211,7 @@
- xmlSecNssTransformKWDes3GetKlass(void) {
-     return(&xmlSecNssKWDes3Klass);
- }
-+#endif /* __MINGW32__ */
- 
- #endif /* XMLSEC_NO_DES */
- 
diff --git a/libxmlsec/xmlsec1-noverify.patch b/libxmlsec/xmlsec1-noverify.patch
deleted file mode 100644
index c51540c..0000000
--- a/libxmlsec/xmlsec1-noverify.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-23 10:01:07.237316078 +0200
-@@ -567,9 +567,16 @@
-             CertFreeCertificateContext(nextCert);                
-         }
- 
--        if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) {
--            return(cert);
--        }
-+        /* JL: OpenOffice.org implements its own certificate verification routine. 
-+           The goal is to seperate validation of the signature
-+           and the certificate. For example, OOo could show that the document signature is valid,
-+           but the certificate could not be verified. If we do not prevent the verification of
-+           the certificate by libxmlsec and the verification fails, then the XML signature will not be 
-+           verified. This would happen, for example, if the root certificate is not installed.                
-+         */
-+/*      if((selected == 1) && xmlSecMSCryptoX509StoreConstructCertsChain(store, cert, certs, keyInfoCtx)) { */
-+        if (selected == 1)
-+            return cert;
-     }
- 
-     return (NULL);
---- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:06:52.989793254 +0200
-+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:05:03.183042205 +0200
-@@ -191,13 +191,27 @@
- 	    continue;
- 	}
- 
--	status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), 
--					cert, PR_FALSE, 
--					(SECCertificateUsage)0,
--                			timeboundary , NULL, NULL, NULL);
--	if (status == SECSuccess) {
--	    break;
--	}
-+
-+	/*
-+      JL: OpenOffice.org implements its own certificate verification routine. 
-+      The goal is to seperate validation of the signature
-+      and the certificate. For example, OOo could show that the document signature is valid,
-+      but the certificate could not be verified. If we do not prevent the verification of
-+      the certificate by libxmlsec and the verification fails, then the XML signature may not be 
-+      verified. This would happen, for example, if the root certificate is not installed.
-+      
-+      status = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), 
-+          cert, PR_FALSE, 
-+          (SECCertificateUsage)0,
-+          timeboundary , NULL, NULL, NULL);
-+      if (status == SECSuccess) {
-+         break;
-+      }
-+	 
-+    */
-+	status = SECSuccess;
-+	break;
-+
-     }
- 
-     if (status == SECSuccess) {
diff --git a/libxmlsec/xmlsec1-nssdisablecallbacks.patch b/libxmlsec/xmlsec1-nssdisablecallbacks.patch
deleted file mode 100644
index c6ed83a..0000000
--- a/libxmlsec/xmlsec1-nssdisablecallbacks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- misc/xmlsec1-1.2.14.orig/src/nss/crypto.c	2009-09-10 07:06:17.000000000 -0400
-+++ misc/build/xmlsec1-1.2.14/src/nss/crypto.c	2009-09-10 07:08:24.000000000 -0400
-@@ -136,6 +136,7 @@
-     /**
-      * High level routines form xmlsec command line utility
-      */ 
-+#if 0
-     gXmlSecNssFunctions->cryptoAppInit 			= xmlSecNssAppInit;
-     gXmlSecNssFunctions->cryptoAppShutdown 		= xmlSecNssAppShutdown;
-     gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit 	= xmlSecNssAppDefaultKeysMngrInit;
-@@ -153,6 +154,25 @@
-     gXmlSecNssFunctions->cryptoAppKeyLoad 		= xmlSecNssAppKeyLoad; 
-     gXmlSecNssFunctions->cryptoAppKeyLoadMemory		= xmlSecNssAppKeyLoadMemory; 
-     gXmlSecNssFunctions->cryptoAppDefaultPwdCallback	= (void*)xmlSecNssAppGetDefaultPwdCallback();
-+#else
-+    gXmlSecNssFunctions->cryptoAppInit                         = NULL ;
-+    gXmlSecNssFunctions->cryptoAppShutdown             = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit  = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrAdoptKey      = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrLoad  = NULL ;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrSave  = NULL ;
-+#ifndef XMLSEC_NO_X509
-+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoad     = NULL ;
-+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoadMemory= NULL ;
-+    gXmlSecNssFunctions->cryptoAppPkcs12Load           = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppPkcs12LoadMemory     = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppKeyCertLoad          = NULL ;
-+    gXmlSecNssFunctions->cryptoAppKeyCertLoadMemory    = NULL ;
-+#endif /* XMLSEC_NO_X509 */
-+    gXmlSecNssFunctions->cryptoAppKeyLoad              = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppKeyLoadMemory                = NULL ; 
-+    gXmlSecNssFunctions->cryptoAppDefaultPwdCallback   = (void*)NULL ;
-+#endif
- 
-     return(gXmlSecNssFunctions);
- }
diff --git a/libxmlsec/xmlsec1-nssmangleciphers.patch b/libxmlsec/xmlsec1-nssmangleciphers.patch
deleted file mode 100644
index 96f5049..0000000
--- a/libxmlsec/xmlsec1-nssmangleciphers.patch
+++ /dev/null
@@ -1,1134 +0,0 @@
---- misc/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-10 05:16:27.000000000 -0400
-+++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-10 06:59:39.000000000 -0400
-@@ -11,180 +11,421 @@
- 
- #include <string.h>
- 
--#include <nspr.h>
- #include <nss.h>
--#include <secoid.h>
- #include <pk11func.h>
- 
- #include <xmlsec/xmlsec.h>
-+#include <xmlsec/xmltree.h>
-+#include <xmlsec/base64.h>
- #include <xmlsec/keys.h>
- #include <xmlsec/transforms.h>
- #include <xmlsec/errors.h>
- 
- #include <xmlsec/nss/crypto.h>
--
--#define XMLSEC_NSS_MAX_KEY_SIZE		32
--#define XMLSEC_NSS_MAX_IV_SIZE		32
--#define XMLSEC_NSS_MAX_BLOCK_SIZE	32
-+#include <xmlsec/nss/ciphers.h>
- 
- /**************************************************************************
-  *
-- * Internal Nss Block cipher CTX
-+ * Internal Nss Block Cipher Context
-+ * This context is designed for repositing a block cipher for transform
-  *
-  *****************************************************************************/
--typedef struct _xmlSecNssBlockCipherCtx		xmlSecNssBlockCipherCtx,
--							*xmlSecNssBlockCipherCtxPtr;
-+typedef struct _xmlSecNssBlockCipherCtx                xmlSecNssBlockCipherCtx ;
-+typedef struct _xmlSecNssBlockCipherCtx*       xmlSecNssBlockCipherCtxPtr ;
-+
- struct _xmlSecNssBlockCipherCtx {
-     CK_MECHANISM_TYPE	cipher;
-+    PK11SymKey*         symkey ;
-     PK11Context*	cipherCtx;
-     xmlSecKeyDataId	keyId;
--    int			keyInitialized;
--    int			ctxInitialized;
--    xmlSecByte		key[XMLSEC_NSS_MAX_KEY_SIZE];
--    xmlSecSize		keySize;
--    xmlSecByte		iv[XMLSEC_NSS_MAX_IV_SIZE];
--    xmlSecSize		ivSize;
- };
--static int 	xmlSecNssBlockCipherCtxInit		(xmlSecNssBlockCipherCtxPtr ctx,
--							 xmlSecBufferPtr in,
--							 xmlSecBufferPtr out,
--							 int encrypt,
--							 const xmlChar* cipherName,
--							 xmlSecTransformCtxPtr transformCtx);
--static int 	xmlSecNssBlockCipherCtxUpdate	(xmlSecNssBlockCipherCtxPtr ctx,
--							 xmlSecBufferPtr in,
--							 xmlSecBufferPtr out,
--							 int encrypt,
--							 const xmlChar* cipherName,
--							 xmlSecTransformCtxPtr transformCtx);
--static int 	xmlSecNssBlockCipherCtxFinal		(xmlSecNssBlockCipherCtxPtr ctx,
--							 xmlSecBufferPtr in,
--							 xmlSecBufferPtr out,
--							 int encrypt,
--							 const xmlChar* cipherName,
--							 xmlSecTransformCtxPtr transformCtx);
-+
-+#define xmlSecNssBlockCipherSize       \
-+       ( sizeof( xmlSecTransform ) + sizeof( xmlSecNssBlockCipherCtx ) )
-+
-+#define xmlSecNssBlockCipherGetCtx( transform ) \
-+       ( ( xmlSecNssBlockCipherCtxPtr )( ( ( xmlSecByte* )( transform ) ) + sizeof( xmlSecTransform ) ) )
-+
-+static int
-+xmlSecNssBlockCipherCheckId(
-+       xmlSecTransformPtr transform
-+) {
-+       #ifndef XMLSEC_NO_DES
-+       if( xmlSecTransformCheckId( transform, xmlSecNssTransformDes3CbcId ) ) {
-+               return 1 ;
-+       }
-+       #endif /* XMLSEC_NO_DES */
-+
-+       #ifndef XMLSEC_NO_AES
-+       if( xmlSecTransformCheckId( transform, xmlSecNssTransformAes128CbcId ) ||
-+               xmlSecTransformCheckId( transform, xmlSecNssTransformAes192CbcId ) ||
-+               xmlSecTransformCheckId( transform, xmlSecNssTransformAes256CbcId ) ) {
-+
-+               return 1 ;
-+    }
-+       #endif /* XMLSEC_NO_AES */
-+    
-+    return 0 ;
-+}
-+
-+static int
-+xmlSecNssBlockCipherFetchCtx(
-+       xmlSecNssBlockCipherCtxPtr              context ,
-+       xmlSecTransformId                               id
-+) {
-+       xmlSecAssert2( context != NULL, -1 ) ;
-+
-+       #ifndef XMLSEC_NO_DES
-+       if( id == xmlSecNssTransformDes3CbcId ) {
-+               context->cipher = CKM_DES3_CBC ;
-+               context->keyId = xmlSecNssKeyDataDesId ;
-+       } else
-+       #endif          /* XMLSEC_NO_DES */
-+
-+       #ifndef XMLSEC_NO_AES
-+       if( id == xmlSecNssTransformAes128CbcId ) {
-+               context->cipher = CKM_AES_CBC ;
-+               context->keyId = xmlSecNssKeyDataAesId ;
-+       } else
-+       if( id == xmlSecNssTransformAes192CbcId ) {
-+               context->cipher = CKM_AES_CBC ;
-+               context->keyId = xmlSecNssKeyDataAesId ;
-+       } else
-+       if( id == xmlSecNssTransformAes256CbcId ) {
-+               context->cipher = CKM_AES_CBC ;
-+               context->keyId = xmlSecNssKeyDataAesId ;
-+       } else
-+       #endif          /* XMLSEC_NO_AES */
-+
-+       if( 1 ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   NULL ,
-+                   NULL ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+
-+       return 0 ;
-+}
-+
-+/**
-+ * xmlSecTransformInitializeMethod:
-+ * @transform:                 the pointer to transform object.
-+ *
-+ * The transform specific initialization method.
-+ *
-+ * Returns 0 on success or a negative value otherwise.
-+ */
-+static int
-+xmlSecNssBlockCipherInitialize(
-+       xmlSecTransformPtr transform
-+) {
-+       xmlSecNssBlockCipherCtxPtr context = NULL ;
-+
-+       xmlSecAssert2( xmlSecNssBlockCipherCheckId( transform ), -1 ) ;
-+       xmlSecAssert2( xmlSecTransformCheckSize( transform, xmlSecNssBlockCipherSize ), -1 ) ;
-+
-+       context = xmlSecNssBlockCipherGetCtx( transform ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+                   "xmlSecNssBlockCipherGetCtx" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+
-+       if( xmlSecNssBlockCipherFetchCtx( context , transform->id ) < 0 ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+                   "xmlSecNssBlockCipherFetchCtx" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+
-+       context->symkey = NULL ;
-+       context->cipherCtx = NULL ;
-+
-+       return 0 ;
-+}
-+
-+/**
-+ * xmlSecTransformFinalizeMethod:
-+ * @transform:                 the pointer to transform object.
-+ *
-+ * The transform specific destroy method.
-+ */
-+static void 
-+xmlSecNssBlockCipherFinalize(
-+       xmlSecTransformPtr transform
-+) {
-+       xmlSecNssBlockCipherCtxPtr context = NULL ;
-+
-+       xmlSecAssert( xmlSecNssBlockCipherCheckId( transform ) ) ;
-+       xmlSecAssert( xmlSecTransformCheckSize( transform, xmlSecNssBlockCipherSize ) ) ;
-+
-+       context = xmlSecNssBlockCipherGetCtx( transform ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+                   "xmlSecNssBlockCipherGetCtx" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return ;    
-+       }
-+
-+       if( context->cipherCtx != NULL ) {
-+               PK11_DestroyContext( context->cipherCtx, PR_TRUE ) ;
-+               context->cipherCtx = NULL ;
-+       }
-+
-+       if( context->symkey != NULL ) {
-+               PK11_FreeSymKey( context->symkey ) ;
-+               context->symkey = NULL ;
-+       }
-+
-+       context->cipher = CKM_INVALID_MECHANISM ;
-+       context->keyId = NULL ;
-+}
-+
-+/**
-+ * xmlSecTransformSetKeyRequirementsMethod:
-+ * @transform:                 the pointer to transform object.
-+ * @keyReq:                            the pointer to key requirements structure.
-+ *
-+ * Transform specific method to set transform's key requirements.
-+ * 
-+ * Returns 0 on success or a negative value otherwise.
-+ */
-+static int  
-+xmlSecNssBlockCipherSetKeyReq(
-+       xmlSecTransformPtr transform ,
-+       xmlSecKeyReqPtr keyReq
-+) {
-+       xmlSecNssBlockCipherCtxPtr context = NULL ;
-+       xmlSecSize cipherSize = 0 ;
-+
-+       xmlSecAssert2( xmlSecNssBlockCipherCheckId( transform ), -1 ) ;
-+       xmlSecAssert2( xmlSecTransformCheckSize( transform, xmlSecNssBlockCipherSize ), -1 ) ;
-+       xmlSecAssert2( keyReq != NULL , -1 ) ;
-+       xmlSecAssert2( ( transform->operation == xmlSecTransformOperationEncrypt ) || ( transform->operation == xmlSecTransformOperationDecrypt ), -1 ) ;
-+
-+       context = xmlSecNssBlockCipherGetCtx( transform ) ;
-+       if( context == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+                   "xmlSecNssBlockCipherGetCtx" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+
-+       keyReq->keyId = context->keyId ;
-+       keyReq->keyType = xmlSecKeyDataTypeSymmetric ;
-+
-+       if( transform->operation == xmlSecTransformOperationEncrypt ) {
-+               keyReq->keyUsage = xmlSecKeyUsageEncrypt ;
-+       } else {
-+               keyReq->keyUsage = xmlSecKeyUsageDecrypt ;
-+       }
-+
-+       /*
-+       if( context->symkey != NULL )
-+               cipherSize = PK11_GetKeyLength( context->symkey ) ; 
-+
-+       keyReq->keyBitsSize = cipherSize * 8 ;
-+       */
-+
-+       return 0 ;
-+}
-+
-+/**
-+ * xmlSecTransformSetKeyMethod:
-+ * @transform:                 the pointer to transform object.
-+ * @key:                               the pointer to key.
-+ *
-+ * The transform specific method to set the key for use.
-+ * 
-+ * Returns 0 on success or a negative value otherwise.
-+ */
-+static int
-+xmlSecNssBlockCipherSetKey(
-+       xmlSecTransformPtr transform ,
-+       xmlSecKeyPtr key
-+) {
-+       xmlSecNssBlockCipherCtxPtr context = NULL ;
-+       xmlSecKeyDataPtr        keyData = NULL ;
-+       PK11SymKey*                     symkey = NULL ;
-+       CK_ATTRIBUTE_TYPE       operation ;
-+       int                                     ivLen ;
-+
-+       xmlSecAssert2( xmlSecNssBlockCipherCheckId( transform ), -1 ) ;
-+       xmlSecAssert2( xmlSecTransformCheckSize( transform, xmlSecNssBlockCipherSize ), -1 ) ;
-+       xmlSecAssert2( key != NULL , -1 ) ;
-+    xmlSecAssert2( ( transform->operation == xmlSecTransformOperationEncrypt ) || ( transform->operation == xmlSecTransformOperationDecrypt ), -1 ) ;
-+
-+       context = xmlSecNssBlockCipherGetCtx( transform ) ;
-+       if( context == NULL || context->keyId == NULL || context->symkey != NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+                   "xmlSecNssBlockCipherGetCtx" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+       xmlSecAssert2( xmlSecKeyCheckId( key, context->keyId ), -1 ) ;
-+
-+       keyData = xmlSecKeyGetValue( key ) ;
-+       if( keyData == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecKeyGetName( key ) ) ,
-+                   "xmlSecKeyGetValue" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+
-+       if( ( symkey = xmlSecNssSymKeyDataGetKey( keyData ) ) == NULL ) {
-+               xmlSecError( XMLSEC_ERRORS_HERE ,
-+                   xmlSecErrorsSafeString( xmlSecKeyDataGetName( keyData ) ) ,
-+                   "xmlSecNssSymKeyDataGetKey" ,
-+                   XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                   XMLSEC_ERRORS_NO_MESSAGE ) ;
-+               return -1 ;    
-+       }
-+
-+       context->symkey = symkey ;
-+
-+       return 0 ;
-+}
-+
- static int 
- xmlSecNssBlockCipherCtxInit(xmlSecNssBlockCipherCtxPtr ctx,
- 				xmlSecBufferPtr in, xmlSecBufferPtr out,
- 				int encrypt,
- 				const xmlChar* cipherName,
- 				xmlSecTransformCtxPtr transformCtx) {
--    SECItem keyItem;
-     SECItem ivItem;
--    PK11SlotInfo* slot;
--    PK11SymKey* symKey;
-+    SECItem* secParam = NULL ;
-+    xmlSecBufferPtr ivBuf = NULL ;
-     int ivLen;
--    SECStatus rv;
--    int ret;
- 
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(ctx->cipher != 0, -1);
-+    xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+    xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-     xmlSecAssert2(ctx->cipherCtx == NULL, -1);
--    xmlSecAssert2(ctx->keyInitialized != 0, -1);
--    xmlSecAssert2(ctx->ctxInitialized == 0, -1);
-+    xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-     xmlSecAssert2(in != NULL, -1);
-     xmlSecAssert2(out != NULL, -1);
-     xmlSecAssert2(transformCtx != NULL, -1);
- 
-     ivLen = PK11_GetIVLength(ctx->cipher);
--    xmlSecAssert2(ivLen > 0, -1);
--    xmlSecAssert2((xmlSecSize)ivLen <= sizeof(ctx->iv), -1);
-+    if( ivLen < 0 ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                    NULL ,
-+                    "PK11_GetIVLength" ,
-+                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return -1 ;    
-+    }
-+
-+    if( ( ivBuf = xmlSecBufferCreate( ivLen ) ) == NULL ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                    NULL ,
-+                    "xmlSecBufferCreate" ,
-+                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return -1 ;    
-+    }
-     
-     if(encrypt) {
--        /* generate random iv */
--        rv = PK11_GenerateRandom(ctx->iv, ivLen);
--	if(rv != SECSuccess) {
-+	if( PK11_GenerateRandom( ivBuf->data , ivLen ) != SECSuccess ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
- 			xmlSecErrorsSafeString(cipherName),
- 			"PK11_GenerateRandom",
- 			XMLSEC_ERRORS_R_CRYPTO_FAILED,
--			"size=%d", ivLen);
-+			XMLSEC_ERRORS_NO_MESSAGE);
-+	    xmlSecBufferDestroy( ivBuf ) ;
- 	    return(-1);    
- 	}
-+        if( xmlSecBufferSetSize( ivBuf , ivLen ) < 0 ) {
-+                xmlSecError( XMLSEC_ERRORS_HERE ,
-+                        NULL ,
-+                        "xmlSecBufferSetSize" ,
-+                        XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                        XMLSEC_ERRORS_NO_MESSAGE ) ;
-+                xmlSecBufferDestroy( ivBuf ) ;
-+                return -1 ;  
-+        }
- 	
--	/* write iv to the output */
--	ret = xmlSecBufferAppend(out, ctx->iv, ivLen);
--	if(ret < 0) {
-+	if( xmlSecBufferAppend( out , ivBuf->data , ivLen ) < 0 ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE, 
- 			xmlSecErrorsSafeString(cipherName),
- 			"xmlSecBufferAppend",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"size=%d", ivLen);
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+			XMLSEC_ERRORS_NO_MESSAGE);
-+	    xmlSecBufferDestroy( ivBuf ) ;
- 	    return(-1);
- 	}
- 	
-     } else {
--	/* if we don't have enough data, exit and hope that 
--	 * we'll have iv next time */
--	if(xmlSecBufferGetSize(in) < (xmlSecSize)ivLen) {
--	    return(0);
--	}
--	
--	/* copy iv to our buffer*/
--	xmlSecAssert2(xmlSecBufferGetData(in) != NULL, -1);
--	memcpy(ctx->iv, xmlSecBufferGetData(in), ivLen);
--	
--	/* and remove from input */
--	ret = xmlSecBufferRemoveHead(in, ivLen);
--	if(ret < 0) {
-+	if( xmlSecBufferSetData( ivBuf , in->data , ivLen ) < 0 ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE, 
- 			xmlSecErrorsSafeString(cipherName),
--			"xmlSecBufferRemoveHead",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"size=%d", ivLen);
-+			"xmlSecBufferSetData",
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+			XMLSEC_ERRORS_NO_MESSAGE);
-+	    xmlSecBufferDestroy( ivBuf ) ;
- 	    return(-1);
- 	}
-     }
- 
--    memset(&keyItem, 0, sizeof(keyItem));
--    keyItem.data = ctx->key;
--    keyItem.len  = ctx->keySize; 
--    memset(&ivItem, 0, sizeof(ivItem));
--    ivItem.data = ctx->iv;
--    ivItem.len  = ctx->ivSize; 
--
--    slot = PK11_GetBestSlot(ctx->cipher, NULL);
--    if(slot == NULL) {
-+    if( xmlSecBufferRemoveHead( in , ivLen ) < 0 ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
--		    "PK11_GetBestSlot",
-+		    "xmlSecBufferRemoveHead",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
- 		    XMLSEC_ERRORS_NO_MESSAGE);
-+	xmlSecBufferDestroy( ivBuf ) ;
- 	return(-1);
-     }
- 	
--    symKey = PK11_ImportSymKey(slot, ctx->cipher, PK11_OriginDerive, 
--			       CKA_SIGN, &keyItem, NULL);
--    if(symKey == NULL) {
-+    ivItem.data = xmlSecBufferGetData( ivBuf ) ;
-+    ivItem.len = xmlSecBufferGetSize( ivBuf ) ;
-+    if( ( secParam = PK11_ParamFromIV( ctx->cipher , &ivItem ) ) == NULL ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
--		    "PK11_ImportSymKey",
-+		    "PK11_ParamFromIV",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
- 		    XMLSEC_ERRORS_NO_MESSAGE);
--        PK11_FreeSlot(slot);
-+        xmlSecBufferDestroy( ivBuf ) ;
- 	return(-1);
-     }
- 
-     ctx->cipherCtx = PK11_CreateContextBySymKey(ctx->cipher, 
- 			(encrypt) ? CKA_ENCRYPT : CKA_DECRYPT, 
--			symKey, &ivItem);
-+			ctx->symkey, secParam);
-     if(ctx->cipherCtx == NULL) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
--		    "PK11_CreateContextBySymKey",
-+		    "xmlSecBufferRemoveHead",
- 		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
- 		    XMLSEC_ERRORS_NO_MESSAGE);
--	PK11_FreeSymKey(symKey);
--        PK11_FreeSlot(slot);
-+	SECITEM_FreeItem( secParam , PR_TRUE ) ;
-+        xmlSecBufferDestroy( ivBuf ) ;
- 	return(-1);
-     }
- 
--    ctx->ctxInitialized = 1;
--    PK11_FreeSymKey(symKey);
--    PK11_FreeSlot(slot);
-+    SECITEM_FreeItem( secParam , PR_TRUE ) ;
-+    xmlSecBufferDestroy( ivBuf ) ;
-     return(0);
- }
- 
-+/**
-+ * Block cipher transform update
-+ */
- static int 
- xmlSecNssBlockCipherCtxUpdate(xmlSecNssBlockCipherCtxPtr ctx,
- 				  xmlSecBufferPtr in, xmlSecBufferPtr out,
-@@ -192,54 +433,49 @@
- 				  const xmlChar* cipherName,
- 				  xmlSecTransformCtxPtr transformCtx) {
-     xmlSecSize inSize, inBlocks, outSize;
--    int blockLen;
-+    int blockSize;
-     int outLen = 0;
-     xmlSecByte* outBuf;
--    SECStatus rv;
--    int ret;
-     
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(ctx->cipher != 0, -1);
-+    xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+    xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-     xmlSecAssert2(ctx->cipherCtx != NULL, -1);
--    xmlSecAssert2(ctx->ctxInitialized != 0, -1);
-+    xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-     xmlSecAssert2(in != NULL, -1);
-     xmlSecAssert2(out != NULL, -1);
-     xmlSecAssert2(transformCtx != NULL, -1);
- 
--    blockLen = PK11_GetBlockSize(ctx->cipher, NULL);
--    xmlSecAssert2(blockLen > 0, -1);
-+    if( ( blockSize = PK11_GetBlockSize( ctx->cipher , NULL ) ) < 0 ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString( cipherName ) ,
-+            "PK11_GetBlockSize" ,
-+            XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        return -1 ;    
-+    }
- 
-     inSize = xmlSecBufferGetSize(in);
-     outSize = xmlSecBufferGetSize(out);
--    
--    if(inSize < (xmlSecSize)blockLen) {
--	return(0);
-+   
-+    inBlocks = ( encrypt != 0 ? inSize : ( inSize - 1 ) ) / blockSize ;
-+    inSize = inBlocks * blockSize ;
-+
-+    if( inSize < blockSize ) {
-+        return 0 ;
-     }
- 
--    if(encrypt) {
--        inBlocks = inSize / ((xmlSecSize)blockLen);
--    } else {
--	/* we want to have the last block in the input buffer 
--	 * for padding check */
--        inBlocks = (inSize - 1) / ((xmlSecSize)blockLen);
--    }
--    inSize = inBlocks * ((xmlSecSize)blockLen);
--
--    /* we write out the input size plus may be one block */
--    ret = xmlSecBufferSetMaxSize(out, outSize + inSize + blockLen);
--    if(ret < 0) {
-+    if( xmlSecBufferSetMaxSize( out , outSize + inSize + blockSize ) < 0 ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
- 		    "xmlSecBufferSetMaxSize",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "size=%d", outSize + inSize + blockLen);
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
-     outBuf = xmlSecBufferGetData(out) + outSize;
-     
--    rv = PK11_CipherOp(ctx->cipherCtx, outBuf, &outLen, inSize + blockLen,
--			xmlSecBufferGetData(in), inSize);
--    if(rv != SECSuccess) {
-+    if(PK11_CipherOp( ctx->cipherCtx , outBuf , &outLen , inSize + blockSize , xmlSecBufferGetData( in ) , inSize ) != SECSuccess ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
- 		    "PK11_CipherOp",
-@@ -247,27 +483,22 @@
- 		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
--    xmlSecAssert2((xmlSecSize)outLen == inSize, -1);
-     
--    /* set correct output buffer size */
--    ret = xmlSecBufferSetSize(out, outSize + outLen);
--    if(ret < 0) {
-+    if( xmlSecBufferSetSize( out , outSize + outLen ) < 0 ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
- 		    "xmlSecBufferSetSize",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "size=%d", outSize + outLen);
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
-         
--    /* remove the processed block from input */
--    ret = xmlSecBufferRemoveHead(in, inSize);
--    if(ret < 0) {
-+    if( xmlSecBufferRemoveHead( in , inSize ) < 0 ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
- 		    "xmlSecBufferRemoveHead",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "size=%d", inSize);
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
-     return(0);
-@@ -281,81 +512,82 @@
- 				 const xmlChar* cipherName,
- 				 xmlSecTransformCtxPtr transformCtx) {
-     xmlSecSize inSize, outSize;
--    int blockLen, outLen = 0;
-+    int blockSize, outLen = 0;
-     xmlSecByte* inBuf;
-     xmlSecByte* outBuf;
--    SECStatus rv;
--    int ret;
-     
-     xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(ctx->cipher != 0, -1);
-+    xmlSecAssert2( ctx->cipher != CKM_INVALID_MECHANISM , -1 ) ;
-+    xmlSecAssert2( ctx->symkey != NULL , -1 ) ;
-     xmlSecAssert2(ctx->cipherCtx != NULL, -1);
--    xmlSecAssert2(ctx->ctxInitialized != 0, -1);
-+    xmlSecAssert2( ctx->keyId != NULL , -1 ) ;
-     xmlSecAssert2(in != NULL, -1);
-     xmlSecAssert2(out != NULL, -1);
-     xmlSecAssert2(transformCtx != NULL, -1);
- 
--    blockLen = PK11_GetBlockSize(ctx->cipher, NULL);
--    xmlSecAssert2(blockLen > 0, -1);
-+    if( ( blockSize = PK11_GetBlockSize( ctx->cipher , NULL ) ) < 0 ) {
-+        xmlSecError( XMLSEC_ERRORS_HERE ,
-+            xmlSecErrorsSafeString( cipherName ) ,
-+            "PK11_GetBlockSize" ,
-+            XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+            XMLSEC_ERRORS_NO_MESSAGE ) ;
-+        return -1 ;    
-+    }
- 
-     inSize = xmlSecBufferGetSize(in);
-     outSize = xmlSecBufferGetSize(out);
- 
-+    /******************************************************************/
-     if(encrypt != 0) {
--        xmlSecAssert2(inSize < (xmlSecSize)blockLen, -1);        
-+        xmlSecAssert2( inSize < blockSize, -1 ) ;
-     
- 	/* create padding */
--        ret = xmlSecBufferSetMaxSize(in, blockLen);
--	if(ret < 0) {
-+	if( xmlSecBufferSetMaxSize( in , blockSize ) < 0 ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE, 
- 			xmlSecErrorsSafeString(cipherName),
- 			"xmlSecBufferSetMaxSize",
--			XMLSEC_ERRORS_R_XMLSEC_FAILED,
--			"size=%d", blockLen);
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+			XMLSEC_ERRORS_NO_MESSAGE);
- 	    return(-1);
- 	}
- 	inBuf = xmlSecBufferGetData(in);
- 
--        /* generate random padding */
--	if((xmlSecSize)blockLen > (inSize + 1)) {
--	    rv = PK11_GenerateRandom(inBuf + inSize, blockLen - inSize - 1);
--	    if(rv != SECSuccess) {
-+        /* generate random */
-+	if( blockSize > ( inSize + 1 ) ) {
-+	    if( PK11_GenerateRandom( inBuf + inSize, blockSize - inSize - 1 ) != SECSuccess ) {
- 		xmlSecError(XMLSEC_ERRORS_HERE,
- 			    xmlSecErrorsSafeString(cipherName),
- 			    "PK11_GenerateRandom",
- 			    XMLSEC_ERRORS_R_CRYPTO_FAILED,
--			    "size=%d", blockLen - inSize - 1); 
-+			    XMLSEC_ERRORS_NO_MESSAGE); 
- 		return(-1);    
- 	    }
- 	}
--	inBuf[blockLen - 1] = blockLen - inSize;
--	inSize = blockLen;
-+	inBuf[blockSize-1] = blockSize - inSize ;
-+	inSize = blockSize ;
-     } else {
--	if(inSize != (xmlSecSize)blockLen) {
-+	if( inSize != blockSize ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE, 
- 			xmlSecErrorsSafeString(cipherName),
- 			NULL,
--			XMLSEC_ERRORS_R_INVALID_DATA,
--			"data=%d;block=%d", inSize, blockLen);
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+			XMLSEC_ERRORS_NO_MESSAGE);
- 	    return(-1);
- 	}
-     }
-     
--    /* process last block */
--    ret = xmlSecBufferSetMaxSize(out, outSize + 2 * blockLen);
--    if(ret < 0) {
-+    /* process the last block */
-+    if( xmlSecBufferSetMaxSize( out , outSize + inSize + blockSize ) < 0 ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
- 		    "xmlSecBufferSetMaxSize",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "size=%d", outSize + 2 * blockLen);
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
-     outBuf = xmlSecBufferGetData(out) + outSize;
- 
--    rv = PK11_CipherOp(ctx->cipherCtx, outBuf, &outLen, 2 * blockLen,
--			xmlSecBufferGetData(in), inSize);
--    if(rv != SECSuccess) {
-+    if( PK11_CipherOp( ctx->cipherCtx , outBuf , &outLen , inSize + blockSize , xmlSecBufferGetData( in ) , inSize ) != SECSuccess ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
- 		    "PK11_CipherOp",
-@@ -363,300 +595,169 @@
- 		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
-     }
--    xmlSecAssert2((xmlSecSize)outLen == inSize, -1);
-     
-     if(encrypt == 0) {
- 	/* check padding */
--	if(outLen < outBuf[blockLen - 1]) {
-+	if( outLen < outBuf[blockSize-1] ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE,
- 			xmlSecErrorsSafeString(cipherName),
- 			NULL,
--			XMLSEC_ERRORS_R_INVALID_DATA,
--			"padding=%d;buffer=%d",
--			outBuf[blockLen - 1], outLen);
-+			XMLSEC_ERRORS_R_CRYPTO_FAILED,
-+			XMLSEC_ERRORS_NO_MESSAGE);
- 	    return(-1);	
- 	}
--	outLen -= outBuf[blockLen - 1];
-+	outLen -= outBuf[blockSize-1] ;
-     } 
- 
--    /* set correct output buffer size */
--    ret = xmlSecBufferSetSize(out, outSize + outLen);
--    if(ret < 0) {
--	xmlSecError(XMLSEC_ERRORS_HERE, 
--		    xmlSecErrorsSafeString(cipherName),
--		    "xmlSecBufferSetSize",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "size=%d", outSize + outLen);
--	return(-1);
--    }
-+    /******************************************************************/
- 
--    /* remove the processed block from input */
--    ret = xmlSecBufferRemoveHead(in, inSize);
--    if(ret < 0) {
-+    /******************************************************************
-+    if( xmlSecBufferSetMaxSize( out , outSize + blockSize ) < 0 ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(cipherName),
--		    "xmlSecBufferRemoveHead",
--		    XMLSEC_ERRORS_R_XMLSEC_FAILED,
--		    "size=%d", inSize);
--	return(-1);
--    }
--
--    return(0);
--}
--
--
--/******************************************************************************
-- *
-- * EVP Block Cipher transforms
-- *
-- * xmlSecNssBlockCipherCtx block is located after xmlSecTransform structure
-- * 
-- *****************************************************************************/
--#define xmlSecNssBlockCipherSize	\
--    (sizeof(xmlSecTransform) + sizeof(xmlSecNssBlockCipherCtx))
--#define xmlSecNssBlockCipherGetCtx(transform) \
--    ((xmlSecNssBlockCipherCtxPtr)(((xmlSecByte*)(transform)) + sizeof(xmlSecTransform)))
--
--static int	xmlSecNssBlockCipherInitialize	(xmlSecTransformPtr transform);
--static void	xmlSecNssBlockCipherFinalize		(xmlSecTransformPtr transform);
--static int  	xmlSecNssBlockCipherSetKeyReq	(xmlSecTransformPtr transform, 
--							 xmlSecKeyReqPtr keyReq);
--static int	xmlSecNssBlockCipherSetKey		(xmlSecTransformPtr transform,
--							 xmlSecKeyPtr key);
--static int	xmlSecNssBlockCipherExecute		(xmlSecTransformPtr transform,
--							 int last,
--							 xmlSecTransformCtxPtr transformCtx);
--static int	xmlSecNssBlockCipherCheckId		(xmlSecTransformPtr transform);
--							 
--
--
--static int
--xmlSecNssBlockCipherCheckId(xmlSecTransformPtr transform) {
--#ifndef XMLSEC_NO_DES
--    if(xmlSecTransformCheckId(transform, xmlSecNssTransformDes3CbcId)) {
--	return(1);
--    }
--#endif /* XMLSEC_NO_DES */
--
--#ifndef XMLSEC_NO_AES
--    if(xmlSecTransformCheckId(transform, xmlSecNssTransformAes128CbcId) ||
--       xmlSecTransformCheckId(transform, xmlSecNssTransformAes192CbcId) ||
--       xmlSecTransformCheckId(transform, xmlSecNssTransformAes256CbcId)) {
--       
--       return(1);
--    }
--#endif /* XMLSEC_NO_AES */
--    
--    return(0);
--}
--
--static int 
--xmlSecNssBlockCipherInitialize(xmlSecTransformPtr transform) {
--    xmlSecNssBlockCipherCtxPtr ctx;
--    
--    xmlSecAssert2(xmlSecNssBlockCipherCheckId(transform), -1);
--    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssBlockCipherSize), -1);
--
--    ctx = xmlSecNssBlockCipherGetCtx(transform);
--    xmlSecAssert2(ctx != NULL, -1);
--    
--    memset(ctx, 0, sizeof(xmlSecNssBlockCipherCtx));
--
--#ifndef XMLSEC_NO_DES
--    if(transform->id == xmlSecNssTransformDes3CbcId) {
--	ctx->cipher 	= CKM_DES3_CBC;
--	ctx->keyId 	= xmlSecNssKeyDataDesId;
--	ctx->keySize	= 24;
--    } else 
--#endif /* XMLSEC_NO_DES */
--
--#ifndef XMLSEC_NO_AES
--    if(transform->id == xmlSecNssTransformAes128CbcId) {
--	ctx->cipher 	= CKM_AES_CBC;	
--	ctx->keyId 	= xmlSecNssKeyDataAesId;
--	ctx->keySize	= 16;
--    } else if(transform->id == xmlSecNssTransformAes192CbcId) {
--	ctx->cipher 	= CKM_AES_CBC;	
--	ctx->keyId 	= xmlSecNssKeyDataAesId;
--	ctx->keySize	= 24;
--    } else if(transform->id == xmlSecNssTransformAes256CbcId) {
--	ctx->cipher 	= CKM_AES_CBC;	
--	ctx->keyId 	= xmlSecNssKeyDataAesId;
--	ctx->keySize	= 32;
--    } else 
--#endif /* XMLSEC_NO_AES */
--
--    if(1) {
--	xmlSecError(XMLSEC_ERRORS_HERE, 
--		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
--		    NULL,
--		    XMLSEC_ERRORS_R_INVALID_TRANSFORM,
-+		    "xmlSecBufferSetMaxSize",
-+		    XMLSEC_ERRORS_R_CRYPTO_FAILED,
- 		    XMLSEC_ERRORS_NO_MESSAGE);
- 	return(-1);
--    }        
--    
--    return(0);
--}
--
--static void 
--xmlSecNssBlockCipherFinalize(xmlSecTransformPtr transform) {
--    xmlSecNssBlockCipherCtxPtr ctx;
--
--    xmlSecAssert(xmlSecNssBlockCipherCheckId(transform));
--    xmlSecAssert(xmlSecTransformCheckSize(transform, xmlSecNssBlockCipherSize));
--
--    ctx = xmlSecNssBlockCipherGetCtx(transform);
--    xmlSecAssert(ctx != NULL);
--
--    if(ctx->cipherCtx != NULL) {
--        PK11_DestroyContext(ctx->cipherCtx, PR_TRUE);
-     }
--    
--    memset(ctx, 0, sizeof(xmlSecNssBlockCipherCtx));
--}
- 
--static int  
--xmlSecNssBlockCipherSetKeyReq(xmlSecTransformPtr transform,  xmlSecKeyReqPtr keyReq) {
--    xmlSecNssBlockCipherCtxPtr ctx;
--
--    xmlSecAssert2(xmlSecNssBlockCipherCheckId(transform), -1);
--    xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
--    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssBlockCipherSize), -1);
--    xmlSecAssert2(keyReq != NULL, -1);
--
--    ctx = xmlSecNssBlockCipherGetCtx(transform);
--    xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(ctx->keyId != NULL, -1);
-+    outBuf = xmlSecBufferGetData( out ) + outSize ;
-+    if( PK11_DigestFinal( ctx->cipherCtx , outBuf , &outLen , blockSize ) != SECSuccess ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                    xmlSecErrorsSafeString( cipherName ) ,
-+                    "PK11_DigestFinal" ,
-+                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return -1 ;    
-+    }
-+    ******************************************************************/
-+
-+    if( xmlSecBufferSetSize( out , outSize + outLen ) < 0 ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                    xmlSecErrorsSafeString( cipherName ) ,
-+                    "xmlSecBufferSetSize" ,
-+                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return -1 ;    
-+    }
-+
-+    if( xmlSecBufferRemoveHead( in , inSize ) < 0 ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE ,
-+                    xmlSecErrorsSafeString( cipherName ) ,
-+                    "xmlSecBufferRemoveHead" ,
-+                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-+            return -1 ;    
-+    }
-+
-+/*    PK11_Finalize( ctx->cipherCtx ) ;*/
-+    PK11_DestroyContext(ctx->cipherCtx, PR_TRUE);
-+    ctx->cipherCtx = NULL ;
- 
--    keyReq->keyId 	= ctx->keyId;
--    keyReq->keyType 	= xmlSecKeyDataTypeSymmetric;
--    if(transform->operation == xmlSecTransformOperationEncrypt) {
--	keyReq->keyUsage = xmlSecKeyUsageEncrypt;
--    } else {
--	keyReq->keyUsage = xmlSecKeyUsageDecrypt;
--    }
--    keyReq->keyBitsSize = 8 * ctx->keySize;
-     return(0);
- }
- 
--static int
--xmlSecNssBlockCipherSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
--    xmlSecNssBlockCipherCtxPtr ctx;
--    xmlSecBufferPtr buffer;
-+/**
-+ * xmlSecTransformExecuteMethod:
-+ * @transform:                 the pointer to transform object.
-+ * @last:                      the flag: if set to 1 then it's the last data chunk.
-+ * @transformCtx:              the pointer to transform context object.
-+ *
-+ * Transform specific method to process a chunk of data.
-+ *
-+ * Returns 0 on success or a negative value otherwise.
-+ */
-+xmlSecNssBlockCipherExecute(
-+    xmlSecTransformPtr transform ,
-+    int last ,
-+    xmlSecTransformCtxPtr transformCtx
-+) {
-+    xmlSecNssBlockCipherCtxPtr context = NULL ;
-+    xmlSecBufferPtr inBuf = NULL ;
-+    xmlSecBufferPtr outBuf = NULL ;
-+    const xmlChar* cipherName ;
-+    int operation ;
-+    int rtv ;
-     
-     xmlSecAssert2(xmlSecNssBlockCipherCheckId(transform), -1);
--    xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
-     xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssBlockCipherSize), -1);
--    xmlSecAssert2(key != NULL, -1);
--
--    ctx = xmlSecNssBlockCipherGetCtx(transform);
--    xmlSecAssert2(ctx != NULL, -1);
--    xmlSecAssert2(ctx->cipher != 0, -1);
--    xmlSecAssert2(ctx->keyInitialized == 0, -1);
--    xmlSecAssert2(ctx->keyId != NULL, -1);
--    xmlSecAssert2(xmlSecKeyCheckId(key, ctx->keyId), -1);
--
--    xmlSecAssert2(ctx->keySize > 0, -1);
--    xmlSecAssert2(ctx->keySize <= sizeof(ctx->key), -1);
- 
--    buffer = xmlSecKeyDataBinaryValueGetBuffer(xmlSecKeyGetValue(key));
--    xmlSecAssert2(buffer != NULL, -1);
-+    xmlSecAssert2( ( transform->operation == xmlSecTransformOperationEncrypt ) || ( transform->operation == xmlSecTransformOperationDecrypt ), -1 ) ;
-+    xmlSecAssert2( transformCtx != NULL , -1 ) ;
- 
--    if(xmlSecBufferGetSize(buffer) < ctx->keySize) {
-+    context = xmlSecNssBlockCipherGetCtx( transform ) ;
-+    if( context == NULL ) {
- 	xmlSecError(XMLSEC_ERRORS_HERE,
- 		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
--		    NULL,
--		    XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE,
--		    "keySize=%d;expected=%d",
--		    xmlSecBufferGetSize(buffer), ctx->keySize);
--	return(-1);
-+                    "xmlSecNssBlockCipherGetCtx" ,
-+                    XMLSEC_ERRORS_R_CRYPTO_FAILED ,
-+                    XMLSEC_ERRORS_NO_MESSAGE ) ;
-     }
--    
--    xmlSecAssert2(xmlSecBufferGetData(buffer) != NULL, -1);
--    memcpy(ctx->key, xmlSecBufferGetData(buffer), ctx->keySize);
--    
--    ctx->keyInitialized = 1;
--    return(0);
--}
--
--static int 
--xmlSecNssBlockCipherExecute(xmlSecTransformPtr transform, int last, xmlSecTransformCtxPtr transformCtx) {
--    xmlSecNssBlockCipherCtxPtr ctx;
--    xmlSecBufferPtr in, out;
--    int ret;
--    
--    xmlSecAssert2(xmlSecNssBlockCipherCheckId(transform), -1);
--    xmlSecAssert2((transform->operation == xmlSecTransformOperationEncrypt) || (transform->operation == xmlSecTransformOperationDecrypt), -1);
--    xmlSecAssert2(xmlSecTransformCheckSize(transform, xmlSecNssBlockCipherSize), -1);
--    xmlSecAssert2(transformCtx != NULL, -1);
- 
--    in = &(transform->inBuf);
--    out = &(transform->outBuf);
--
--    ctx = xmlSecNssBlockCipherGetCtx(transform);
--    xmlSecAssert2(ctx != NULL, -1);
-+    inBuf = &( transform->inBuf ) ;
-+    outBuf = &( transform->outBuf ) ;
- 
-     if(transform->status == xmlSecTransformStatusNone) {
- 	transform->status = xmlSecTransformStatusWorking;
-     }
- 
-+    operation = ( transform->operation == xmlSecTransformOperationEncrypt ) ? 1 : 0 ;
-+    cipherName = xmlSecTransformGetName( transform ) ;
-+
-     if(transform->status == xmlSecTransformStatusWorking) {
--	if(ctx->ctxInitialized == 0) {
--	    ret = xmlSecNssBlockCipherCtxInit(ctx, in, out, 
--			(transform->operation == xmlSecTransformOperationEncrypt) ? 1 : 0,
--			xmlSecTransformGetName(transform), transformCtx);
--	    if(ret < 0) {
-+	if( context->cipherCtx == NULL ) {
-+	    rtv = xmlSecNssBlockCipherCtxInit( context, inBuf , outBuf , operation , cipherName , transformCtx ) ;
-+	    if( rtv < 0 ) {
- 		xmlSecError(XMLSEC_ERRORS_HERE, 
- 			    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
- 			    "xmlSecNssBlockCipherCtxInit",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_R_INVALID_STATUS,
- 			    XMLSEC_ERRORS_NO_MESSAGE);
- 		return(-1);
- 	    }
- 	}
--	if((ctx->ctxInitialized == 0) && (last != 0)) {
-+	if( context->cipherCtx == NULL && last != 0 ) {
- 	    xmlSecError(XMLSEC_ERRORS_HERE, 
- 			xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
- 			NULL,
--			XMLSEC_ERRORS_R_INVALID_DATA,
-+			XMLSEC_ERRORS_R_INVALID_STATUS,
- 			"not enough data to initialize transform");
- 	    return(-1);
- 	}
- 
--	if(ctx->ctxInitialized != 0) {
--	    ret = xmlSecNssBlockCipherCtxUpdate(ctx, in, out, 
--			(transform->operation == xmlSecTransformOperationEncrypt) ? 1 : 0,
--			xmlSecTransformGetName(transform), transformCtx);
--	    if(ret < 0) {
-+	if( context->cipherCtx != NULL ) {
-+	    rtv = xmlSecNssBlockCipherCtxUpdate( context, inBuf , outBuf , operation , cipherName , transformCtx ) ;
-+	    if( rtv < 0 ) {
- 		xmlSecError(XMLSEC_ERRORS_HERE, 
- 			    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
- 			    "xmlSecNssBlockCipherCtxUpdate",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_R_INVALID_STATUS,
- 			    XMLSEC_ERRORS_NO_MESSAGE);
- 		return(-1);
- 	    }
- 	}
- 	
- 	if(last) {
--	    ret = xmlSecNssBlockCipherCtxFinal(ctx, in, out, 
--			(transform->operation == xmlSecTransformOperationEncrypt) ? 1 : 0,
--			xmlSecTransformGetName(transform), transformCtx);
--	    if(ret < 0) {
-+	    rtv = xmlSecNssBlockCipherCtxFinal( context, inBuf , outBuf , operation , cipherName , transformCtx ) ;
-+	    if( rtv < 0 ) {
- 		xmlSecError(XMLSEC_ERRORS_HERE, 
- 			    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
- 			    "xmlSecNssBlockCipherCtxFinal",
--			    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-+			    XMLSEC_ERRORS_R_INVALID_STATUS,
- 			    XMLSEC_ERRORS_NO_MESSAGE);
- 		return(-1);
- 	    }
- 	    transform->status = xmlSecTransformStatusFinished;
- 	} 
-     } else if(transform->status == xmlSecTransformStatusFinished) {
--	/* the only way we can get here is if there is no input */
--	xmlSecAssert2(xmlSecBufferGetSize(in) == 0, -1);
--    } else if(transform->status == xmlSecTransformStatusNone) {
--	/* the only way we can get here is if there is no enough data in the input */
--	xmlSecAssert2(last == 0, -1);
-+        if( xmlSecBufferGetSize( inBuf ) != 0 ) {
-+            xmlSecError( XMLSEC_ERRORS_HERE , 
-+                    xmlSecErrorsSafeString( xmlSecTransformGetName( transform ) ) ,
-+                    NULL ,
-+                    XMLSEC_ERRORS_R_INVALID_STATUS ,
-+                    "status=%d", transform->status ) ;
-+            return -1 ;
-+        }
-     } else {
- 	xmlSecError(XMLSEC_ERRORS_HERE, 
- 		    xmlSecErrorsSafeString(xmlSecTransformGetName(transform)),
diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/libxmlsec/xmlsec1-olderlibxml2.patch
deleted file mode 100644
index f2bd85f..0000000
--- a/libxmlsec/xmlsec1-olderlibxml2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- misc/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:46:05.000000000 +0000
-+++ misc/build/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:50:35.000000000 +0000
-@@ -406,6 +406,20 @@
-     return(0);
- }
- 
-+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20704
-+/*
-+ * xmlC14NMode:
-+ * 
-+ * Predefined values for C14N modes
-+ *
-+ */
-+typedef enum {
-+    XML_C14N_1_0            = 0,    /* Origianal C14N 1.0 spec */
-+    XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
-+    XML_C14N_1_1            = 2     /* C14N 1.1 spec */
-+} xmlC14NMode;
-+#endif
-+
- static int 
- xmlSecTransformC14NExecute(xmlSecTransformId id, xmlSecNodeSetPtr nodes, xmlChar** nsList, 
- 			   xmlOutputBufferPtr buf) {
diff --git a/libxmlsec/xmlsec1-update-config-sub-and-guess.patch b/libxmlsec/xmlsec1-update-config-sub-and-guess.patch
deleted file mode 100644
index a0caf35..0000000
--- a/libxmlsec/xmlsec1-update-config-sub-and-guess.patch
+++ /dev/null
@@ -1,2314 +0,0 @@
---- misc/xmlsec1-1.2.12/config.guess	2010-04-15 09:29:35.000000000 +0000
-+++ misc/build/xmlsec1-1.2.12/config.guess	2010-04-15 09:29:46.000000000 +0000
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
- 
--timestamp='2003-06-17'
-+timestamp='2009-12-30'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,23 +18,25 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Originally written by Per Bothner <per@bothner.com>.
--# Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -53,8 +56,9 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -66,11 +70,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -104,7 +108,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -123,7 +127,7 @@
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -136,13 +140,6 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
--## for Red Hat Linux
--if test -f /etc/redhat-release ; then
--    VENDOR=redhat ;
--else
--    VENDOR= ;
--fi
--
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -165,6 +162,7 @@
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -173,7 +171,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -203,50 +201,32 @@
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mipseb-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
- 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
- 	# covers most systems running today.  This code pipes the CPU
-@@ -284,42 +264,49 @@
- 	    "EV7.9 (21364A)")
- 		UNAME_MACHINE="alphaev79" ;;
- 	esac
-+	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
--    Alpha*:OpenVMS:*:*)
--	echo alpha-hp-vms
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -327,32 +314,51 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
--    DRS?6000:UNIX_SV:4.2*:7*)
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
--    i86pc:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -361,10 +367,10 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -376,10 +382,10 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -390,37 +396,40 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -444,32 +453,33 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -485,29 +495,29 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -515,7 +525,7 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -530,15 +540,19 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
--    *:AIX:*:[45])
-+	exit ;;
-+    *:AIX:*:[456])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -551,28 +565,28 @@
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -634,9 +648,19 @@
- 	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
--	    # avoid double evaluation of $set_cc_for_build
--	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -644,11 +668,11 @@
- 	    fi
- 	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -676,208 +700,248 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
--	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
--	exit 0 ;;
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
--    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
--	# Determine whether the default compiler uses glibc.
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#if __GLIBC__ >= 2
--	LIBC=gnu
--	#else
--	LIBC=
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
--	exit 0 ;;
-+	exit ;;
-+    *:FreeBSD:*:*)
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
--    i*:MINGW*:*)
-+	exit ;;
-+    *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
--    x86:Interix*:[34]*)
--	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-+    *:Interix*:*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    authenticamd | genuineintel | EM64T)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-     arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
--    ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
--	exit 0 ;;
--    m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
--    mips:Linux:*:*)
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips
--	#undef mipsel
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
--	#else
--	CPU=
--	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
--	;;
--    mips64:Linux:*:*)
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips64
--	#undef mips64el
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
--    ppc:Linux:*:*)
--	echo powerpc-${VENDOR:-unknown}-linux-gnu
--	exit 0 ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-${VENDOR:-unknown}-linux-gnu
--	exit 0 ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -885,84 +949,40 @@
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
--    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
--	echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-     x86_64:Linux:*:*)
--	echo x86_64-${VENDOR:-unknown}-linux-gnu
--	exit 0 ;;
--    i*86:Linux:*:*)
--	# The BFD linker knows what the default object file format is, so
--	# first see if it will tell us. cd to the root directory to prevent
--	# problems with other programs or directories called `ld' in the path.
--	# Set LC_ALL=C to ensure ld outputs messages in English.
--	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
--			 | sed -ne '/supported targets:/!d
--				    s/[ 	][ 	]*/ /g
--				    s/.*supported targets: *//
--				    s/ .*//
--				    p'`
--        case "$ld_supported_targets" in
--	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
--		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
--	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
--	esac
--	# Determine whether the default compiler is a.out or elf
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#ifdef __ELF__
--	# ifdef __GLIBC__
--	#  if __GLIBC__ >= 2
--	LIBC=gnu
--	#  else
--	LIBC=gnulibc1
--	#  endif
--	# else
--	LIBC=gnulibc1
--	# endif
--	#else
--	#ifdef __INTEL_COMPILER
--	LIBC=gnu
--	#else
--	LIBC=gnuaout
--	#endif
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
--	;;
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -970,24 +990,27 @@
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -995,15 +1018,16 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1021,73 +1045,86 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
--    M68*:*:R3V[567]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1095,68 +1132,94 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green@stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
--	case `uname -p` in
--	    *86) UNAME_PROCESSOR=i686 ;;
--	    powerpc) UNAME_PROCESSOR=powerpc ;;
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    i386)
-+		eval $set_cc_for_build
-+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		      grep IS_64BIT_ARCH >/dev/null
-+		  then
-+		      UNAME_PROCESSOR="x86_64"
-+		  fi
-+		fi ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1164,22 +1227,25 @@
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
--    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1190,28 +1256,50 @@
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1243,7 +1331,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1332,11 +1420,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1345,22 +1434,22 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
-@@ -1371,7 +1460,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--    ftp://ftp.gnu.org/pub/gnu/config/
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
---- misc/xmlsec1-1.2.12/config.sub	2010-04-15 09:29:35.000000000 +0000
-+++ misc/build/xmlsec1-1.2.12/config.sub	2010-04-15 09:29:46.000000000 +0000
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
- 
--timestamp='2003-06-18'
-+timestamp='2010-01-22'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,22 +22,26 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
- 
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -70,8 +75,9 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -83,11 +89,11 @@
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +105,7 @@
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -118,7 +124,10 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -144,10 +153,13 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis)
-+	-apple | -axis | -knuth | -cray | -microblaze)
- 		os=
- 		basic_machine=$1
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -169,6 +181,10 @@
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco5)
- 		os=-sco3.2v5
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -185,6 +201,10 @@
- 		# Don't forget version if it is 3.2v4 or newer.
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco*)
- 		os=-sco3.2v2
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -228,54 +248,71 @@
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fr30 | frv \
-+	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
--	| ip2k \
--	| m32r | m68000 | m68k | m88k | mcore \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
- 	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
- 	| mipsisa64sb1 | mipsisa64sb1el \
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
- 	| msp430 \
-+	| nios | nios2 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| s390 | s390x \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| rx \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
--	| strongarm \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
-+	| ubicom32 \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xstormy16 | xtensa \
--	| z8k)
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m6811 | m68hc11 | m6812 | m68hc12)
-+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
- 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
- 
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
-@@ -295,55 +332,69 @@
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
--	| bs2000-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
--	| clipper-* | cydra-* \
-+	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
--	| ip2k-* \
--	| m32r-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
- 	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
- 	| mipsisa64sb1-* | mipsisa64sb1el-* \
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
- 	| msp430-* \
--	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* \
--	| s390-* | s390x-* \
--	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| romp-* | rs6000-* | rx-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
--	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tile-* | tilegx-* \
- 	| tron-* \
-+	| ubicom32-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--	| xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -361,6 +412,9 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -378,6 +432,9 @@
- 	amd64)
- 		basic_machine=x86_64-pc
- 		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
-@@ -401,6 +458,10 @@
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -409,10 +470,26 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -437,12 +514,27 @@
- 		basic_machine=j90-cray
- 		os=-unicos
- 		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
-@@ -465,6 +557,14 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -615,6 +715,14 @@
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -626,10 +734,17 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+        microblaze)
-+		basic_machine=microblaze-xilinx
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
- 		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -643,10 +758,6 @@
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
--	mmix*)
--		basic_machine=mmix-knuth
--		os=-mmixware
--		;;
- 	monitor)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -659,6 +770,9 @@
- 		basic_machine=i386-pc
- 		os=-msdos
- 		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -727,10 +841,6 @@
- 	np1)
- 		basic_machine=np1-gould
- 		;;
--	nv1)
--		basic_machine=nv1-cray
--		os=-unicosmp
--		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -738,9 +848,12 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
- 		;;
- 	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
-@@ -758,6 +871,14 @@
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -767,6 +888,12 @@
- 	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
-@@ -823,6 +950,10 @@
- 		basic_machine=i586-unknown
- 		os=-pw32
- 		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -833,6 +964,12 @@
- 	rtpc | rtpc-*)
- 		basic_machine=romp-ibm
- 		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
- 	sa29200)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -843,6 +980,10 @@
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
- 	sei)
- 		basic_machine=mips-sei
- 		os=-seiux
-@@ -854,6 +995,9 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
- 	sh64)
- 		basic_machine=sh64-unknown
- 		;;
-@@ -943,6 +1087,15 @@
- 		basic_machine=tic6x-unknown
- 		os=-coff
- 		;;
-+        # This must be matched before tile*.
-+        tilegx*)
-+		basic_machine=tilegx-unknown
-+		os=-linux-gnu
-+		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -956,6 +1109,10 @@
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
- 	udi29k)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -999,6 +1156,10 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1010,6 +1171,10 @@
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1029,6 +1194,9 @@
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
-@@ -1045,13 +1213,10 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
--	sparc | sparcv9 | sparcv9b)
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1098,6 +1263,9 @@
-         # First match some system type aliases
-         # that might get confused with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
-+        -auroraux)
-+	        os=-auroraux
-+		;;
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
- 		;;
-@@ -1118,25 +1286,30 @@
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
--	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* \
-+	      | -aos* | -aros* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -chorusos* | -chorusrdb* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1154,12 +1327,15 @@
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
- 		os=`echo $os | sed -e 's|mac|macos|'`
- 		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -1172,6 +1348,9 @@
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
- 	-wince*)
- 		os=-wince
- 		;;
-@@ -1193,6 +1372,9 @@
- 	-atheos*)
- 		os=-atheos
- 		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
-@@ -1215,6 +1397,9 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
-@@ -1251,6 +1436,14 @@
- 	-kaos*)
- 		os=-kaos
- 		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+        -nacl*)
-+	        ;;
- 	-none)
- 		;;
- 	*)
-@@ -1273,6 +1466,12 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1282,8 +1481,8 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--	c4x-* | tic4x-*)
--		os=-coff
-+        c4x-* | tic4x-*)
-+        	os=-coff
- 		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
-@@ -1310,6 +1509,9 @@
- 	m68*-cisco)
- 		os=-aout
- 		;;
-+        mep-*)
-+		os=-elf
-+		;;
- 	mips*-cisco)
- 		os=-elf
- 		;;
-@@ -1328,9 +1530,15 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1433,7 +1641,7 @@
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
-@@ -1463,9 +1671,15 @@
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
- 			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
-@@ -1490,7 +1704,7 @@
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/libxmlsec/xmlsec1-vc10.patch b/libxmlsec/xmlsec1-vc10.patch
deleted file mode 100644
index 72a1d21..0000000
--- a/libxmlsec/xmlsec1-vc10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- misc/build/xmlsec1-1.2.14/win32/Makefile.msvc.old	2010-10-20 00:49:04.671875000 +0200
-+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2010-10-20 00:49:23.406250000 +0200
-@@ -351,7 +351,11 @@
- !if "$(DEBUG)" == "1"
- LDFLAGS 		= $(LDFLAGS) /DEBUG
- !else
--LDFLAGS 		= $(LDFLAGS) /OPT:NOWIN98
-+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
-+LDFLAGS = $(LDFLAGS)
-+!else
-+LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
-+!endif
- !endif
- 
- SOLIBS 			= $(LIBS) libxml2.lib 
diff --git a/lpsolve/lp_solve-aix.patch b/lpsolve/lp_solve-aix.patch
deleted file mode 100644
index 6ad5877..0000000
--- a/lpsolve/lp_solve-aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- /dev/null	2010-07-28 04:47:47.000000000 -0500
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.aix.gcc	2010-06-29 17:44:53.000000000 -0500
-@@ -0,0 +1,25 @@
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+c=$CC
-+
-+def=
-+so=
-+if [ "$PLATFORM" = "SCO_UNIX" ]
-+then def='-dy -K PIC -DNOLONGLONG'
-+     dl=-lc
-+else dl=-ldl
-+     so=y
-+fi
-+
-+opts='-O3'
-+
-+$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.a
-+
-+if [ "$so" != "" ]
-+then
-+  $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+  $c -shared $lpsolve_LDFLAGS -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+fi
-+
-+rm *.o 2>/dev/null
---- misc/lp_solve_5.5/lp_lib.h	2010-07-28 05:15:10.000000000 -0500
-+++ misc/build/lp_solve_5.5/lp_lib.h	2010-07-28 05:15:55.000000000 -0500
-@@ -56,7 +56,7 @@
- /* Define user program feature option switches                               */
- /* ------------------------------------------------------------------------- */
- 
--#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32
-+#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32 && !defined(_AIX)
- # define _isnan(x) FALSE
- #endif
- 
diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch
deleted file mode 100644
index aae56fc..0000000
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-*** misc/lp_solve_5.5/lpsolve55/cgcc.bat	Sun Jun 12 04:27:28 2005
---- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat	Sun Dec 14 07:55:19 2008
-***************
-*** 7,14 ****
-  
-  set c=gcc
-  
-! rem rc lpsolve.rc
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def -o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
---- 7,14 ----
-  
-  set c=gcc
-  
-! windres lpsolve.rc lpsolve_res.obj
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% -o lpsolve55.dll
-  
-  %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-  
-*** misc/lp_solve_5.5/lpsolve55/lpsolve.rc	Sun Jun  4 00:15:24 2006
---- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc	Fri Nov 23 16:34:22 2007
-***************
-*** 7,13 ****
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include "afxres.h"
-  
-  /////////////////////////////////////////////////////////////////////////////
-  #undef APSTUDIO_READONLY_SYMBOLS
---- 7,13 ----
-  //
-  // Generated from the TEXTINCLUDE 2 resource.
-  //
-! #include "winresrc.h"
-  
-  /////////////////////////////////////////////////////////////////////////////
-  #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
deleted file mode 100644
index 88e8828..0000000
--- a/lpsolve/lp_solve_5.5.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- misc/build/lp_solve_5.5/lpsolve55/ccc.orig	Sat Jun 11 21:27:18 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc	Sun May 22 11:20:19 2011
-@@ -1,15 +1,28 @@
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
--c=cc
-+c=$CC
- 
- def=
- so=
--if [ "$PLATFORM" = "SCO_UNIX" ]
--then def='-dy -K PIC -DNOLONGLONG'
--     dl=-lc
--else dl=-ldl
--     so=y
-+soprefix=
-+libs=
-+pic=
-+ldflags=
-+inline=
-+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
-+     so=dll
-+     inline=-DINLINE=static
-+else
-+     so=so
-+     soprefix=lib
-+     libs="-lm"
-+     pic=-fpic
-+     ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
- fi
- 
-+if [ "$OS" = "LINUX" ]; then
-+     libs="$libs -ldl"
-+fi
-+
- opts='-O3'
- 
- $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-@@ -18,8 +31,8 @@
- 
- if [ "$so" != "" ]
- then
--  $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
--  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+  $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+  $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
- fi
- 
- rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig	Thu Jun 23 22:53:08 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx	Sun May 22 11:19:48 2011
-@@ -1,23 +1,32 @@
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
--c=cc
-+c=$CC
- 
- def=
- so=
-+extra_cflags=$EXTRA_CFLAGS
-+extra_cdefs=$EXTRA_CDEFS
-+extra_linkflags=$EXTRA_LINKFLAGS
-+
- if [ "$PLATFORM" = "SCO_UNIX" ]
- then def='-DLoadInverseLib=0 -DLoadLanguageLib=0 -D__HYPER=long'
- else dl=-ldl
-      so=y
- fi
- 
--opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
-+if [ "$HAVE_GCC_NO_LONG_DOUBLE" = "YES" ] ; then
-+    opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
-+else
-+    opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
-+fi
-+
- 
--$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
- libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
- 
- if [ "$so" != "" ]
- then
--  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
--  $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
-+  $c $extra_cflags -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
-+  $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
- fi
- 
- rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig	Sun May 22 11:19:48 2011
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris	Sun May 22 11:19:48 2011
-@@ -1 +1,31 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+c=$CC
-+
-+if [ "$CPU" = "U" -o "$CPU" = "X" ]
-+then
-+  extra_cflags=-m64
-+  extra_linkflags=-m64
-+fi
-+
-+def=
-+so=
-+if [ "$PLATFORM" = "SCO_UNIX" ]
-+then def='-dy -K PIC -DNOLONGLONG'
-+     dl=-lc
-+else dl=-ldl
-+     so=y
-+fi
-+
-+opts='-xO3'
-+
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.a
-+
-+if [ "$so" != "" ]
-+then
-+  $c $extra_cflags -K PIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+  $c $extra_linkflags -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $SOLARLIB -lc -lm -ldl
-+fi
-+
-+rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig	Sun May 22 11:19:48 2011
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios	Sun May 22 11:19:48 2011
-@@ -1 +1,11 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
-+
-+opts='-O3'
-+
-+def=
-+
-+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
-+ls -l
-+ar -r liblpsolve55.a $obj
-+rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
deleted file mode 100644
index 7e47591..0000000
--- a/lpsolve/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=lpsolve
-TARGET=lpsolve
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=lp_solve_5.5
-TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
-
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-PATCH_FILES=lp_solve_5.5-windows.patch
-.ELSE
-PATCH_FILES=\
-    lp_solve_5.5.patch \
-    lp_solve-aix.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-CONFIGURE_FLAGS=
-
-BUILD_DIR=lpsolve55
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-lpsolve_LDFLAGS=-shared-libgcc
-.ENDIF
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
-.ELSE
-BUILD_ACTION=sh ccc
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
-.ENDIF
-.ELSE
-BUILD_ACTION=cmd /c cvc6.bat
-OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
-.ENDIF
-OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
-.ELSE
-.IF "$(OS)"=="MACOSX"
-.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
-BUILD_ACTION=sh ccc.osx
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
-.ELIF "$(OS)"=="IOS"
-.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
-BUILD_ACTION=sh ccc.ios
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
-.ELSE
-.IF "$(COMNAME)"=="sunpro5"
-BUILD_ACTION=sh ccc.solaris
-.ELIF "$(OS)$(COM)"=="AIXGCC"
-BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh ccc.aix.gcc
-.ELSE
-BUILD_ACTION=sh ccc
-.ENDIF
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
-.ENDIF
-.ENDIF
-
-OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-
diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst
deleted file mode 100644
index 68b61bf..0000000
--- a/lpsolve/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-lps     lpsolve : solenv NULL
-lps	lpsolve		usr1	-	all	lps_mkout NULL
-lps	lpsolve		nmake	-	all	lps_lpsolve NULL
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
deleted file mode 100644
index 68001dc..0000000
--- a/lpsolve/prj/d.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-mkdir: %_DEST%\inc\lpsolve
-
-..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\*
-..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so
-..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
-..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
-..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
-..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
-..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
-
diff --git a/lucene/long_path.patch b/lucene/long_path.patch
deleted file mode 100644
index d3ab8e3..0000000
--- a/lucene/long_path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- misc/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java	2008-05-01 22:27:58.000000000 +0200
-+++ misc/build/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java	2011-02-23 16:36:26.249515000 +0100
-@@ -165,7 +165,15 @@
-   public static FSDirectory getDirectory(File file, LockFactory lockFactory)
-     throws IOException
-   {
--    file = new File(file.getCanonicalPath());
-+      String path = file.getPath();
-+      //File.getCanonicalPath fails on Windows with long path names
-+      //Tested with Java SE 6u23
-+      //Long path names created by osl_getSystemPathFromFileURL are already
-+      //unique because its implementation replaces the occurrences of .. and .
-+      //That is using the com.sun.star.help.HelpIndexer service from c++ is
-+      //relatively safe.
-+      if (!path.startsWith("\\\\?\\"))
-+          file = new File(file.getCanonicalPath());
- 
-     if (file.exists() && !file.isDirectory())
-       throw new IOException(file + " not a directory");
-@@ -455,7 +463,16 @@
-   public String getLockID() {
-     String dirName;                               // name to be hashed
-     try {
--      dirName = directory.getCanonicalPath();
-+        //File.getCanonicalPath fails on Windows with long path names
-+        //Tested with Java SE 6u23
-+        //Long path names created by osl_getSystemPathFromFileURL are already
-+        //unique because its implementation replaces the occurrences of .. and .
-+        //That is using the com.sun.star.help.HelpIndexer service from c++ is
-+        //relatively safe.
-+        if (!directory.getPath().startsWith("\\\\?\\"))
-+            dirName = directory.getCanonicalPath();
-+        else
-+            dirName = directory.getPath();
-     } catch (IOException e) {
-       throw new RuntimeException(e.toString(), e);
-     }
diff --git a/lucene/lucene.patch b/lucene/lucene.patch
deleted file mode 100644
index 3acd21e..0000000
--- a/lucene/lucene.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lucene-2.3.2/common-build.xml	2008-05-01 22:28:56.000000000 +0200
-+++ misc/build/lucene-2.3.2/common-build.xml	2008-06-16 16:01:28.812500000 +0200
-@@ -280 +280 @@
--		           value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
-+		           value="${version}"/>
-@@ -297,6 +296,0 @@
--      <!-- If possible, include the svnversion -->
--      <exec dir="." executable="svnversion"
--            outputproperty="svnversion" failifexecutionfails="false">
--        <arg line="."/>
--      </exec>
--      
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
deleted file mode 100644
index 98fab3f..0000000
--- a/lucene/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=so_lucene
-TARGET=so_lucene
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :	antsettings.mk
-# --- Files --------------------------------------------------------
-
-.IF "$(SOLAR_JAVA)" != ""
-
-LUCENE_MAJOR=2
-LUCENE_MINOR=3
-LUCENE_MICRO=2
-
-LUCENE_NAME=lucene-$(LUCENE_MAJOR).$(LUCENE_MINOR).$(LUCENE_MICRO)
-# NOTE that the jar names do not contain the micro version
-LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
-LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
-
-TARFILE_NAME=$(LUCENE_NAME)
-TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2
-PATCH_FILES=lucene.patch 
-
-.IF "$(OS)" == "WNT"
-PATCH_FILES+= long_path.patch
-.ENDIF
-
-
-BUILD_DIR=.
-BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
-
-OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk 
-.ENDIF
diff --git a/lucene/prj/build.lst b/lucene/prj/build.lst
deleted file mode 100644
index 9f51b60..0000000
--- a/lucene/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-xh      lucene  :  soltools EXPAT:expat NULL
-xh      lucene     usr1           -       all     xh_mkout NULL
-xh      lucene     nmake          -       all     xh_lucene NULL
diff --git a/lucene/prj/d.lst b/lucene/prj/d.lst
deleted file mode 100644
index 97c8968..0000000
--- a/lucene/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\lucene
-..\%__SRC%\bin\lucene-*.jar %_DEST%\bin\lucene-*.jar
diff --git a/lucene/version.mk b/lucene/version.mk
deleted file mode 100644
index fe9f60b..0000000
--- a/lucene/version.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
deleted file mode 100644
index b759886..0000000
--- a/mdds/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=mdds
-TARGET=mdds
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=mdds_0.5.3
-TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7
-PATCH_FILES=mdds_0.5.3.patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-
-# --- post-build ---------------------------------------------------
-
-NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
-
-$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-    -@$(MKDIRHIER) $(INCCOM)
-    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/include$/mdds $(INCCOM)
-    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-
-$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-
diff --git a/mdds/mdds_0.5.3.patch b/mdds/mdds_0.5.3.patch
deleted file mode 100644
index 7903431..0000000
--- a/mdds/mdds_0.5.3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- misc/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl	2011-07-13 13:26:27.000000000 -0600
-+++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl	2011-07-20 02:02:21.164198900 -0600
-@@ -216,8 +216,8 @@
-         // assignment to self.
-         return;
- 
--    size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
--    size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
-+    size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
-+    size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
-     for (size_t i = 0; i < row_count; ++i)
-         for (size_t j = 0; j < col_count; ++j)
-             mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
---- misc/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl	2011-07-13 13:26:27.000000000 -0600
-+++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl	2011-07-20 02:02:21.179798900 -0600
-@@ -354,8 +354,8 @@
-         }
- 
-         array_type new_array(new_size, &m_init_elem);
--        size_t min_rows = ::std::min(row, m_rows);
--        size_t min_cols = ::std::min(col, m_cols);
-+        size_t min_rows = (::std::min)(row, m_rows);
-+        size_t min_cols = (::std::min)(col, m_cols);
-         for (size_t i = 0; i < min_rows; ++i)
-         {
-             for (size_t j = 0; j < min_cols; ++j)
-@@ -612,8 +612,8 @@
-         }
- 
-         array_type new_array(new_size, element(0.0));
--        size_t min_rows = ::std::min(row, m_rows);
--        size_t min_cols = ::std::min(col, m_cols);
-+        size_t min_rows = (::std::min)(row, m_rows);
-+        size_t min_cols = (::std::min)(col, m_cols);
-         for (size_t i = 0; i < min_rows; ++i)
-         {
-             for (size_t j = 0; j < min_cols; ++j)
---- misc/mdds_0.5.3/include/mdds/point_quad_tree.hpp	2011-07-13 13:26:27.000000000 -0600
-+++ misc/build/mdds_0.5.3/include/mdds/point_quad_tree.hpp	2011-07-20 02:04:36.088835900 -0600
-@@ -623,10 +623,10 @@
- template<typename _Key, typename _Data>
- void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data)
- {
--    m_xrange.first  = ::std::min(m_xrange.first,  x);
--    m_xrange.second = ::std::max(m_xrange.second, x);
--    m_yrange.first  = ::std::min(m_yrange.first,  y);
--    m_yrange.second = ::std::max(m_yrange.second, y);
-+    m_xrange.first  = (::std::min)(m_xrange.first,  x);
-+    m_xrange.second = (::std::max)(m_xrange.second, x);
-+    m_yrange.first  = (::std::min)(m_yrange.first,  y);
-+    m_yrange.second = (::std::max)(m_yrange.second, y);
- 
-     if (!m_root)
-     {
diff --git a/mdds/prj/build.lst b/mdds/prj/build.lst
deleted file mode 100644
index da7d095..0000000
--- a/mdds/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mdd     mdds : solenv BOOST:boost NULL
-mdd	mdds		usr1	-	all	mdd_mkout NULL
-mdd	mdds		nmake	-	all	mdd_mdds NULL
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
deleted file mode 100644
index 62d44f3..0000000
--- a/mdds/prj/d.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-mkdir: %_DEST%\inc\mdds
-mkdir: %_DEST%\inc\mdds\hash_container
-
-..\%__SRC%\inc\mdds\* %_DEST%\inc\mdds
-..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc\mdds\hash_container
-
-
diff --git a/mysqlcppconn/cppconn_config.pmk b/mysqlcppconn/cppconn_config.pmk
deleted file mode 100644
index b787c96..0000000
--- a/mysqlcppconn/cppconn_config.pmk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-#   OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = mysqlcppconn
-ENABLE_EXCEPTIONS = TRUE
-USE_LDUMP2 = TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
-
-CPPCONN_NATIVEAPI = cppconn_nativeapi
diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
deleted file mode 100644
index e047ea0..0000000
--- a/mysqlcppconn/makefile.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=mysqlcppconn
-TARGET=so_mysqlcppconn
-
-EXT_PROJECT_NAME=mysql-connector-cpp
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=$(EXT_PROJECT_NAME)
-TARFILE_MD5=831126a1ee5af269923cfab6050769fe
-ADDITIONAL_FILES=\
-                 driver$/makefile.mk \
-                 driver$/nativeapi$/makefile.mk \
-                 driver$/nativeapi$/binding_config.h \
-                 cppconn$/config.h
-
-CONVERTFILES=\
-                cppconn$/build_config.h
-
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql library
-.IF "$(SYSTEM_MYSQL)" == "YES"
-MYSQL_BINDING=static
-.ELSE
-MYSQL_BINDING=dynamic
-.ENDIF
-
-PATCH_FILES=\
-    $(TARFILE_NAME).patch \
-    mysql-connector-cpp-mysql-binding-$(MYSQL_BINDING).patch \
-    patches/default_to_protocol_tcp.patch
-
-BUILD_DIR=driver
-BUILD_ACTION = \
-            cd nativeapi \
-         && $(MAKE) $(MFLAGS) $(CALLMACROS) \
-         && cd .. \
-         && $(MAKE) $(MFLAGS) $(CALLMACROS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-# --- post-build ---------------------------------------------------
-
-# "normalize" the output structure, in that the C/C++ headers are
-# copied to the canonic location in OUTPATH
-# The allows, later on, to use the standard mechanisms to deliver those
-# files, instead of delivering them out of OUTPATH/misc/build/..., which
-# could cause problems
-
-NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
-
-$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
-    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h $(INCCOM)
-    -@$(MKDIRHIER) $(INCCOM)$/cppconn
-    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* $(INCCOM)$/cppconn
-    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-
-normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
-
-$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch
deleted file mode 100644
index 7007c3d..0000000
--- a/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:17:23.640625000 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:13:50.359375000 +0200
-@@ -1 +1,2 @@
--dummy
-+#define HAVE_DLFCN_H 1
-+//#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch
deleted file mode 100644
index b7edeb9..0000000
--- a/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:17:23.640625000 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:13:50.359375000 +0200
-@@ -1 +1,2 @@
--dummy
-+#define HAVE_DLFCN_H 1
-+#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-cpp.patch b/mysqlcppconn/mysql-connector-cpp.patch
deleted file mode 100644
index 0575653..0000000
--- a/mysqlcppconn/mysql-connector-cpp.patch
+++ /dev/null
@@ -1,379 +0,0 @@
---- misc/mysql-connector-cpp/cppconn/build_config.h	2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/build_config.h	2009-09-11 09:41:41.150391316 +0200
-@@ -1,36 +1,34 @@
--/*
--   Copyright 2007 - 2008 MySQL AB, 2008 - 2009 Sun Microsystems, Inc.  All rights reserved.
--
--   The MySQL Connector/C++ is licensed under the terms of the GPL
--   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
--   MySQL Connectors. There are special exceptions to the terms and
--   conditions of the GPL as it is applied to this software, see the
--   FLOSS License Exception
--   <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
--*/
--
--#ifndef _SQL_BUILD_CONFIG_H_
--#define _SQL_BUILD_CONFIG_H_
--
--#ifndef CPPCONN_PUBLIC_FUNC
--
--#if defined(_WIN32)
-- // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
--  #ifdef mysqlcppconn_EXPORTS
--    #define CPPCONN_PUBLIC_FUNC __declspec(dllexport)
--  #else
--    // this is for static build
--    #ifdef CPPCONN_LIB_BUILD
--      #define CPPCONN_PUBLIC_FUNC
--    #else
--      // this is for clients using dynamic lib
--      #define CPPCONN_PUBLIC_FUNC __declspec(dllimport)
--    #endif
--  #endif
--#else
--  #define CPPCONN_PUBLIC_FUNC
--#endif
--
--#endif    //#ifndef CPPCONN_PUBLIC_FUNC
--
--#endif    //#ifndef _SQL_BUILD_CONFIG_H_
-+/*
-+   Copyright 2007 - 2008 MySQL AB, 2008 - 2009 Sun Microsystems, Inc.  All rights reserved.
-+
-+   The MySQL Connector/C++ is licensed under the terms of the GPL
-+   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
-+   MySQL Connectors. There are special exceptions to the terms and
-+   conditions of the GPL as it is applied to this software, see the
-+   FLOSS License Exception
-+   <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-+*/
-+
-+#ifndef _SQL_BUILD_CONFIG_H_
-+#define _SQL_BUILD_CONFIG_H_
-+
-+#ifndef _SAL_TYPES_H_
-+#include <sal/types.h>
-+#endif
-+  
-+ // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
-+  #ifdef mysqlcppconn_EXPORTS
-+    #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_EXPORT
-+  #else
-+    // this is for static build
-+    #ifdef CPPCONN_LIB_BUILD
-+      #define CPPCONN_PUBLIC_FUNC
-+    #else
-+      // this is for clients using dynamic lib
-+      #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT
-+    #endif
-+  #endif
-+
-+  #define CPPCONN_PUBLIC_EXCEPTION SAL_EXCEPTION_DLLPUBLIC_EXPORT
-+
-+#endif    //#ifndef _SQL_BUILD_CONFIG_H_
---- misc/mysql-connector-cpp/cppconn/config.h	2009-08-14 10:17:38.234375000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/config.h	2009-08-14 09:56:37.000000000 +0200
-@@ -1 +1,34 @@
--dummy
-+#include <sal/types.h>
-+
-+#define HAVE_FUNCTION_STRTOL 1
-+#define HAVE_FUNCTION_STRTOUL 1
-+#define HAVE_FUNCTION_STRTOL 1
-+#define HAVE_FUNCTION_STRTOULL 1
-+
-+#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX)
-+    #define HAVE_STDINT_H
-+    #define HAVE_INTTYPES_H
-+#endif
-+
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+
-+#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) 
-+
-+// if we do not have the standard C99 integer types, then define them based on the respective SAL types
-+#if !defined(_SYS_TYPES_H)
-+typedef sal_Int8    int8_t;
-+typedef sal_Int16   int16_t;
-+typedef sal_Int32   int32_t;
-+#endif // !defined(_SYS_TYPES_H)
-+typedef sal_uInt8   uint8_t;
-+typedef sal_uInt16  uint16_t;
-+typedef sal_uInt32  uint32_t;
-+typedef sal_Int64   int64_t;
-+typedef sal_uInt64  uint64_t;
-+#endif // !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
---- misc/mysql-connector-cpp/cppconn/connection.h	2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/connection.h	2009-08-14 09:56:37.000000000 +0200
-@@ -13,7 +13,6 @@
- #define _SQL_CONNECTION_H_
- 
- #include <map>
--#include <boost/variant.hpp>
- 
- #include "build_config.h"
- #include "warning.h"
-@@ -22,8 +21,54 @@
- namespace sql
- {
- 
--
--typedef boost::variant<int, double, bool, sql::SQLString > ConnectPropertyVal;
-+// hack around the non-existent ::boost::variant in OOo 3.1 build env
-+struct ConnectPropertyVal
-+{
-+    sql::SQLString valString;
-+    int            valInt;
-+    bool           valBool;
-+
-+    ConnectPropertyVal()
-+    {
-+        reset();
-+    }
-+    ConnectPropertyVal( const sql::SQLString& _val )
-+    {
-+        *this = _val;
-+    }
-+    ConnectPropertyVal( const int _val )
-+    {
-+        *this = _val;
-+    }
-+    ConnectPropertyVal( const bool _val )
-+    {
-+        *this = _val;
-+    }
-+    ConnectPropertyVal& operator=( const sql::SQLString& _val )
-+    {
-+        reset();
-+        valString = _val;
-+        return *this;
-+    }
-+    ConnectPropertyVal& operator=( const int _val )
-+    {
-+        reset();
-+        valInt = _val;
-+        return *this;
-+    }
-+    ConnectPropertyVal& operator=( const bool _val )
-+    {
-+        reset();
-+        valBool = _val;
-+        return *this;
-+    }
-+    void reset()
-+    {
-+        valString = std::string();
-+        valInt = 0;
-+        valBool = false;
-+    }
-+};
- 
- typedef std::map< sql::SQLString, ConnectPropertyVal > ConnectOptionsMap;
- 
---- misc/mysql-connector-cpp/cppconn/exception.h	2009-08-20 17:51:23.000000000 +0200
-+++ misc/build/mysql-connector-cpp/cppconn/exception.h	2009-09-11 09:41:41.076379817 +0200
-@@ -37,7 +37,7 @@
- #pragma warning(push)
- #pragma warning(disable: 4275)
- #endif
--class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
-+class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
- {
- #ifdef _WIN32
- #pragma warning(pop)
-@@ -83,26 +83,26 @@
- 	MEMORY_ALLOC_OPERATORS(SQLException)
- };
- 
--struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
- {
- 	MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- 	MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
- 
--struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
- {
- 	InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- 	InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
- 
--struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
- {
- 	InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- 	InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
- 
- 
--struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
- {
- 	NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- 	NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
---- misc/mysql-connector-cpp/driver/makefile.mk	2009-09-11 09:42:34.087202551 +0200
-+++ misc/build/mysql-connector-cpp/driver/makefile.mk	2009-09-11 09:42:25.902286382 +0200
-@@ -1 +1,64 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+.INCLUDE : $(PRJ)$/cppconn_config.pmk
-+
-+PRJINC=..
-+TARGET=$(PRJNAME)
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+.INCLUDE : $(PRJ)$/mysql_config.pmk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
-+    SHL1NOCHECK=TRUE
-+.ENDIF
-+SHL1TARGET=$(TARGET)
-+
-+LIB1TARGET=$(SLB)$/$(PRJNAME).lib
-+LIB1OBJFILES+= \
-+        $(SLO)$/mysql_art_resultset.obj \
-+        $(SLO)$/mysql_art_rset_metadata.obj \
-+        $(SLO)$/mysql_connection.obj \
-+        $(SLO)$/mysql_debug.obj \
-+        $(SLO)$/mysql_driver.obj \
-+        $(SLO)$/mysql_metadata.obj \
-+        $(SLO)$/mysql_parameter_metadata.obj \
-+        $(SLO)$/mysql_prepared_statement.obj \
-+        $(SLO)$/mysql_ps_resultset.obj \
-+        $(SLO)$/mysql_ps_resultset_metadata.obj \
-+        $(SLO)$/mysql_resultbind.obj \
-+        $(SLO)$/mysql_resultset.obj \
-+        $(SLO)$/mysql_resultset_metadata.obj \
-+        $(SLO)$/mysql_statement.obj \
-+        $(SLO)$/mysql_util.obj \
-+        $(SLO)$/mysql_warning.obj \
-+
-+SHL1STDLIBS=\
-+       $(MYSQL_LIB)
-+
-+SHL1RPATH=OXT
-+SHL1IMPLIB=  i$(TARGET)
-+SHL1LIBS=    $(LIB1TARGET) $(SLB)$/$(CPPCONN_NATIVEAPI).lib
-+SHL1DEF=     $(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=    $(SHL1TARGET)
-+DEF1DEPN=    $(MISC)$/$(SHL1TARGET).flt \
-+              $(LIB1TARGET)
-+DEFLIB1NAME=$(TARGET)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-+# --- filter file ------------------------------
-+
-+.IF "$(depend)"==""
-+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+    @echo CLEAR_THE_FILE	> $@
-+	@echo _TI				>>$@
-+	@echo _real				>>$@
-+	@echo __CT				>>$@
-+.ENDIF # "$(depend)"==""
---- misc/mysql-connector-cpp/driver/mysql_connection.cpp	2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp	2009-08-14 09:56:37.015625000 +0200
-@@ -50,6 +50,34 @@
- #include "mysql_debug.h"
- 
- 
-+// part II of the hack to make C/C++ compile in an OOo env which doesn't have boost::variant installed
-+namespace boost
-+{
-+    template < class TYPE >
-+    const TYPE* get( const sql::ConnectPropertyVal* val )
-+    {
-+        return val;
-+    }
-+
-+    template < >
-+    const sql::SQLString* get< sql::SQLString >( const sql::ConnectPropertyVal* val )
-+    {
-+        return &val->valString;
-+    }
-+
-+    template < >
-+    const int* get< int >( const sql::ConnectPropertyVal* val )
-+    {
-+        return &val->valInt;
-+    }
-+
-+    template < >
-+    const bool* get< bool >( const sql::ConnectPropertyVal* val )
-+    {
-+        return &val->valBool;
-+    }
-+}
-+
- namespace sql
- {
- namespace mysql
---- misc/mysql-connector-cpp/driver/mysql_debug.h	2009-08-13 17:13:46.000000000 +0200
-+++ misc/build/mysql-connector-cpp/driver/mysql_debug.h	2009-08-14 09:56:37.015625000 +0200
-@@ -25,16 +25,6 @@
- 
- 
- 
--#if defined(WE_HAVE_VARARGS_MACRO_SUPPORT) && (CPPCONN_TRACE_ENABLED || defined(SAL_DLLPRIVATE))
--	#define CPP_ENTER(msg)			const boost::shared_ptr< MySQL_DebugLogger > __l = this->logger;(void)__l;\
--									MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, this->logger)
--	#define CPP_ENTER_WL(l, msg)	const boost::shared_ptr< MySQL_DebugLogger > __l = (l);(void)__l;\
--									MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, (l))
--	#define CPP_INFO(msg)		{if (__l) __l->log("INF", msg); }
--	#define CPP_INFO_FMT(...)	{if (__l) __l->log_va("INF", __VA_ARGS__); }
--	#define CPP_ERR(msg)		{if (__l) __l->log("ERR", msg); }
--	#define CPP_ERR_FMT(...)	{if (__l) __l->log_va("ERR", __VA_ARGS__); }
--#else
- 	#define CPP_ENTER(msg)
- 	#define CPP_ENTER_WL(l, msg)
- 	#define CPP_INFO(msg)
-@@ -42,7 +32,6 @@
- 	#define CPP_ENTER_WL(l, msg)
- 	static inline void CPP_INFO_FMT(...) {}
- 	static inline void CPP_ERR_FMT(...) {}
--#endif
- 
- #include <stack>
- #include "mysql_util.h"
---- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk	2009-08-17 21:32:53.694119382 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk	2009-08-17 21:32:50.534346360 +0200
-@@ -1 +1,23 @@
--dummy
-+PRJ=..$/..$/..$/..$/..$/..
-+PRJINC=..$/..
-+
-+.INCLUDE : $(PRJ)$/cppconn_config.pmk
-+
-+TARGET=$(CPPCONN_NATIVEAPI)
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+.INCLUDE : $(PRJ)$/mysql_config.pmk
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1OBJFILES+= \
-+        $(SLO)$/mysql_client_api.obj \
-+        $(SLO)$/library_loader.obj \
-+        $(SLO)$/mysql_native_connection_wrapper.obj \
-+        $(SLO)$/mysql_native_resultset_wrapper.obj \
-+        $(SLO)$/mysql_native_statement_wrapper.obj \
-+
-+# --- Targets ------------------------------------------------------
-+.INCLUDE :  target.mk
diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
deleted file mode 100644
index eb316e0..0000000
--- a/mysqlcppconn/mysql_config.pmk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-#   OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(SYSTEM_MYSQL)" == "YES"
-  CFLAGS+=-DSYSTEM_MYSQL
-.ELSE
-  .IF "$(LIBMYSQL_PATH)" == ""
-    alltar:
-      @echo "need to have LIBMYSQL_PATH set to the location where libmysql (also known as 'MySQL Connector/C') is installed"
-      @force_dmake_to_error
-  .ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-
-CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
-
-.ENDIF  # "$(GUI)"=="WNT"
-
-.IF "$(SYSTEM_MYSQL)" != "YES"
-    MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
-.ENDIF
-
-CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
-
diff --git a/mysqlcppconn/patches/default_to_protocol_tcp.patch b/mysqlcppconn/patches/default_to_protocol_tcp.patch
deleted file mode 100644
index 3df78f4..0000000
--- a/mysqlcppconn/patches/default_to_protocol_tcp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/mysql-connector-cpp/driver/mysql_connection.cpp	2009-12-16 13:24:24.088933245 +0100
-+++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp	2009-12-16 13:24:15.666841004 +0100
-@@ -437,6 +437,9 @@
- 		throw sql::InvalidArgumentException(e.what());
- 	}
- 
-+	int default_protocol_tcp = MYSQL_PROTOCOL_TCP;
-+	proxy->options(MYSQL_OPT_PROTOCOL, (const char *) &default_protocol_tcp);
-+
- #ifndef _WIN32
- 	if (!hostName.compare(0, sizeof("unix://") - 1, "unix://")) {
- 		protocol_tcp = false;
diff --git a/mysqlcppconn/prj/build.lst b/mysqlcppconn/prj/build.lst
deleted file mode 100644
index f7407ba..0000000
--- a/mysqlcppconn/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-my	mysqlcppconn	:	solenv sal NULL
-my	mysqlcppconn    nmake	-	all	my_mkout NULL
-
diff --git a/mysqlcppconn/prj/d.lst b/mysqlcppconn/prj/d.lst
deleted file mode 100644
index 5541358..0000000
--- a/mysqlcppconn/prj/d.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-# mirror the dir structure a make install would create
-mkdir: %_DEST%\inc\mysqlcppconn
-mkdir: %_DEST%\inc\mysqlcppconn\cppconn
-
-..\%__SRC%\inc\*.h %_DEST%\inc\mysqlcppconn\*.h
-..\%__SRC%\inc\cppconn\*.h %_DEST%\inc\mysqlcppconn\cppconn\*.h
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-
- ..\%__SRC%\lib\lib*.so* %_DEST%\lib
-..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.dylib.* %_DEST%\lib\*.dylib.*
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\lib\i*.lib %_DEST%\lib
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
deleted file mode 100644
index c663077..0000000
--- a/mythes/makefile.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=mythes
-TARGET=mythes
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=mythes-1.2.0
-TARFILE_MD5=067201ea8b126597670b5eff72e1f66c
-
-ADDITIONAL_FILES += makefile.mk
-
-PATCH_FILES=\
-    mythes-1.2.0-vanilla-th-gen-idx.patch \
-    mythes-1.2.0-makefile-mk.diff \
-    mythes-1.2.1-rhbz675806.patch \
-    mythes-1.2.0-android.patch
-
-.IF "$(GUI)"=="UNX"
-CONFIGURE_DIR=$(BUILD_DIR)
-
-.IF "$(SYSTEM_MYTHES)" != "YES"
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
-HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3
-.ENDIF
-
-#relative to CONFIGURE_DIR
-# still needed also in system-mythes case as it creates the makefile
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-LCL_CONFIGURE_CFLAGS+=-m64
-.ELIF "$(OS)"=="AIX"
-LCL_CONFIGURE_CFLAG+=-D_LINUX_SOURCE_COMPAT
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-.IF "$(EXTRA_CFLAGS)"!=""
-LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
-CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
-CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
-.ENDIF
-
-.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
-CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
-.ENDIF
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
-.ENDIF
-
-BUILD_ACTION=make
-OUT2INC += mythes.hxx
-.ENDIF
-.ENDIF # "$(GUI)"=="UNX"
-
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-.IF "$(SYSTEM_MYTHES)" != "YES"
-CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic \
-    HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \
-    HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.3"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
-.ENDIF
-
-BUILD_ACTION=make
-
-.ENDIF
-.ELSE
-BUILD_ACTION=dmake
-.ENDIF # "$(COM)"=="GCC"
-OUT2INC += mythes.hxx
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-.EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS
-.ENDIF
-
diff --git a/mythes/mythes-1.2.0-android.patch b/mythes/mythes-1.2.0-android.patch
deleted file mode 100644
index cb34b12..0000000
--- a/mythes/mythes-1.2.0-android.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/build/mythes-1.2.0/config.sub
-+++ misc/build/mythes-1.2.0/config.sub
-@@ -1272,7 +1272,7 @@
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff
deleted file mode 100644
index 30cdf46..0000000
--- a/mythes/mythes-1.2.0-makefile-mk.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- misc/mythes-1.2.0/makefile.mk	2010-05-14 23:36:09.000000000 +0200
-+++ misc/build/mythes-1.2.0/makefile.mk	2010-05-14 23:35:14.000000000 +0200
-@@ -1 +1,90 @@
--dummy
-+#*************************************************************************
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.1.1.1 $
-+#
-+#   last change: $Author: caolan $ $Date: 2010/02/27 15:52:17 $
-+#
-+#   The Contents of this file are made available subject to the terms of
-+#   either of the following licenses
-+#
-+#          - GNU Lesser General Public License Version 2.1
-+#          - Sun Industry Standards Source License Version 1.1
-+#
-+#   Sun Microsystems Inc., October, 2000
-+#
-+#   GNU Lesser General Public License Version 2.1
-+#   =============================================
-+#   Copyright 2000 by Sun Microsystems, Inc.
-+#   901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#   This library is free software; you can redistribute it and/or
-+#   modify it under the terms of the GNU Lesser General Public
-+#   License version 2.1, as published by the Free Software Foundation.
-+#
-+#   This library is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#   Lesser General Public License for more details.
-+#
-+#   You should have received a copy of the GNU Lesser General Public
-+#   License along with this library; if not, write to the Free Software
-+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#   MA  02111-1307  USA
-+#
-+#
-+#   Sun Industry Standards Source License Version 1.1
-+#   =================================================
-+#   The contents of this file are subject to the Sun Industry Standards
-+#   Source License Version 1.1 (the "License"); You may not use this file
-+#   except in compliance with the License. You may obtain a copy of the
-+#   License at http://www.openoffice.org/license.html.
-+#
-+#   Software provided under this License is provided on an "AS IS" basis,
-+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#   See the License for the specific provisions governing your rights and
-+#   obligations concerning the Software.
-+#
-+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#   Copyright: 2000 by Sun Microsystems, Inc.
-+#
-+#   All Rights Reserved.
-+#
-+#   Contributor(s): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ = ../../../..
-+
-+PRJNAME	= mythes
-+TARGET	= mythes
-+LIBTARGET=YES
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+#----- Settings ---------------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+all_target: ALLTAR
-+
-+
-+
-+SLOFILES=	\
-+		$(SLO)$/mythes.obj
-+
-+LIB1TARGET= $(SLB)$/lib$(TARGET).lib
-+LIB1ARCHIV= $(LB)/lib$(TARGET).a
-+LIB1OBJFILES= $(SLOFILES)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
-+
diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
deleted file mode 100644
index 776fac4..0000000
--- a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- misc/mythes-1.2.0.orig/th_gen_idx.pl
-+++ misc/build/mythes-1.2.0/th_gen_idx.pl
-@@ -1,11 +1,32 @@
--#!/usr/bin/perl
--
--# perl program to take a thesaurus structured text data file 
--# and create the proper sorted index file (.idx)
-+:
-+eval 'exec perl -wS $0 ${1+"$@"}'
-+    if 0;
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
- #
--# typcially invoked as follows:
--# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
- #
-+#*************************************************************************
- 
- sub by_entry {
-     my ($aent, $aoff) = split('\|',$a);
-@@ -13,6 +34,27 @@ sub by_entry {
-     $aent cmp $bent;
- }
- 
-+#FIXME: someone may want "infile" or even parameter parsing
-+sub get_outfile {
-+	my $next_is_file = 0;
-+	foreach ( @ARGV ) {
-+		if ( $next_is_file ) {
-+			return $_
-+		}
-+		if ( $_ eq "-o" ) {
-+			$next_is_file = 1;
-+		}
-+	}
-+	return "";
-+}
-+
-+sub usage {
-+	print "usage:\n";
-+	print "$0 -o outfile < input\n";
-+
-+	exit 99;
-+}
-+
- # main routine
- my $ne = 0;       # number of entries in index
- my @tindex=();    # the index itself
-@@ -24,6 +66,10 @@ my $nm=0;         # number of meaning fo
- my $meaning="";   # current meaning and synonyms
- my $p;            # misc uses
- my $encoding;     # encoding used by text file
-+my $outfile = "";
-+
-+$outfile = get_outfile();
-+usage() if ( $outfile eq "" );
- 
- # top line of thesaurus provides encoding
- $encoding=<STDIN>;
-@@ -51,9 +97,13 @@ while ($rec=<STDIN>){
- # now we have all of the information
- # so sort it and then output the encoding, count and index data
- @tindex = sort by_entry @tindex;
--print STDOUT "$encoding\n";
--print STDOUT "$ne\n";
-+
-+print "$outfile\n";
-+open OUTFILE, ">$outfile" or die "ERROR: Can't open $outfile for writing!";
-+print OUTFILE "$encoding\n";
-+print OUTFILE "$ne\n";
- foreach $one (@tindex) {
--    print STDOUT "$one\n";
-+    print OUTFILE "$one\n";
- }
-+close OUTFILE;
- 
diff --git a/mythes/mythes-1.2.1-rhbz675806.patch b/mythes/mythes-1.2.1-rhbz675806.patch
deleted file mode 100644
index be50bee..0000000
--- a/mythes/mythes-1.2.1-rhbz675806.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/mythes-1.2.0/mythes.cxx	2011-02-08 10:42:57.262964286 +0000
-+++ misc/build/mythes-1.2.0/mythes.cxx	2011-02-08 10:43:06.305076490 +0000
-@@ -14,6 +14,7 @@
-     encoding = NULL;
-     list = NULL;
-     offst = NULL;
-+    pdfile = NULL;
- 
-     if (thInitialize(idxpath, datpath) != 1) {
-         fprintf(stderr,"Error - can't open %s or %s\n",idxpath, datpath);
diff --git a/mythes/prj/build.lst b/mythes/prj/build.lst
deleted file mode 100644
index 6c3cb80..0000000
--- a/mythes/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-myt     mythes  :       soltools solenv HUNSPELL:hunspell NULL
-myt     mythes              usr1    -       all myt_mkout NULL
-myt     mythes              nmake   -       all myt_mythes NULL
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
deleted file mode 100644
index 375161f..0000000
--- a/mythes/prj/d.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-..\%__SRC%\slb\libmythes.lib     %_DEST%\lib\libmythes.lib
-
-..\%__SRC%\inc\mythes.hxx %_DEST%\inc\mythes.hxx
-..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
-..\%__SRC%\lib\libmythes-1.2.a %_DEST%\lib\libmythes-1.2.a
-..\%__SRC%\misc\build\mythes-1.2.0\th_gen_idx.pl %_DEST%\bin\th_gen_idx.pl
-
diff --git a/np_sdk/mozsrc/LEGAL b/np_sdk/mozsrc/LEGAL
deleted file mode 100644
index c10e0f0..0000000
--- a/np_sdk/mozsrc/LEGAL
+++ /dev/null
@@ -1,43 +0,0 @@
-Please be apprised of the following Legal Notices:
-
-A) The U.S. District Court for the Eastern District of Virginia has
-ruled that the Netscape Navigator code does not infringe Wang's U.S.
-Patent No. 4,751,669 ("the '669 Patent") because: 1) HTML is not
-Videotex as defined by the '669 patent; 2) web servers are not central
-suppliers; and 3) Navigator does not "connect," as defined by the '669
-Patent, to web servers on the Internet. Wang may appeal this decision to
-the Federal Circuit. Wang contended that its Patent disclosing a
-"Videotext" system, is infringed by the following functionality in the
-Netscape Navigator code: 1) the animated logo and status line indicators
---See Claims 1,8 and 9; 2)  the "File Save As" function --See Claims
-23-27; 3) Bookmarks and Rename Bookmarks in the Properties window --See
-Claims 20-22; 4) storing HTML, GIF, and JPEG files and adding filename
-extensions --See Claim 38
-
-B)   Intermind owns pending U.S. patent applications on communications
-systems which employ metadata ("channel objects") to define a control
-structure for information transfer.  The Netscape code does not infringe
-as released; however, modifications which utilize channel objects as
-described by Intermind should be considered carefully. The following is
-a statement from Intermind:  "Intermind's claims fundamentally involve
-the use of a control structure to automate communications. ...The
-essence of Intermind's top claim is that two devices sender and
-receiver have persistent storage, communicate over a network,
-and exchange a control structure including metadata which describes: 1)
-what information is to be updated, 2) when to update this information,
-and 3) how to transfer the updated information. In addition, at  least
-the receiving device must be able to process the metadata in order to
-perform the update determination and transfer. Any digital
-communications system which incorporates all of these elements will be
-covered by Intermind's patents."  See Intermind.com.
-
-C) Stac, Inc., and its licensing agent Hi/fn, own several patents which
-disclose data compression methods implementing an LZS compression
-algorithm, including U.S. Patent Nos.  4,701,745 and 5,016, 009 ("the
-Stac Patents").  The Netscape Communicator code  does not perform
-compression. If you modify the Netscape source code to perform
-compression, please take notice of the Stac Patents.
-
-D) Netscape Communications Corporation ("Netscape") does not guarantee
-that any source code or executable code available from the mozilla.org
-domain is Year 2000 compliant.
diff --git a/np_sdk/mozsrc/LICENSE b/np_sdk/mozsrc/LICENSE
deleted file mode 100644
index 18f8109..0000000
--- a/np_sdk/mozsrc/LICENSE
+++ /dev/null
@@ -1,567 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-     ----------------------------------------------------------------------
-
-     AMENDMENTS
-
-     The Netscape Public License Version 1.1 ("NPL") consists of the
-     Mozilla Public License Version 1.1 with the following Amendments,
-     including Exhibit A-Netscape Public License.  Files identified with
-     "Exhibit A-Netscape Public License" are governed by the Netscape
-     Public License Version 1.1.
-
-     Additional Terms applicable to the Netscape Public License.
-          I. Effect.
-          These additional terms described in this Netscape Public
-          License -- Amendments shall apply to the Mozilla Communicator
-          client code and to all Covered Code under this License.
-
-          II. "Netscape's Branded Code" means Covered Code that Netscape
-          distributes and/or permits others to distribute under one or more
-          trademark(s) which are controlled by Netscape but which are not
-          licensed for use under this License.
-
-          III. Netscape and logo.
-          This License does not grant any rights to use the trademarks
-          "Netscape", the "Netscape N and horizon" logo or the "Netscape
-          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
-          "Smart Browsing" even if such marks are included in the Original
-          Code or Modifications.
-
-          IV. Inability to Comply Due to Contractual Obligation.
-          Prior to licensing the Original Code under this License, Netscape
-          has licensed third party code for use in Netscape's Branded Code.
-          To the extent that Netscape is limited contractually from making
-          such third party code available under this License, Netscape may
-          choose to reintegrate such code into Covered Code without being
-          required to distribute such code in Source Code form, even if
-          such code would otherwise be considered "Modifications" under
-          this License.
-
-          V. Use of Modifications and Covered Code by Initial Developer.
-               V.1. In General.
-               The obligations of Section 3 apply to Netscape, except to
-               the extent specified in this Amendment, Section V.2 and V.3.
-
-               V.2. Other Products.
-               Netscape may include Covered Code in products other than the
-               Netscape's Branded Code which are released by Netscape
-               during the two (2) years following the release date of the
-               Original Code, without such additional products becoming
-               subject to the terms of this License, and may license such
-               additional products on different terms from those contained
-               in this License.
-
-               V.3. Alternative Licensing.
-               Netscape may license the Source Code of Netscape's Branded
-               Code, including Modifications incorporated therein, without
-               such Netscape Branded Code becoming subject to the terms of
-               this License, and may license such Netscape Branded Code on
-               different terms from those contained in this License.
-
-          VI. Litigation.
-          Notwithstanding the limitations of Section 11 above, the
-          provisions regarding litigation in Section 11(a), (b) and (c) of
-          the License shall apply to all disputes relating to this License.
-
-     EXHIBIT A-Netscape Public License.
-
-          "The contents of this file are subject to the Netscape Public
-          License Version 1.1 (the "License"); you may not use this file
-          except in compliance with the License. You may obtain a copy of
-          the License at http://www.mozilla.org/NPL/
-
-          Software distributed under the License is distributed on an "AS
-          IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-          implied. See the License for the specific language governing
-          rights and limitations under the License.
-
-          The Original Code is Mozilla Communicator client code, released
-          March 31, 1998.
-
-          The Initial Developer of the Original Code is Netscape
-          Communications Corporation. Portions created by Netscape are
-          Copyright (C) 1998-1999 Netscape Communications Corporation. All
-          Rights Reserved.
-
-          Contributor(s): ______________________________________.
-
-          Alternatively, the contents of this file may be used under the
-          terms of the _____ license (the "[___] License"), in which case
-          the provisions of [______] License are applicable  instead of
-          those above.  If you wish to allow use of your version of this
-          file only under the terms of the [____] License and not to allow
-          others to use your version of this file under the NPL, indicate
-          your decision by deleting  the provisions above and replace  them
-          with the notice and other provisions required by the [___]
-          License.  If you do not delete the provisions above, a recipient
-          may use your version of this file under either the NPL or the
-          [___] License."
diff --git a/np_sdk/mozsrc/README b/np_sdk/mozsrc/README
deleted file mode 100644
index 9c05653..0000000
--- a/np_sdk/mozsrc/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains Mozilla headers and source-files related to plugin development. The original version of the files were taken from Mozilla1.0 tarball.
-
diff --git a/np_sdk/mozsrc/jri.h b/np_sdk/mozsrc/jri.h
deleted file mode 100644
index 1d54785..0000000
--- a/np_sdk/mozsrc/jri.h
+++ /dev/null
@@ -1,689 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * 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.
- *
- * 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 
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*******************************************************************************
- * Java Runtime Interface
- ******************************************************************************/
-
-#ifndef JRI_H
-#define JRI_H
-
-#include "jritypes.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*******************************************************************************
- * JRIEnv
- ******************************************************************************/
-
-/* The type of the JRIEnv interface. */
-typedef struct JRIEnvInterface	JRIEnvInterface;
-
-/* The type of a JRIEnv instance. */
-typedef const JRIEnvInterface*	JRIEnv;
-
-/*******************************************************************************
- * JRIEnv Operations
- ******************************************************************************/
-
-#define JRI_DefineClass(env, classLoader, buf, bufLen)	\
-    (((*(env))->DefineClass)(env, JRI_DefineClass_op, classLoader, buf, bufLen))
-
-#define JRI_FindClass(env, name)	\
-    (((*(env))->FindClass)(env, JRI_FindClass_op, name))
-
-#define JRI_Throw(env, obj)	\
-    (((*(env))->Throw)(env, JRI_Throw_op, obj))
-
-#define JRI_ThrowNew(env, clazz, message)	\
-    (((*(env))->ThrowNew)(env, JRI_ThrowNew_op, clazz, message))
-
-#define JRI_ExceptionOccurred(env)	\
-    (((*(env))->ExceptionOccurred)(env, JRI_ExceptionOccurred_op))
-
-#define JRI_ExceptionDescribe(env)	\
-    (((*(env))->ExceptionDescribe)(env, JRI_ExceptionDescribe_op))
-
-#define JRI_ExceptionClear(env)	\
-    (((*(env))->ExceptionClear)(env, JRI_ExceptionClear_op))
-
-#define JRI_NewGlobalRef(env, ref)	\
-    (((*(env))->NewGlobalRef)(env, JRI_NewGlobalRef_op, ref))
-
-#define JRI_DisposeGlobalRef(env, gref)	\
-    (((*(env))->DisposeGlobalRef)(env, JRI_DisposeGlobalRef_op, gref))
-
-#define JRI_GetGlobalRef(env, gref)	\
-    (((*(env))->GetGlobalRef)(env, JRI_GetGlobalRef_op, gref))
-
-#define JRI_SetGlobalRef(env, gref, ref)	\
-    (((*(env))->SetGlobalRef)(env, JRI_SetGlobalRef_op, gref, ref))
-
-#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)	\
-    (((*(env))->NewObjectV)(env, JRI_NewObject_op_va_list, clazz, methodID, args))
-#define JRI_NewObjectA(env, clazz, method, args)	\
-    (((*(env))->NewObjectA)(env, JRI_NewObject_op_array, clazz, methodID, args))
-
-#define JRI_GetObjectClass(env, obj)	\
-    (((*(env))->GetObjectClass)(env, JRI_GetObjectClass_op, obj))
-
-#define JRI_IsInstanceOf(env, obj, clazz)	\
-    (((*(env))->IsInstanceOf)(env, JRI_IsInstanceOf_op, obj, clazz))
-
-#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)	\
-    (((*(env))->CallMethodV)(env, JRI_CallMethod_op_va_list, 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)	\
-    (((*(env))->CallMethodBooleanV)(env, JRI_CallMethodBoolean_op_va_list, 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)	\
-    (((*(env))->CallMethodByteV)(env, JRI_CallMethodByte_op_va_list, 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)	\
-    (((*(env))->CallMethodCharV)(env, JRI_CallMethodChar_op_va_list, 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)	\
-    (((*(env))->CallMethodShortV)(env, JRI_CallMethodShort_op_va_list, 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)	\
-    (((*(env))->CallMethodIntV)(env, JRI_CallMethodInt_op_va_list, 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)	\
-    (((*(env))->CallMethodLongV)(env, JRI_CallMethodLong_op_va_list, 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)	\
-    (((*(env))->CallMethodFloatV)(env, JRI_CallMethodFloat_op_va_list, 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)	\
-    (((*(env))->CallMethodDoubleV)(env, JRI_CallMethodDouble_op_va_list, 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)	\
-    (((*(env))->GetFieldID)(env, JRI_GetFieldID_op, clazz, name, sig))
-
-#define JRI_GetField(env, obj, fieldID)	\
-    (((*(env))->GetField)(env, JRI_GetField_op, obj, fieldID))
-
-#define JRI_GetFieldBoolean(env, obj, fieldID)	\
-    (((*(env))->GetFieldBoolean)(env, JRI_GetFieldBoolean_op, obj, fieldID))
-
-#define JRI_GetFieldByte(env, obj, fieldID)	\
-    (((*(env))->GetFieldByte)(env, JRI_GetFieldByte_op, obj, fieldID))
-
-#define JRI_GetFieldChar(env, obj, fieldID)	\
-    (((*(env))->GetFieldChar)(env, JRI_GetFieldChar_op, obj, fieldID))
-
-#define JRI_GetFieldShort(env, obj, fieldID)	\
-    (((*(env))->GetFieldShort)(env, JRI_GetFieldShort_op, obj, fieldID))
-
-#define JRI_GetFieldInt(env, obj, fieldID)	\
-    (((*(env))->GetFieldInt)(env, JRI_GetFieldInt_op, obj, fieldID))
-
-#define JRI_GetFieldLong(env, obj, fieldID)	\
-    (((*(env))->GetFieldLong)(env, JRI_GetFieldLong_op, obj, fieldID))
-
-#define JRI_GetFieldFloat(env, obj, fieldID)	\
-    (((*(env))->GetFieldFloat)(env, JRI_GetFieldFloat_op, obj, fieldID))
-
-#define JRI_GetFieldDouble(env, obj, fieldID)	\
-    (((*(env))->GetFieldDouble)(env, JRI_GetFieldDouble_op, obj, fieldID))
-
-#define JRI_SetField(env, obj, fieldID, value)	\
-    (((*(env))->SetField)(env, JRI_SetField_op, 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)	\
-    (((*(env))->SetFieldByte)(env, JRI_SetFieldByte_op, 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)	\
-    (((*(env))->SetFieldShort)(env, JRI_SetFieldShort_op, 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)	\
-    (((*(env))->SetFieldLong)(env, JRI_SetFieldLong_op, 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)	\
-    (((*(env))->SetFieldDouble)(env, JRI_SetFieldDouble_op, obj, fieldID, value))
-
-#define JRI_IsSubclassOf(env, a, b)	\
-    (((*(env))->IsSubclassOf)(env, JRI_IsSubclassOf_op, a, b))
-
-#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)	\
-    (((*(env))->CallStaticMethodV)(env, JRI_CallStaticMethod_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodBooleanV)(env, JRI_CallStaticMethodBoolean_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodByteV)(env, JRI_CallStaticMethodByte_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodCharV)(env, JRI_CallStaticMethodChar_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodShortV)(env, JRI_CallStaticMethodShort_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodIntV)(env, JRI_CallStaticMethodInt_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodLongV)(env, JRI_CallStaticMethodLong_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodFloatV)(env, JRI_CallStaticMethodFloat_op_va_list, 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)	\
-    (((*(env))->CallStaticMethodDoubleV)(env, JRI_CallStaticMethodDouble_op_va_list, 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)	\
-    (((*(env))->GetStaticFieldID)(env, JRI_GetStaticFieldID_op, clazz, name, sig))
-
-#define JRI_GetStaticField(env, clazz, fieldID)	\
-    (((*(env))->GetStaticField)(env, JRI_GetStaticField_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldBoolean(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldBoolean)(env, JRI_GetStaticFieldBoolean_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldByte(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldByte)(env, JRI_GetStaticFieldByte_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldChar(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldChar)(env, JRI_GetStaticFieldChar_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldShort(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldShort)(env, JRI_GetStaticFieldShort_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldInt(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldInt)(env, JRI_GetStaticFieldInt_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldLong(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldLong)(env, JRI_GetStaticFieldLong_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldFloat(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldFloat)(env, JRI_GetStaticFieldFloat_op, clazz, fieldID))
-
-#define JRI_GetStaticFieldDouble(env, clazz, fieldID)	\
-    (((*(env))->GetStaticFieldDouble)(env, JRI_GetStaticFieldDouble_op, clazz, fieldID))
-
-#define JRI_SetStaticField(env, clazz, fieldID, value)	\
-    (((*(env))->SetStaticField)(env, JRI_SetStaticField_op, 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)	\
-    (((*(env))->SetStaticFieldByte)(env, JRI_SetStaticFieldByte_op, 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)	\
-    (((*(env))->SetStaticFieldShort)(env, JRI_SetStaticFieldShort_op, 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)	\
-    (((*(env))->SetStaticFieldLong)(env, JRI_SetStaticFieldLong_op, 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)	\
-    (((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value))
-
-#define JRI_NewString(env, unicode, len)	\
-    (((*(env))->NewString)(env, JRI_NewString_op, unicode, len))
-
-#define JRI_GetStringLength(env, string)	\
-    (((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string))
-
-#define JRI_GetStringChars(env, string)	\
-    (((*(env))->GetStringChars)(env, JRI_GetStringChars_op, string))
-
-#define JRI_NewStringUTF(env, utf, len)	\
-    (((*(env))->NewStringUTF)(env, JRI_NewStringUTF_op, utf, len))
-
-#define JRI_GetStringUTFLength(env, string)	\
-    (((*(env))->GetStringUTFLength)(env, JRI_GetStringUTFLength_op, string))
-
-#define JRI_GetStringUTFChars(env, string)	\
-    (((*(env))->GetStringUTFChars)(env, JRI_GetStringUTFChars_op, string))
-
-#define JRI_NewScalarArray(env, length, elementSig, initialElements)	\
-    (((*(env))->NewScalarArray)(env, JRI_NewScalarArray_op, length, elementSig, initialElements))
-
-#define JRI_GetScalarArrayLength(env, array)	\
-    (((*(env))->GetScalarArrayLength)(env, JRI_GetScalarArrayLength_op, array))
-
-#define JRI_GetScalarArrayElements(env, array)	\
-    (((*(env))->GetScalarArrayElements)(env, JRI_GetScalarArrayElements_op, array))
-
-#define JRI_NewObjectArray(env, length, elementClass, initialElement)	\
-    (((*(env))->NewObjectArray)(env, JRI_NewObjectArray_op, length, elementClass, initialElement))
-
-#define JRI_GetObjectArrayLength(env, array)	\
-    (((*(env))->GetObjectArrayLength)(env, JRI_GetObjectArrayLength_op, array))
-
-#define JRI_GetObjectArrayElement(env, array, index)	\
-    (((*(env))->GetObjectArrayElement)(env, JRI_GetObjectArrayElement_op, array, index))
-
-#define JRI_SetObjectArrayElement(env, array, index, value)	\
-    (((*(env))->SetObjectArrayElement)(env, JRI_SetObjectArrayElement_op, array, index, value))
-
-#define JRI_RegisterNatives(env, clazz, nameAndSigArray, nativeProcArray)	\
-    (((*(env))->RegisterNatives)(env, JRI_RegisterNatives_op, clazz, nameAndSigArray, nativeProcArray))
-
-#define JRI_UnregisterNatives(env, clazz)	\
-    (((*(env))->UnregisterNatives)(env, JRI_UnregisterNatives_op, clazz))
-
-#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)	\
-    (((*(env))->GetStringPlatformChars)(env, JRI_GetStringPlatformChars_op, string, encoding, encodingLength))
-
-
-/*******************************************************************************
- * JRIEnv Interface
- ******************************************************************************/
-
-struct java_lang_ClassLoader;
-struct java_lang_Class;
-struct java_lang_Throwable;
-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);
-};
-
-/*
-** ****************************************************************************
-** JRIEnv Operation IDs
-** ***************************************************************************
-*/
-
-typedef enum JRIEnvOperations {
-    JRI_Reserved0_op,
-    JRI_Reserved1_op,
-    JRI_Reserved2_op,
-    JRI_Reserved3_op,
-    JRI_FindClass_op,
-    JRI_Throw_op,
-    JRI_ThrowNew_op,
-    JRI_ExceptionOccurred_op,
-    JRI_ExceptionDescribe_op,
-    JRI_ExceptionClear_op,
-    JRI_NewGlobalRef_op,
-    JRI_DisposeGlobalRef_op,
-    JRI_GetGlobalRef_op,
-    JRI_SetGlobalRef_op,
-    JRI_IsSameObject_op,
-    JRI_NewObject_op,
-    JRI_NewObject_op_va_list,
-    JRI_NewObject_op_array,
-    JRI_GetObjectClass_op,
-    JRI_IsInstanceOf_op,
-    JRI_GetMethodID_op,
-    JRI_CallMethod_op,
-    JRI_CallMethod_op_va_list,
-    JRI_CallMethod_op_array,
-    JRI_CallMethodBoolean_op,
-    JRI_CallMethodBoolean_op_va_list,
-    JRI_CallMethodBoolean_op_array,
-    JRI_CallMethodByte_op,
-    JRI_CallMethodByte_op_va_list,
-    JRI_CallMethodByte_op_array,
-    JRI_CallMethodChar_op,
-    JRI_CallMethodChar_op_va_list,
-    JRI_CallMethodChar_op_array,
-    JRI_CallMethodShort_op,
-    JRI_CallMethodShort_op_va_list,
-    JRI_CallMethodShort_op_array,
-    JRI_CallMethodInt_op,
-    JRI_CallMethodInt_op_va_list,
-    JRI_CallMethodInt_op_array,
-    JRI_CallMethodLong_op,
-    JRI_CallMethodLong_op_va_list,
-    JRI_CallMethodLong_op_array,
-    JRI_CallMethodFloat_op,
-    JRI_CallMethodFloat_op_va_list,
-    JRI_CallMethodFloat_op_array,
-    JRI_CallMethodDouble_op,
-    JRI_CallMethodDouble_op_va_list,
-    JRI_CallMethodDouble_op_array,
-    JRI_GetFieldID_op,
-    JRI_GetField_op,
-    JRI_GetFieldBoolean_op,
-    JRI_GetFieldByte_op,
-    JRI_GetFieldChar_op,
-    JRI_GetFieldShort_op,
-    JRI_GetFieldInt_op,
-    JRI_GetFieldLong_op,
-    JRI_GetFieldFloat_op,
-    JRI_GetFieldDouble_op,
-    JRI_SetField_op,
-    JRI_SetFieldBoolean_op,
-    JRI_SetFieldByte_op,
-    JRI_SetFieldChar_op,
-    JRI_SetFieldShort_op,
-    JRI_SetFieldInt_op,
-    JRI_SetFieldLong_op,
-    JRI_SetFieldFloat_op,
-    JRI_SetFieldDouble_op,
-    JRI_IsSubclassOf_op,
-    JRI_GetStaticMethodID_op,
-    JRI_CallStaticMethod_op,
-    JRI_CallStaticMethod_op_va_list,
-    JRI_CallStaticMethod_op_array,
-    JRI_CallStaticMethodBoolean_op,
-    JRI_CallStaticMethodBoolean_op_va_list,
-    JRI_CallStaticMethodBoolean_op_array,
-    JRI_CallStaticMethodByte_op,
-    JRI_CallStaticMethodByte_op_va_list,
-    JRI_CallStaticMethodByte_op_array,
-    JRI_CallStaticMethodChar_op,
-    JRI_CallStaticMethodChar_op_va_list,
-    JRI_CallStaticMethodChar_op_array,
-    JRI_CallStaticMethodShort_op,
-    JRI_CallStaticMethodShort_op_va_list,
-    JRI_CallStaticMethodShort_op_array,
-    JRI_CallStaticMethodInt_op,
-    JRI_CallStaticMethodInt_op_va_list,
-    JRI_CallStaticMethodInt_op_array,
-    JRI_CallStaticMethodLong_op,
-    JRI_CallStaticMethodLong_op_va_list,
-    JRI_CallStaticMethodLong_op_array,
-    JRI_CallStaticMethodFloat_op,
-    JRI_CallStaticMethodFloat_op_va_list,
-    JRI_CallStaticMethodFloat_op_array,
-    JRI_CallStaticMethodDouble_op,
-    JRI_CallStaticMethodDouble_op_va_list,
-    JRI_CallStaticMethodDouble_op_array,
-    JRI_GetStaticFieldID_op,
-    JRI_GetStaticField_op,
-    JRI_GetStaticFieldBoolean_op,
-    JRI_GetStaticFieldByte_op,
-    JRI_GetStaticFieldChar_op,
-    JRI_GetStaticFieldShort_op,
-    JRI_GetStaticFieldInt_op,
-    JRI_GetStaticFieldLong_op,
-    JRI_GetStaticFieldFloat_op,
-    JRI_GetStaticFieldDouble_op,
-    JRI_SetStaticField_op,
-    JRI_SetStaticFieldBoolean_op,
-    JRI_SetStaticFieldByte_op,
-    JRI_SetStaticFieldChar_op,
-    JRI_SetStaticFieldShort_op,
-    JRI_SetStaticFieldInt_op,
-    JRI_SetStaticFieldLong_op,
-    JRI_SetStaticFieldFloat_op,
-    JRI_SetStaticFieldDouble_op,
-    JRI_NewString_op,
-    JRI_GetStringLength_op,
-    JRI_GetStringChars_op,
-    JRI_NewStringUTF_op,
-    JRI_GetStringUTFLength_op,
-    JRI_GetStringUTFChars_op,
-    JRI_NewScalarArray_op,
-    JRI_GetScalarArrayLength_op,
-    JRI_GetScalarArrayElements_op,
-    JRI_NewObjectArray_op,
-    JRI_GetObjectArrayLength_op,
-    JRI_GetObjectArrayElement_op,
-    JRI_SetObjectArrayElement_op,
-    JRI_RegisterNatives_op,
-    JRI_UnregisterNatives_op,
-    JRI_DefineClass_op,
-    JRI_NewStringPlatform_op,
-    JRI_GetStringPlatformChars_op
-} JRIEnvOperations;
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* JRI_H */
-/******************************************************************************/
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/mozsrc/jri_md.h
deleted file mode 100644
index 6db8c65..0000000
--- a/np_sdk/mozsrc/jri_md.h
+++ /dev/null
@@ -1,545 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * 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.
- *
- * 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 
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*******************************************************************************
- * Java Runtime Interface - Machine Dependent Types
- ******************************************************************************/
- 
-#ifndef JRI_MD_H
-#define JRI_MD_H
-
-#include <assert.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*******************************************************************************
- * 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 
- * 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)
- ******************************************************************************/
-
-/* DLL Entry modifiers... */
-
-/* PC */
-#if 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
-#                   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
-
-/* 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
-
-/* Unix or else */
-#else
-#	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
-#endif
-
-#ifndef FAR		/* for non-Win16 */
-#define FAR
-#endif
-
-/******************************************************************************/
-
-/* Java Scalar Types */
-
-/* moved from jni.h -- Sun's new jni.h doesn't have this anymore */
-#ifdef __cplusplus
-typedef class _jobject *jref;
-#else
-typedef struct _jobject *jref;
-#endif
-
-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;
-#else
-typedef unsigned long	juint;
-typedef long			jint;
-#endif
-
-typedef float			jfloat;
-typedef double			jdouble;
-
-typedef juint			jsize;
-
-
-/*******************************************************************************
- * jlong : long long (64-bit signed integer type) support.
- ******************************************************************************/
-
-/*
-** 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)
-
-#ifdef HAVE_LONG_LONG
-
-#if (defined(WIN32) || defined(_WIN32))
-
-typedef LONGLONG              jlong;
-typedef DWORDLONG             julong;
-#define jlong_MAXINT          0x7fffffffffffffffi64
-#define jlong_MININT          0x8000000000000000i64
-#define jlong_ZERO            0x0i64
-
-#else
-
-typedef long long             jlong;
-typedef unsigned long long    julong;
-#define jlong_MAXINT          0x7fffffffffffffffLL
-#define jlong_MININT          0x8000000000000000LL
-#define jlong_ZERO            0x0LL
-
-#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_UDIVMOD(qp, rp, a, b)  \
-    (*(qp) = ((julong)(a) / (b)), \
-     *(rp) = ((julong)(a) % (b)))
-
-#else  /* !HAVE_LONG_LONG */
-
-typedef struct {
-#ifdef IS_LITTLE_ENDIAN
-    juint lo, hi;
-#else
-    juint hi, lo;
-#endif
-} jlong;
-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)
-
-/*
- * NB: jlong_CMP and jlong_UCMP work only for strict relationals (<, >).
- */
-#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) ||                    \
-                 (((a).hi == (b).hi) && ((a).lo op (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,                    \
-                 (r).hi = (a).hi | (b).hi)
-#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,                    \
-                 (r).hi = (r).hi | (a).hi)
-#define jlong_NOT(r, a)		((r).lo = ~(a).lo,	                          \
-                 (r).hi = ~(a).hi)
-
-#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;                                                         \
-    _a = a; _b = b;                                                       \
-    (r).lo = _a.lo + _b.lo;                                               \
-    (r).hi = _a.hi + _b.hi + ((r).lo < _b.lo);                            \
-}
-
-#define jlong_SUB(r, a, b) {                                              \
-    jlong _a, _b;                                                         \
-    _a = a; _b = b;                                                       \
-    (r).lo = _a.lo - _b.lo;                                               \
-    (r).hi = _a.hi - _b.hi - (_a.lo < _b.lo);                             \
-}                                                                         \
-
-/*
- * Multiply 64-bit operands a and b to get 64-bit result r.
- * First multiply the low 32 bits of a and b to get a 64-bit result in r.
- * Then add the outer and inner products to r.hi.
- */
-#define jlong_MUL(r, a, b) {                                              \
-    jlong _a, _b;                                                         \
-    _a = a; _b = b;                                                       \
-    jlong_MUL32(r, _a.lo, _b.lo);                                         \
-    (r).hi += _a.hi * _b.lo + _a.lo * _b.hi;                              \
-}
-
-/* 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)
-
-/*
- * Multiply 32-bit operands a and b to get 64-bit result r.
- * Use polynomial expansion based on primitive field element (1 << 16).
- */
-#define jlong_MUL32(r, a, b) {                                            \
-     juint _a1, _a0, _b1, _b0, _y0, _y1, _y2, _y3;                        \
-     _a1 = _jlong_hi16(a), _a0 = _jlong_lo16(a);                          \
-     _b1 = _jlong_hi16(b), _b0 = _jlong_lo16(b);                          \
-     _y0 = _a0 * _b0;                                                     \
-     _y1 = _a0 * _b1;                                                     \
-     _y2 = _a1 * _b0;                                                     \
-     _y3 = _a1 * _b1;                                                     \
-     _y1 += _jlong_hi16(_y0);                   /* can't carry */         \
-     _y1 += _y2;                                /* might carry */         \
-     if (_y1 < _y2) _y3 += 1 << 16;             /* propagate */           \
-     (r).lo = (_jlong_lo16(_y1) << 16) + _jlong_lo16(_y0);                \
-     (r).hi = _y3 + _jlong_hi16(_y1);                                     \
-}
-
-/*
- * Divide 64-bit unsigned operand a by 64-bit unsigned operand b, setting *qp
- * 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)
-
-extern JRI_PUBLIC_API(void)
-jlong_udivmod(julong *qp, julong *rp, julong a, julong b);
-
-#define jlong_DIV(r, a, b) {                                              \
-    jlong _a, _b;                                                         \
-    juint _negative = (int32)(a).hi < 0;                                  \
-    if (_negative) {                                                      \
-    jlong_NEG(_a, a);                                                     \
-    } else {                                                              \
-    _a = a;                                                               \
-    }                                                                     \
-    if ((int32)(b).hi < 0) {                                              \
-    _negative ^= 1;                                                       \
-    jlong_NEG(_b, b);                                                     \
-    } else {                                                              \
-    _b = b;                                                               \
-    }                                                                     \
-    jlong_UDIVMOD(&(r), 0, _a, _b);                                       \
-    if (_negative)                                                        \
-    jlong_NEG(r, r);                                                      \
-}
-
-#define jlong_MOD(r, a, b) {                                              \
-    jlong _a, _b;                                                         \
-    juint _negative = (int32)(a).hi < 0;                                  \
-    if (_negative) {                                                      \
-    jlong_NEG(_a, a);                                                     \
-    } else {                                                              \
-    _a = a;                                                               \
-    }                                                                     \
-    if ((int32)(b).hi < 0) {                                              \
-    jlong_NEG(_b, b);                                                     \
-    } else {                                                              \
-    _b = b;                                                               \
-    }                                                                     \
-    jlong_UDIVMOD(0, &(r), _a, _b);                                       \
-    if (_negative)                                                        \
-    jlong_NEG(r, r);                                                      \
-}
-
-/*
- * NB: b is a juint, not jlong or julong, for the shift ops.
- */
-#define jlong_SHL(r, a, b) {                                              \
-    if (b) {                                                              \
-    jlong _a;                                                             \
-        _a = a;                                                           \
-        if ((b) < 32) {                                                   \
-        (r).lo = _a.lo << (b);                                            \
-        (r).hi = (_a.hi << (b)) | (_a.lo >> (32 - (b)));                  \
-    } else {                                                              \
-        (r).lo = 0;                                                       \
-        (r).hi = _a.lo << ((b) & 31);                                     \
-    }                                                                     \
-    } else {                                                              \
-    (r) = (a);                                                            \
-    }                                                                     \
-}
-
-/* a is an int32, b is int32, r is jlong */
-#define jlong_ISHL(r, a, b) {                                             \
-    if (b) {                                                              \
-    jlong _a;                                                             \
-    _a.lo = (a);                                                          \
-    _a.hi = 0;                                                            \
-        if ((b) < 32) {                                                   \
-        (r).lo = (a) << (b);                                              \
-        (r).hi = ((a) >> (32 - (b)));                                     \
-    } else {                                                              \
-        (r).lo = 0;                                                       \
-        (r).hi = (a) << ((b) & 31);                                       \
-    }                                                                     \
-    } else {                                                              \
-    (r).lo = (a);                                                         \
-    (r).hi = 0;                                                           \
-    }                                                                     \
-}
-
-#define jlong_SHR(r, a, b) {                                              \
-    if (b) {                                                              \
-    jlong _a;                                                             \
-        _a = a;                                                           \
-    if ((b) < 32) {                                                       \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> (b));                  \
-        (r).hi = (int32)_a.hi >> (b);                                     \
-    } else {                                                              \
-        (r).lo = (int32)_a.hi >> ((b) & 31);                              \
-        (r).hi = (int32)_a.hi >> 31;                                      \
-    }                                                                     \
-    } else {                                                              \
-    (r) = (a);                                                            \
-    }                                                                     \
-}
-
-#define jlong_USHR(r, a, b) {                                             \
-    if (b) {                                                              \
-    jlong _a;                                                             \
-        _a = a;                                                           \
-    if ((b) < 32) {                                                       \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> (b));                  \
-        (r).hi = _a.hi >> (b);                                            \
-    } else {                                                              \
-        (r).lo = _a.hi >> ((b) & 31);                                     \
-        (r).hi = 0;                                                       \
-    }                                                                     \
-    } else {                                                              \
-    (r) = (a);                                                            \
-    }                                                                     \
-}
-
-#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;                                                      \
-    jlong _absval;                                                        \
-                                                                          \
-    _negative = (l).hi >> 31;                                             \
-    if (_negative) {                                                      \
-    jlong_NEG(_absval, l);                                                \
-    } else {                                                              \
-    _absval = l;                                                          \
-    }                                                                     \
-    (d) = (double)_absval.hi * 4.294967296e9 + _absval.lo;                \
-    if (_negative)                                                        \
-    (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_D2L(l, d) {                                                 \
-    int _negative;                                                        \
-    double _absval, _d_hi;                                                \
-    jlong _lo_d;                                                          \
-                                                                          \
-    _negative = ((d) < 0);                                                \
-    _absval = _negative ? -(d) : (d);                                     \
-                                                                          \
-    (l).hi = (juint)(_absval / 4.294967296e9);                            \
-    (l).lo = 0;                                                           \
-    jlong_L2D(_d_hi, l);                                                  \
-    _absval -= _d_hi;                                                     \
-    _lo_d.hi = 0;                                                         \
-    if (_absval < 0) {                                                    \
-    _lo_d.lo = (juint) -_absval;                                          \
-    jlong_SUB(l, l, _lo_d);                                               \
-    } else {                                                              \
-    _lo_d.lo = (juint) _absval;                                           \
-    jlong_ADD(l, l, _lo_d);                                               \
-    }                                                                     \
-                                                                          \
-    if (_negative)                                                        \
-    jlong_NEG(l, l);                                                      \
-}
-
-#endif /* !HAVE_LONG_LONG */
-
-/******************************************************************************/
-
-#ifdef HAVE_ALIGNED_LONGLONGS
-#define JRI_GET_INT64(_t,_addr) ( ((_t).x[0] = ((jint*)(_addr))[0]), \
-                              ((_t).x[1] = ((jint*)(_addr))[1]),      \
-                              (_t).l )
-#define JRI_SET_INT64(_t, _addr, _v) ( (_t).l = (_v),                \
-                                   ((jint*)(_addr))[0] = (_t).x[0], \
-                                   ((jint*)(_addr))[1] = (_t).x[1] )
-#else
-#define JRI_GET_INT64(_t,_addr) (*(jlong*)(_addr))
-#define JRI_SET_INT64(_t, _addr, _v) (*(jlong*)(_addr) = (_v))
-#endif
-
-/* If double's must be aligned on doubleword boundaries then define this */
-#ifdef HAVE_ALIGNED_DOUBLES
-#define JRI_GET_DOUBLE(_t,_addr) ( ((_t).x[0] = ((jint*)(_addr))[0]), \
-                               ((_t).x[1] = ((jint*)(_addr))[1]),      \
-                               (_t).d )
-#define JRI_SET_DOUBLE(_t, _addr, _v) ( (_t).d = (_v),                \
-                                    ((jint*)(_addr))[0] = (_t).x[0], \
-                                    ((jint*)(_addr))[1] = (_t).x[1] )
-#else
-#define JRI_GET_DOUBLE(_t,_addr) (*(jdouble*)(_addr))
-#define JRI_SET_DOUBLE(_t, _addr, _v) (*(jdouble*)(_addr) = (_v))
-#endif
-
-/******************************************************************************/
-#ifdef __cplusplus
-}
-#endif
-#endif /* JRI_MD_H */
-/******************************************************************************/
diff --git a/np_sdk/mozsrc/jritypes.h b/np_sdk/mozsrc/jritypes.h
deleted file mode 100644
index 8735f10..0000000
--- a/np_sdk/mozsrc/jritypes.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * 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.
- *
- * 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 
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*******************************************************************************
- * Java Runtime Interface
- ******************************************************************************/
-
-#ifndef JRITYPES_H
-#define JRITYPES_H
-
-#include "jri_md.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*******************************************************************************
- * Types
- ******************************************************************************/
-
-struct JRIEnvInterface;
-
-typedef void*		JRIRef;
-typedef void*		JRIGlobalRef;
-
-typedef jint		JRIFieldID;
-typedef jint		JRIMethodID;
-
-/* synonyms: */
-typedef JRIGlobalRef	jglobal;
-
-typedef union JRIValue {
-    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
-} JRIBoolean;
-
-typedef enum JRIConstant {
-    JRIUninitialized	= -1
-} JRIConstant;
-
-/* convenience types (these must be distinct struct types for c++ overloading): */
-
-typedef struct jstringArrayStruct*		jstringArray;
-typedef struct jarrayArrayStruct*		jarrayArray;
-
-#define JRIConstructorMethodName	"<init>"
-
-/*******************************************************************************
- * Signature Construction Macros
- ******************************************************************************/
-
-/*
-** These macros can be used to construct signature strings. Hopefully their names
-** 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);
-**
-** you could write something like this in C:
-**
-**	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"
-
-/*******************************************************************************
- * Environments
- ******************************************************************************/
-
-extern JRI_PUBLIC_API(const struct JRIEnvInterface**)
-JRI_GetCurrentEnv(void);
-
-/*******************************************************************************
- * Specific Scalar Array Types
- ******************************************************************************/
-
-/*
-** The JRI Native Method Interface does not support boolean arrays. This
-** is to allow Java runtime implementations to optimize boolean array
-** storage. Using the ScalarArray operations on boolean arrays is bound
-** to fail, so convert any boolean arrays to byte arrays in Java before
-** passing them to a native method.
-*/
-
-#define JRI_NewByteArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, length, JRISigByte, (jbyte*)(initialValues))
-#define JRI_GetByteArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetByteArrayElements(env, array)	\
-    JRI_GetScalarArrayElements(env, array)
-
-#define JRI_NewCharArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, ((length) * sizeof(jchar)), JRISigChar, (jbyte*)(initialValues))
-#define JRI_GetCharArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetCharArrayElements(env, array)		   \
-    ((jchar*)JRI_GetScalarArrayElements(env, array))
-
-#define JRI_NewShortArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, ((length) * sizeof(jshort)), JRISigShort, (jbyte*)(initialValues))
-#define JRI_GetShortArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetShortArrayElements(env, array)		   \
-    ((jshort*)JRI_GetScalarArrayElements(env, array))
-
-#define JRI_NewIntArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, ((length) * sizeof(jint)), JRISigInt, (jbyte*)(initialValues))
-#define JRI_GetIntArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetIntArrayElements(env, array)		   \
-    ((jint*)JRI_GetScalarArrayElements(env, array))
-
-#define JRI_NewLongArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, ((length) * sizeof(jlong)), JRISigLong, (jbyte*)(initialValues))
-#define JRI_GetLongArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetLongArrayElements(env, array)		   \
-    ((jlong*)JRI_GetScalarArrayElements(env, array))
-
-#define JRI_NewFloatArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, ((length) * sizeof(jfloat)), JRISigFloat, (jbyte*)(initialValues))
-#define JRI_GetFloatArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetFloatArrayElements(env, array)		   \
-    ((jfloat*)JRI_GetScalarArrayElements(env, array))
-
-#define JRI_NewDoubleArray(env, length, initialValues)	\
-    JRI_NewScalarArray(env, ((length) * sizeof(jdouble)), JRISigDouble, (jbyte*)(initialValues))
-#define JRI_GetDoubleArrayLength(env, array)	\
-    JRI_GetScalarArrayLength(env, array)
-#define JRI_GetDoubleArrayElements(env, array)		   \
-    ((jdouble*)JRI_GetScalarArrayElements(env, array))
-
-/******************************************************************************/
-/*
-** JDK Stuff -- This stuff is still needed while we're using the JDK
-** dynamic linking strategy to call native methods.
-*/
-
-typedef union JRI_JDK_stack_item {
-    /* Non pointer items */
-    jint           i;
-    jfloat         f;
-    jint           o;
-    /* Pointer items */
-    void          *h;
-    void          *p;
-    unsigned char *addr;
-#ifdef IS_64
-    double         d;
-    long           l;		/* == 64bits! */
-#endif
-} JRI_JDK_stack_item;
-
-typedef union JRI_JDK_Java8Str {
-    jint x[2];
-    jdouble d;
-    jlong l;
-    void *p;
-    float f;
-} JRI_JDK_Java8;
-
-/******************************************************************************/
-#ifdef __cplusplus
-}
-#endif
-#endif /* JRITYPES_H */
-/******************************************************************************/
diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
deleted file mode 100644
index 248cb6d..0000000
--- a/np_sdk/mozsrc/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=np_sdk
-TARGET=npsdk
-
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.IF "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
-.IF "$(L10N_framework)"==""
-JDKINCS=
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-MOZFILES = $(SLO)$/npwin.obj
-.ELSE
-MOZFILES = $(SLO)$/npunix.obj
-.ENDIF
-
-.IF "$(GUIBASE)" == "aqua"
-CDEFS+=-DNO_X11
-.ENDIF
-
-ALL: $(MOZFILES)
-
-# --- Targets ------------------------------------------------------
-.ENDIF 		# L10N_framework
-.ENDIF		# iOS or Android
-
-.INCLUDE :	target.mk
diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h
deleted file mode 100644
index c87d531..0000000
--- a/np_sdk/mozsrc/npapi.h
+++ /dev/null
@@ -1,587 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * 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.
- *
- * 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
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
- *  npapi.h $Revision: 1.2 $
- *  Netscape client plug-in API spec
- */
-
-#if !defined(_NPAPI_H_) && !defined(npapi_h_)
-#define _NPAPI_H_
-#define npapi_h_
-
-#include "jri.h"                /* Java Runtime Interface */
-
-#ifdef _WINDOWS
-#	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 */
-#endif /* __MWERKS__ */
-
-#ifdef XP_MAC
-    #include <Quickdraw.h>
-    #include <Events.h>
-#endif
-
-#if defined(XP_UNIX) && !defined(NO_X11)
-    #include <X11/Xlib.h>
-    #include <X11/Xutil.h>
-#endif
-
-/*----------------------------------------------------------------------*/
-/*                        Plugin Version Constants                      */
-/*----------------------------------------------------------------------*/
-
-#define NP_VERSION_MAJOR 0
-#define NP_VERSION_MINOR 13
-
-
-/* The OS/2 version of Netscape uses RC_DATA to define the
-   mime types, file extentions, etc that are required.
-   Use a vertical bar to seperate types, end types with \0.
-   FileVersion and ProductVersion are 32bit ints, all other
-   entries are strings the MUST be terminated wwith a \0.
-
-AN EXAMPLE:
-
-RCDATA NP_INFO_ProductVersion { 1,0,0,1,}
-
-RCDATA NP_INFO_MIMEType    { "video/x-video|",
-                             "video/x-flick\0" }
-RCDATA NP_INFO_FileExtents { "avi|",
-                             "flc\0" }
-RCDATA NP_INFO_FileOpenName{ "MMOS2 video player(*.avi)|",
-                             "MMOS2 Flc/Fli player(*.flc)\0" }
-
-RCDATA NP_INFO_FileVersion       { 1,0,0,1 }
-RCDATA NP_INFO_CompanyName       { "Netscape Communications\0" }
-RCDATA NP_INFO_FileDescription   { "NPAVI32 Extension DLL\0"
-RCDATA NP_INFO_InternalName      { "NPAVI32\0" )
-RCDATA NP_INFO_LegalCopyright    { "Copyright Netscape Communications \251 1996\0"
-RCDATA NP_INFO_OriginalFilename  { "NVAPI32.DLL" }
-RCDATA NP_INFO_ProductName       { "NPAVI32 Dynamic Link Library\0" }
-
-*/
-
-
-/* RC_DATA types for version info - required */
-#define NP_INFO_ProductVersion      1
-#define NP_INFO_MIMEType            2
-#define NP_INFO_FileOpenName        3
-#define NP_INFO_FileExtents         4
-
-/* RC_DATA types for version info - used if found */
-#define NP_INFO_FileDescription     5
-#define NP_INFO_ProductName         6
-
-/* RC_DATA types for version info - optional */
-#define NP_INFO_CompanyName         7
-#define NP_INFO_FileVersion         8
-#define NP_INFO_InternalName        9
-#define NP_INFO_LegalCopyright      10
-#define NP_INFO_OriginalFilename    11
-
-#ifndef RC_INVOKED
-
-
-
-/*----------------------------------------------------------------------*/
-/*                       Definition of Basic Types                      */
-/*----------------------------------------------------------------------*/
-
-#ifndef _UINT16
-typedef unsigned short uint16;
-#endif
-
-#ifndef _UINT32
-#    if defined(__alpha)
-typedef unsigned int uint32;
-#    else  /* __alpha */
-typedef unsigned long uint32;
-#    endif /* __alpha */
-#endif
-
-/*
- * AIX defines these in sys/inttypes.h included from sys/types.h
- */
-#ifndef AIX
-#ifndef _INT16
-typedef short int16;
-#endif
-
-#ifndef _INT32
-#    if defined(__alpha)
-typedef int int32;
-#    else  /* __alpha */
-typedef long int32;
-#    endif /* __alpha */
-#endif
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef NULL
-#define NULL (0L)
-#endif
-
-typedef unsigned char	NPBool;
-typedef int16			NPError;
-typedef int16			NPReason;
-typedef char*			NPMIMEType;
-
-
-
-/*----------------------------------------------------------------------*/
-/*                       Structures and definitions                     */
-/*----------------------------------------------------------------------*/
-
-#ifdef XP_MAC
-#pragma options align=mac68k
-#endif
-
-/*
- *  NPP is a plug-in's opaque instance handle
- */
-typedef struct _NPP
-{
-  void*	pdata;      /* plug-in private data */
-  void*	ndata;      /* netscape private data */
-} NPP_t;
-
-typedef NPP_t*  NPP;
-
-
-typedef struct _NPStream
-{
-  void*  pdata; /* plug-in private data */
-  void*  ndata; /* netscape private data */
-  const  char* url;
-  uint32 end;
-  uint32 lastmodified;
-  void*  notifyData;
-} NPStream;
-
-
-typedef struct _NPByteRange
-{
-  int32  offset; /* negative offset means from the end */
-  uint32 length;
-  struct _NPByteRange* next;
-} NPByteRange;
-
-
-typedef struct _NPSavedData
-{
-  int32	len;
-  void*	buf;
-} NPSavedData;
-
-
-typedef struct _NPRect
-{
-  uint16 top;
-  uint16 left;
-  uint16 bottom;
-  uint16 right;
-} NPRect;
-
-typedef struct _NPSize 
-{ 
-  int32 width; 
-  int32 height; 
-} NPSize; 
-
-#ifdef XP_UNIX
-/*
- * Unix specific structures and definitions
- */
-
-/*
- * Callback Structures.
- *
- * These are used to pass additional platform specific information.
- */
-enum {
-  NP_SETWINDOW = 1,
-  NP_PRINT
-};
-
-typedef struct
-{
-  int32 type;
-} NPAnyCallbackStruct;
-
-typedef struct
-{
-  int32        type;
-#ifndef NO_X11
-  Display*     display;
-  Visual*      visual;
-  Colormap     colormap;
-  unsigned int depth;
-#endif
-} NPSetWindowCallbackStruct;
-
-typedef struct
-{
-  int32 type;
-  FILE* fp;
-} NPPrintCallbackStruct;
-
-#endif /* XP_UNIX */
-
-/*
- * List of variable names for which NPP_GetValue shall be implemented
- */
-typedef enum {
-  NPPVpluginNameString = 1,
-  NPPVpluginDescriptionString,
-  NPPVpluginWindowBool,
-  NPPVpluginTransparentBool,
-  NPPVjavaClass,                /* Not implemented in Mozilla 1.0 */
-  NPPVpluginWindowSize,
-  NPPVpluginTimerInterval,
-
-  NPPVpluginScriptableInstance = 10,
-  NPPVpluginScriptableIID = 11,
-
-  /* 12 and over are available on Mozilla builds starting with 0.9.9 */
-  NPPVjavascriptPushCallerBool = 12,
-  NPPVpluginKeepLibraryInMemory = 13   /* available in Mozilla 1.0 */
-} NPPVariable;
-
-/*
- * List of variable names for which NPN_GetValue is implemented by Mozilla
- */
-typedef enum {
-  NPNVxDisplay = 1,
-  NPNVxtAppContext,
-  NPNVnetscapeWindow,
-  NPNVjavascriptEnabledBool,
-  NPNVasdEnabledBool,
-  NPNVisOfflineBool,
-
-  /* 10 and over are available on Mozilla builds starting with 0.9.4 */
-  NPNVserviceManager = 10
-} NPNVariable;
-
-/*
- * The type of a NPWindow - it specifies the type of the data structure
- * returned in the window field.
- */
-typedef enum {
-  NPWindowTypeWindow = 1,
-  NPWindowTypeDrawable
-} NPWindowType;
-
-typedef struct _NPWindow
-{
-  void* window;  /* Platform specific window handle */
-                 /* 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.					*/
-  uint32 width;  /* Maximum window size */
-  uint32 height;
-  NPRect clipRect; /* Clipping rectangle in port coordinates */
-                   /* Used by MAC only.			  */
-#ifdef XP_UNIX
-  void * ws_info; /* Platform-dependent additonal data */
-#endif /* XP_UNIX */
-  NPWindowType type; /* Is this a window or a drawable? */
-} 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 */
-  void* platformPrint; /* Platform-specific printing info */
-} NPFullPrint;
-
-typedef struct _NPEmbedPrint
-{
-  NPWindow window;
-  void* platformPrint; /* Platform-specific printing info */
-} NPEmbedPrint;
-
-typedef struct _NPPrint
-{
-  uint16 mode;               /* NP_FULL or NP_EMBED */
-  union
-  {
-    NPFullPrint fullPrint;   /* if mode is NP_FULL */
-    NPEmbedPrint embedPrint; /* if mode is NP_EMBED */
-  } print;
-} NPPrint;
-
-#ifdef XP_MAC
-typedef EventRecord	NPEvent;
-#elif defined(XP_WIN)
-typedef struct _NPEvent
-{
-  uint16 event;
-  uint32 wParam;
-  uint32 lParam;
-} NPEvent;
-#elif defined (XP_UNIX) && !defined(NO_X11)
-typedef XEvent NPEvent;
-#else
-typedef void*			NPEvent;
-#endif /* XP_MAC */
-
-#ifdef XP_MAC
-typedef RgnHandle NPRegion;
-#elif defined(XP_WIN)
-typedef HRGN NPRegion;
-#elif defined(XP_UNIX) && !defined(NO_X11)
-typedef Region NPRegion;
-#else
-typedef void *NPRegion;
-#endif /* XP_MAC */
-
-#ifdef XP_MAC
-/*
- *  Mac-specific structures and definitions.
- */
-
-typedef struct NP_Port
-{
-  CGrafPtr port; /* Grafport */
-  int32 portx;   /* position inside the topmost window */
-  int32 porty;
-} NP_Port;
-
-/*
- *  Non-standard event types that can be passed to HandleEvent
- */
-
-enum NPEventType {
-  NPEventType_GetFocusEvent = (osEvt + 16),
-  NPEventType_LoseFocusEvent,
-  NPEventType_AdjustCursorEvent,
-  NPEventType_MenuCommandEvent,
-  NPEventType_ClippingChangedEvent,
-  NPEventType_ScrollingBeginsEvent = 1000,
-  NPEventType_ScrollingEndsEvent
-};
-
-#ifdef OBSOLETE
-#define getFocusEvent     (osEvt + 16)
-#define loseFocusEvent    (osEvt + 17)
-#define adjustCursorEvent (osEvt + 18)
-#endif
-#endif /* XP_MAC */
-
-/*
- * Values for mode passed to NPP_New:
- */
-#define NP_EMBED 1
-#define NP_FULL  2
-
-/*
- * Values for stream type passed to NPP_NewStream:
- */
-#define NP_NORMAL     1
-#define NP_SEEK       2
-#define NP_ASFILE     3
-#define NP_ASFILEONLY 4
-
-#define NP_MAXREADY	(((unsigned)(~0)<<1)>>1)
-
-#ifdef XP_MAC
-#pragma options align=reset
-#endif
-
-
-/*----------------------------------------------------------------------*/
-/*		     Error and Reason Code definitions			*/
-/*----------------------------------------------------------------------*/
-
-/*
- * Values of type NPError:
- */
-#define NPERR_BASE                         0
-#define NPERR_NO_ERROR                    (NPERR_BASE + 0)
-#define NPERR_GENERIC_ERROR               (NPERR_BASE + 1)
-#define NPERR_INVALID_INSTANCE_ERROR      (NPERR_BASE + 2)
-#define NPERR_INVALID_FUNCTABLE_ERROR     (NPERR_BASE + 3)
-#define NPERR_MODULE_LOAD_FAILED_ERROR    (NPERR_BASE + 4)
-#define NPERR_OUT_OF_MEMORY_ERROR         (NPERR_BASE + 5)
-#define NPERR_INVALID_PLUGIN_ERROR        (NPERR_BASE + 6)
-#define NPERR_INVALID_PLUGIN_DIR_ERROR    (NPERR_BASE + 7)
-#define NPERR_INCOMPATIBLE_VERSION_ERROR  (NPERR_BASE + 8)
-#define NPERR_INVALID_PARAM               (NPERR_BASE + 9)
-#define NPERR_INVALID_URL                 (NPERR_BASE + 10)
-#define NPERR_FILE_NOT_FOUND              (NPERR_BASE + 11)
-#define NPERR_NO_DATA                     (NPERR_BASE + 12)
-#define NPERR_STREAM_NOT_SEEKABLE         (NPERR_BASE + 13)
-
-/*
- * Values of type NPReason:
- */
-#define NPRES_BASE          0
-#define NPRES_DONE         (NPRES_BASE + 0)
-#define NPRES_NETWORK_ERR  (NPRES_BASE + 1)
-#define NPRES_USER_BREAK   (NPRES_BASE + 2)
-
-/*
- * Don't use these obsolete error codes any more.
- */
-#define NP_NOERR  NP_NOERR_is_obsolete_use_NPERR_NO_ERROR
-#define NP_EINVAL NP_EINVAL_is_obsolete_use_NPERR_GENERIC_ERROR
-#define NP_EABORT NP_EABORT_is_obsolete_use_NPRES_USER_BREAK
-
-/*
- * Version feature information
- */
-#define NPVERS_HAS_STREAMOUTPUT      8
-#define NPVERS_HAS_NOTIFICATION      9
-#define NPVERS_HAS_LIVECONNECT       9
-#define NPVERS_WIN16_HAS_LIVECONNECT 9
-#define NPVERS_68K_HAS_LIVECONNECT   11
-#define NPVERS_HAS_WINDOWLESS        11
-#define NPVERS_HAS_XPCONNECT_SCRIPTING 13
-
-/*----------------------------------------------------------------------*/
-/*                        Function Prototypes                           */
-/*----------------------------------------------------------------------*/
-
-#if defined(_WINDOWS) && !defined(WIN32)
-#define NP_LOADDS  _loadds
-#else
-#define NP_LOADDS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * NPP_* functions are provided by the plugin and called by the navigator.
- */
-
-char* NPP_GetMIMEDescription(void);
-
-NPError NP_LOADDS NPP_Initialize(void);
-void    NP_LOADDS NPP_Shutdown(void);
-NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
-                          uint16 mode, int16 argc, char* argn[],
-                          char* argv[], NPSavedData* saved);
-NPError NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save);
-NPError NP_LOADDS NPP_SetWindow(NPP instance, NPWindow* window);
-NPError NP_LOADDS NPP_NewStream(NPP instance, NPMIMEType type,
-                                NPStream* stream, NPBool seekable,
-                                uint16* stype);
-NPError NP_LOADDS NPP_DestroyStream(NPP instance, NPStream* stream,
-                                    NPReason reason);
-int32   NP_LOADDS NPP_WriteReady(NPP instance, NPStream* stream);
-int32   NP_LOADDS NPP_Write(NPP instance, NPStream* stream, int32 offset,
-                            int32 len, void* buffer);
-void    NP_LOADDS NPP_StreamAsFile(NPP instance, NPStream* stream,
-                                   const char* fname);
-void    NP_LOADDS NPP_Print(NPP instance, NPPrint* platformPrint);
-int16   NP_LOADDS NPP_HandleEvent(NPP instance, void* event);
-void    NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
-                                NPReason reason, void* notifyData);
-jref    NP_LOADDS NPP_GetJavaClass(void);
-NPError NP_LOADDS NPP_GetValue(NPP instance, NPPVariable variable, void *value);
-NPError NP_LOADDS NPP_SetValue(NPP instance, NPNVariable variable, void *value);
-
-/*
- * NPN_* functions are provided by the navigator and called by the plugin.
- */
-void    NP_LOADDS NPN_Version(int* plugin_major, int* plugin_minor,
-                              int* netscape_major, int* netscape_minor);
-NPError NP_LOADDS NPN_GetURLNotify(NPP instance, const char* url,
-                                   const char* target, void* notifyData);
-NPError NP_LOADDS NPN_GetURL(NPP instance, const char* url,
-                             const char* target);
-NPError NP_LOADDS NPN_PostURLNotify(NPP instance, const char* url,
-                                    const char* target, uint32 len,
-                                    const char* buf, NPBool file,
-                                    void* notifyData);
-NPError NP_LOADDS NPN_PostURL(NPP instance, const char* url,
-                              const char* target, uint32 len,
-                              const char* buf, NPBool file);
-NPError NP_LOADDS NPN_RequestRead(NPStream* stream, NPByteRange* rangeList);
-NPError NP_LOADDS NPN_NewStream(NPP instance, NPMIMEType type,
-                                const char* target, NPStream** stream);
-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);
-void*   NP_LOADDS NPN_MemAlloc(uint32 size);
-void    NP_LOADDS NPN_MemFree(void* ptr);
-uint32  NP_LOADDS NPN_MemFlush(uint32 size);
-void    NP_LOADDS NPN_ReloadPlugins(NPBool reloadPages);
-JRIEnv* NP_LOADDS NPN_GetJavaEnv(void);
-jref    NP_LOADDS NPN_GetJavaPeer(NPP instance);
-NPError NP_LOADDS NPN_GetValue(NPP instance, NPNVariable variable, void *value);
-NPError NP_LOADDS NPN_SetValue(NPP instance, NPPVariable variable, void *value);
-void    NP_LOADDS NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
-void    NP_LOADDS NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion);
-void    NP_LOADDS NPN_ForceRedraw(NPP instance);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* RC_INVOKED */
-
-#endif /* _NPAPI_H_ */
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
deleted file mode 100644
index cb92d85..0000000
--- a/np_sdk/mozsrc/npunix.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * 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.
- *
- * Contributor(s):
- *   Stephen Mak <smak@sun.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * npunix.c
- *
- * Netscape Client Plugin API
- * - Wrapper function to interface with the Netscape Navigator
- *
- * dp Suresh <dp@netscape.com>
- *
- *----------------------------------------------------------------------
- * PLUGIN DEVELOPERS:
- *  YOU WILL NOT NEED TO EDIT THIS FILE.
- *----------------------------------------------------------------------
- */
-
-#define XP_UNIX 1
-
-#include <stdio.h>
-#include "npapi.h"
-#include "npupp.h"
-
-/*
- * Define PLUGIN_TRACE to have the wrapper functions print
- * messages to stderr whenever they are called.
- */
-
-#ifdef PLUGIN_TRACE
-#include <stdio.h>
-#define PLUGINDEBUGSTR(msg) fprintf(stderr, "%s\n", msg)
-#else
-#define PLUGINDEBUGSTR(msg)
-#endif
-
-
-/***********************************************************************
- *
- * Globals
- *
- ***********************************************************************/
-
-static NPNetscapeFuncs   gNetscapeFuncs;    /* Netscape Function table */
-
-
-/***********************************************************************
- *
- * Wrapper functions : plugin calling Netscape Navigator
- *
- * These functions let the plugin developer just call the APIs
- * as documented and defined in npapi.h, without needing to know
- * about the function table and call macros in npupp.h.
- *
- ***********************************************************************/
-
-void
-NPN_Version(int* plugin_major, int* plugin_minor,
-         int* netscape_major, int* netscape_minor)
-{
-    *plugin_major = NP_VERSION_MAJOR;
-    *plugin_minor = NP_VERSION_MINOR;
-
-    /* Major version is in high byte */
-    *netscape_major = gNetscapeFuncs.version >> 8;
-    /* Minor version is in low byte */
-    *netscape_minor = gNetscapeFuncs.version & 0xFF;
-}
-
-NPError
-NPN_GetValue(NPP instance, NPNVariable variable, void *r_value)
-{
-    return CallNPN_GetValueProc(gNetscapeFuncs.getvalue,
-                    instance, variable, r_value);
-}
-
-NPError
-NPN_SetValue(NPP instance, NPPVariable variable, void *value)
-{
-    return CallNPN_SetValueProc(gNetscapeFuncs.setvalue,
-                    instance, variable, value);
-}
-
-NPError
-NPN_GetURL(NPP instance, const char* url, const char* window)
-{
-    return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
-}
-
-NPError
-NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notifyData)
-{
-    return CallNPN_GetURLNotifyProc(gNetscapeFuncs.geturlnotify, instance, url, window, notifyData);
-}
-
-NPError
-NPN_PostURL(NPP instance, const char* url, const char* window,
-         uint32 len, const char* buf, NPBool file)
-{
-    return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
-                    url, window, len, buf, file);
-}
-
-NPError
-NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len,
-                  const char* buf, NPBool file, void* notifyData)
-{
-    return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
-            instance, url, window, len, buf, file, notifyData);
-}
-
-NPError
-NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
-{
-    return CallNPN_RequestReadProc(gNetscapeFuncs.requestread,
-                    stream, rangeList);
-}
-
-NPError
-NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
-          NPStream** stream_ptr)
-{
-    return CallNPN_NewStreamProc(gNetscapeFuncs.newstream, instance,
-                    type, window, stream_ptr);
-}
-
-int32
-NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
-{
-    return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
-                    stream, len, buffer);
-}
-
-NPError
-NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
-{
-    return CallNPN_DestroyStreamProc(gNetscapeFuncs.destroystream,
-                        instance, stream, reason);
-}
-
-void
-NPN_Status(NPP instance, const char* message)
-{
-    CallNPN_StatusProc(gNetscapeFuncs.status, instance, message);
-}
-
-const char*
-NPN_UserAgent(NPP instance)
-{
-    return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
-}
-
-void*
-NPN_MemAlloc(uint32 size)
-{
-    return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
-}
-
-void NPN_MemFree(void* ptr)
-{
-    CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
-}
-
-uint32 NPN_MemFlush(uint32 size)
-{
-    return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
-}
-
-void NPN_ReloadPlugins(NPBool reloadPages)
-{
-    CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
-}
-
-#ifdef OJI
-JRIEnv* NPN_GetJavaEnv()
-{
-    return CallNPN_GetJavaEnvProc(gNetscapeFuncs.getJavaEnv);
-}
-
-jref NPN_GetJavaPeer(NPP instance)
-{
-    return CallNPN_GetJavaPeerProc(gNetscapeFuncs.getJavaPeer,
-                       instance);
-}
-#endif
-
-void
-NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
-{
-    CallNPN_InvalidateRectProc(gNetscapeFuncs.invalidaterect, instance,
-        invalidRect);
-}
-
-void
-NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
-{
-    CallNPN_InvalidateRegionProc(gNetscapeFuncs.invalidateregion, instance,
-        invalidRegion);
-}
-
-void
-NPN_ForceRedraw(NPP instance)
-{
-    CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, 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 
- * install those functions in the function table or worry about
- * setting up globals for 68K plugins.
- *
- ***********************************************************************/
-
-NPError
-Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
-        int16 argc, char* argn[], char* argv[], NPSavedData* saved)
-{
-    NPError ret;
-    PLUGINDEBUGSTR("New");
-    ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
-    return ret; 
-}
-
-NPError
-Private_Destroy(NPP instance, NPSavedData** save)
-{
-    PLUGINDEBUGSTR("Destroy");
-    return NPP_Destroy(instance, save);
-}
-
-NPError
-Private_SetWindow(NPP instance, NPWindow* window)
-{
-    NPError err;
-    PLUGINDEBUGSTR("SetWindow");
-    err = NPP_SetWindow(instance, window);
-    return err;
-}
-
-NPError
-Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
-            NPBool seekable, uint16* stype)
-{
-    NPError err;
-    PLUGINDEBUGSTR("NewStream");
-    err = NPP_NewStream(instance, type, stream, seekable, stype);
-    return err;
-}
-
-int32
-Private_WriteReady(NPP instance, NPStream* stream)
-{
-    unsigned int result;
-    PLUGINDEBUGSTR("WriteReady");
-    result = NPP_WriteReady(instance, stream);
-    return result;
-}
-
-int32
-Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
-        void* buffer)
-{
-    unsigned int result;
-    PLUGINDEBUGSTR("Write");
-    result = NPP_Write(instance, stream, offset, len, buffer);
-    return result;
-}
-
-void
-Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname)
-{
-    PLUGINDEBUGSTR("StreamAsFile");
-    NPP_StreamAsFile(instance, stream, fname);
-}
-
-
-NPError
-Private_DestroyStream(NPP instance, NPStream* stream, NPError reason)
-{
-    NPError err;
-    PLUGINDEBUGSTR("DestroyStream");
-    err = NPP_DestroyStream(instance, stream, reason);
-    return err;
-}
-
-void
-Private_URLNotify(NPP instance, const char* url,
-                NPReason reason, void* notifyData)
-                
-{
-    PLUGINDEBUGSTR("URLNotify");
-    NPP_URLNotify(instance, url, reason, notifyData);
-}
-
-
-
-void
-Private_Print(NPP instance, NPPrint* platformPrint)
-{
-    PLUGINDEBUGSTR("Print");
-    NPP_Print(instance, platformPrint);
-}
-
-#ifdef OJI
-JRIGlobalRef
-Private_GetJavaClass(void)
-{
-    jref clazz = NPP_GetJavaClass();
-    if (clazz) {
-    JRIEnv* env = NPN_GetJavaEnv();
-    return JRI_NewGlobalRef(env, clazz);
-    }
-    return NULL;
-}
-#endif
-
-/*********************************************************************** 
- *
- * These functions are located automagically by netscape.
- *
- ***********************************************************************/
-
-/*
- * NP_GetMIMEDescription
- *  - Netscape needs to know about this symbol
- *  - Netscape uses the return value to identify when an object instance
- *    of this plugin should be created.
- */
-char *
-NP_GetMIMEDescription(void)
-{
-    return NPP_GetMIMEDescription();
-}
-
-/*
- * NP_GetValue [optional]
- *  - Netscape needs to know about this symbol.
- *  - Interfaces with plugin to get values for predefined variables
- *    that the navigator needs.
- */
-NPError
-NP_GetValue(void* future, NPPVariable variable, void *value)
-{
-    return NPP_GetValue(future, variable, value);
-}
-
-/*
- * NP_Initialize
- *  - Netscape needs to know about this symbol.
- *  - It calls this function after looking up its symbol before it
- *    is about to create the first ever object of this kind.
- *
- * PARAMETERS
- *    nsTable   - The netscape function table. If developers just use these
- *        wrappers, they dont need to worry about all these function
- *        tables.
- * RETURN
- *    pluginFuncs
- *      - This functions needs to fill the plugin function table
- *        pluginFuncs and return it. Netscape Navigator plugin
- *        library will use this function table to call the plugin.
- *
- */
-NPError
-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.
-     * Also check that the function tables passed in are big enough for
-     * all the functions we need (they could be bigger, if Netscape added
-     * new APIs, but that's OK with us -- we'll just ignore them).
-     *
-     */
-
-    if (err == NPERR_NO_ERROR) {
-        if ((nsTable->version >> 8) > NP_VERSION_MAJOR)
-            err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-        if (nsTable->size < sizeof(NPNetscapeFuncs))
-            err = NPERR_INVALID_FUNCTABLE_ERROR;
-        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
-         * copy so we can call back into Netscape later.  Note that
-         * we need to copy the fields one by one, rather than assigning
-         * the whole structure, because the Netscape function table
-         * could actually be bigger than what we expect.
-         */
-        gNetscapeFuncs.version       = nsTable->version;
-        gNetscapeFuncs.size          = nsTable->size;
-        gNetscapeFuncs.posturl       = nsTable->posturl;
-        gNetscapeFuncs.geturl        = nsTable->geturl;
-        gNetscapeFuncs.geturlnotify  = nsTable->geturlnotify;
-        gNetscapeFuncs.requestread   = nsTable->requestread;
-        gNetscapeFuncs.newstream     = nsTable->newstream;
-        gNetscapeFuncs.write         = nsTable->write;
-        gNetscapeFuncs.destroystream = nsTable->destroystream;
-        gNetscapeFuncs.status        = nsTable->status;
-        gNetscapeFuncs.uagent        = nsTable->uagent;
-        gNetscapeFuncs.memalloc      = nsTable->memalloc;
-        gNetscapeFuncs.memfree       = nsTable->memfree;
-        gNetscapeFuncs.memflush      = nsTable->memflush;
-        gNetscapeFuncs.reloadplugins = nsTable->reloadplugins;
-#ifdef OJI
-        gNetscapeFuncs.getJavaEnv    = nsTable->getJavaEnv;
-        gNetscapeFuncs.getJavaPeer   = nsTable->getJavaPeer;
-#endif
-        gNetscapeFuncs.getvalue      = nsTable->getvalue;
-
-        /*
-         * Set up the plugin function table that Netscape will use to
-         * call us.  Netscape needs to know about our version and size
-         * and have a UniversalProcPointer for every function we
-         * implement.
-         */
-        pluginFuncs->version    = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-        pluginFuncs->size       = sizeof(NPPluginFuncs);
-        pluginFuncs->newp       = NewNPP_NewProc(Private_New);
-        pluginFuncs->destroy    = NewNPP_DestroyProc(Private_Destroy);
-        pluginFuncs->setwindow  = NewNPP_SetWindowProc(Private_SetWindow);
-        pluginFuncs->newstream  = NewNPP_NewStreamProc(Private_NewStream);
-        pluginFuncs->destroystream = NewNPP_DestroyStreamProc(Private_DestroyStream);
-        pluginFuncs->asfile     = NewNPP_StreamAsFileProc(Private_StreamAsFile);
-        pluginFuncs->writeready = NewNPP_WriteReadyProc(Private_WriteReady);
-        pluginFuncs->write      = NewNPP_WriteProc(Private_Write);
-        pluginFuncs->print      = NewNPP_PrintProc(Private_Print);
-        pluginFuncs->urlnotify  = NewNPP_URLNotifyProc(Private_URLNotify);
-        pluginFuncs->event      = NULL;
-#ifdef OJI
-        pluginFuncs->javaClass  = Private_GetJavaClass();
-#endif
-
-        err = NPP_Initialize();
-    }
-    
-    return err;
-}
-
-/*
- * NP_Shutdown [optional]
- *  - Netscape needs to know about this symbol.
- *  - It calls this function after looking up its symbol after
- *    the last object of this kind has been destroyed.
- *
- */
-NPError
-NP_Shutdown(void)
-{
-    PLUGINDEBUGSTR("NP_Shutdown");
-    NPP_Shutdown();
-    return NPERR_NO_ERROR;
-}
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/mozsrc/npupp.h
deleted file mode 100644
index b2f9576..0000000
--- a/np_sdk/mozsrc/npupp.h
+++ /dev/null
@@ -1,1265 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * 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.
- *
- * 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
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-/*
- *  npupp.h $Revision: 1.2 $
- *  function call mecahnics needed by platform specific glue code.
- */
-
-
-#ifndef _NPUPP_H_
-#define _NPUPP_H_
-
-#ifndef GENERATINGCFM
-#define GENERATINGCFM 0
-#endif
-
-#ifndef _NPAPI_H_
-#include "npapi.h"
-#endif
-
-#include "jri.h"
-
-/******************************************************************************************
-   plug-in function table macros
-             for each function in and out of the plugin API we define
-                    typedef NPP_FooUPP
-                    #define NewNPP_FooProc
-                    #define CallNPP_FooProc
-            for mac, define the UPP magic for PPC/68K calling
- *******************************************************************************************/
-
-
-/* NPP_Initialize */
-
-#define _NPUPP_USE_UPP_ (TARGET_RT_MAC_CFM && !TARGET_API_MAC_CARBON)
-
-#if _NPUPP_USE_UPP_
-typedef UniversalProcPtr NPP_InitializeUPP;
-
-enum {
-    uppNPP_InitializeProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))		
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPP_InitializeProc(FUNC)		\
-        (NPP_InitializeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_InitializeProcInfo, GetCurrentArchitecture())
-#define CallNPP_InitializeProc(FUNC)		\
-        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_InitializeProcInfo)
-        
-#else
-
-typedef void (* NP_LOADDS NPP_InitializeUPP)(void);
-#define NewNPP_InitializeProc(FUNC)		\
-        ((NPP_InitializeUPP) (FUNC))
-#define CallNPP_InitializeProc(FUNC)		\
-        (*(FUNC))()
-
-#endif
-
-
-/* NPP_Shutdown */
-
-#if _NPUPP_USE_UPP_
-typedef UniversalProcPtr NPP_ShutdownUPP;
-
-enum {
-    uppNPP_ShutdownProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(0))		
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPP_ShutdownProc(FUNC)		\
-        (NPP_ShutdownUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_ShutdownProcInfo, GetCurrentArchitecture())
-#define CallNPP_ShutdownProc(FUNC)		\
-        (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPP_ShutdownProcInfo)
-        
-#else
-
-typedef void (* NP_LOADDS NPP_ShutdownUPP)(void);
-#define NewNPP_ShutdownProc(FUNC)		\
-        ((NPP_ShutdownUPP) (FUNC))
-#define CallNPP_ShutdownProc(FUNC)		\
-        (*(FUNC))()
-
-#endif
-
-
-/* NPP_New */
-
-#if _NPUPP_USE_UPP_
-typedef UniversalProcPtr NPP_NewUPP;
-
-enum {
-    uppNPP_NewProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPMIMEType)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(uint16)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int16)))
-        | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(char **)))
-        | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(char **)))
-        | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(NPSavedData *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-
-#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)		\
-        ((NPP_NewUPP) (FUNC))
-#define CallNPP_NewProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-
-#endif
-
-
-/* NPP_Destroy */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_DestroyUPP;
-enum {
-    uppNPP_DestroyProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPSavedData **)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_DestroyProc(FUNC)		\
-        (NPP_DestroyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_DestroyUPP) (FUNC))
-#define CallNPP_DestroyProc(FUNC, ARG1, ARG2)		\
-        (*(FUNC))((ARG1), (ARG2))
-
-#endif
-
-
-/* NPP_SetWindow */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_SetWindowUPP;
-enum {
-    uppNPP_SetWindowProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPWindow *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_SetWindowProc(FUNC)		\
-        (NPP_SetWindowUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_SetWindowProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_SetWindowUPP) (FUNC))
-#define CallNPP_SetWindowProc(FUNC, ARG1, ARG2)		\
-        (*(FUNC))((ARG1), (ARG2))
-
-#endif
-
-
-/* NPP_NewStream */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_NewStreamUPP;
-enum {
-    uppNPP_NewStreamProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPMIMEType)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPBool)))
-        | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(uint16 *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_NewStreamProc(FUNC)		\
-        (NPP_NewStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_NewStreamProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_NewStreamUPP) (FUNC))
-#define CallNPP_NewStreamProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5) \
-        (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5))
-#endif
-
-
-/* NPP_DestroyStream */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_DestroyStreamUPP;
-enum {
-    uppNPP_DestroyStreamProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_DestroyStreamProc(FUNC)		\
-        (NPP_DestroyStreamUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_DestroyStreamProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_DestroyStreamUPP) (FUNC))
-#define CallNPP_DestroyStreamProc(FUNC,  NPParg, NPStreamPtr, NPReasonArg)		\
-        (*(FUNC))((NPParg), (NPStreamPtr), (NPReasonArg))
-
-#endif
-
-
-/* NPP_WriteReady */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_WriteReadyUPP;
-enum {
-    uppNPP_WriteReadyProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
-};
-#define NewNPP_WriteReadyProc(FUNC)		\
-        (NPP_WriteReadyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteReadyProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_WriteReadyUPP) (FUNC))
-#define CallNPP_WriteReadyProc(FUNC,  NPParg, NPStreamPtr)		\
-        (*(FUNC))((NPParg), (NPStreamPtr))
-
-#endif
-
-
-/* NPP_Write */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_WriteUPP;
-enum {
-    uppNPP_WriteProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(int32)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int32)))
-        | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(void*)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
-};
-#define NewNPP_WriteProc(FUNC)		\
-        (NPP_WriteUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_WriteProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_WriteUPP) (FUNC))
-#define CallNPP_WriteProc(FUNC,  NPParg, NPStreamPtr, offsetArg, lenArg, bufferPtr)		\
-        (*(FUNC))((NPParg), (NPStreamPtr), (offsetArg), (lenArg), (bufferPtr))
-
-#endif
-
-
-/* NPP_StreamAsFile */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_StreamAsFileUPP;
-enum {
-    uppNPP_StreamAsFileProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char *)))
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-#define NewNPP_StreamAsFileProc(FUNC)		\
-        (NPP_StreamAsFileUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_StreamAsFileProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_StreamAsFileUPP) (FUNC))
-#define CallNPP_StreamAsFileProc(FUNC,  ARG1, ARG2, ARG3)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPP_Print */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_PrintUPP;
-enum {
-    uppNPP_PrintProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPrint *)))
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-#define NewNPP_PrintProc(FUNC)		\
-        (NPP_PrintUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_PrintProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_PrintUPP) (FUNC))
-#define CallNPP_PrintProc(FUNC,  NPParg, NPPrintArg)		\
-        (*(FUNC))((NPParg), (NPPrintArg))
-
-#endif
-
-
-/* NPP_HandleEvent */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_HandleEventUPP;
-enum {
-    uppNPP_HandleEventProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(void *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(int16)))
-};
-#define NewNPP_HandleEventProc(FUNC)		\
-        (NPP_HandleEventUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_HandleEventProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_HandleEventUPP) (FUNC))
-#define CallNPP_HandleEventProc(FUNC,  NPParg, voidPtr)		\
-        (*(FUNC))((NPParg), (voidPtr))
-
-#endif
-
-
-/* NPP_URLNotify */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_URLNotifyUPP;
-enum {
-    uppNPP_URLNotifyProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
-        | RESULT_SIZE(SIZE_CODE(SIZE_CODE(0)))
-};
-#define NewNPP_URLNotifyProc(FUNC)		\
-        (NPP_URLNotifyUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_URLNotifyProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_URLNotifyUPP) (FUNC))
-#define CallNPP_URLNotifyProc(FUNC,  ARG1, ARG2, ARG3, ARG4)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
-
-#endif
-
-
-/* NPP_GetValue */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_GetValueUPP;
-enum {
-    uppNPP_GetValueProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPVariable)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPP_GetValueUPP) (FUNC))
-#define CallNPP_GetValueProc(FUNC, ARG1, ARG2, ARG3)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPP_SetValue */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_SetValueUPP;
-enum {
-    uppNPP_SetValueProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPNVariable)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPP_SetValueUPP) (FUNC))
-#define CallNPP_SetValueProc(FUNC, ARG1, ARG2, ARG3)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-
-
-/*
- *  Netscape entry points
- */
-
-
-/* NPN_GetValue */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_GetValueUPP;
-enum {
-    uppNPN_GetValueProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPNVariable)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPN_GetValueUPP) (FUNC))
-#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPN_SetValue */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_SetValueUPP;
-enum {
-    uppNPN_SetValueProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPVariable)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(void *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPN_SetValueUPP) (FUNC))
-#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPN_GetUrlNotify */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_GetURLNotifyUPP;
-enum {
-    uppNPN_GetURLNotifyProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPN_GetURLNotifyUPP) (FUNC))
-#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
-#endif
-
-
-/* NPN_PostUrlNotify */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_PostURLNotifyUPP;
-enum {
-    uppNPN_PostURLNotifyProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(uint32)))
-        | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(NPBool)))
-        | STACK_ROUTINE_PARAMETER(7, SIZE_CODE(sizeof(void*)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPN_PostURLNotifyUPP) (FUNC))
-#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
-        (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-#endif
-
-
-/* NPN_GetUrl */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_GetURLUPP;
-enum {
-    uppNPN_GetURLProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPN_GetURLUPP) (FUNC))
-#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3)		\
-        (*(FUNC))((ARG1), (ARG2), (ARG3))
-#endif
-
-
-/* NPN_PostUrl */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_PostURLUPP;
-enum {
-    uppNPN_PostURLProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(uint32)))
-        | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(const char*)))
-        | STACK_ROUTINE_PARAMETER(6, SIZE_CODE(sizeof(NPBool)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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)		\
-        ((NPN_PostURLUPP) (FUNC))
-#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
-        (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
-#endif
-
-
-/* NPN_RequestRead */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_RequestReadUPP;
-enum {
-    uppNPN_RequestReadProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPByteRange *)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPN_RequestReadProc(FUNC)		\
-        (NPN_RequestReadUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_RequestReadProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_RequestReadUPP) (FUNC))
-#define CallNPN_RequestReadProc(FUNC, stream, range)		\
-        (*(FUNC))((stream), (range))
-
-#endif
-
-
-/* NPN_NewStream */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_NewStreamUPP;
-enum {
-    uppNPN_NewStreamProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPMIMEType)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(const char *)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(NPStream **)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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))	
-
-#else
-
-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)		\
-        (*(FUNC))((npp), (type), (window), (stream))
-
-#endif
-
-
-/* NPN_Write */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_WriteUPP;
-enum {
-    uppNPN_WriteProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(int32)))
-        | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(void*)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(int32)))
-};
-#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))	
-
-#else
-
-typedef int32 (* NP_LOADDS NPN_WriteUPP)(NPP instance, NPStream* stream, int32 len, void* buffer);
-#define NewNPN_WriteProc(FUNC)		\
-        ((NPN_WriteUPP) (FUNC))
-#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer)		\
-        (*(FUNC))((npp), (stream), (len), (buffer))
-
-#endif
-
-
-/* NPN_DestroyStream */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_DestroyStreamUPP;
-enum {
-    uppNPN_DestroyStreamProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP )))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPStream *)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPReason)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#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))	
-
-#else
-
-typedef NPError (* NP_LOADDS NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-#define NewNPN_DestroyStreamProc(FUNC)		\
-        ((NPN_DestroyStreamUPP) (FUNC))
-#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason)		\
-        (*(FUNC))((npp), (stream), (reason))
-
-#endif
-
-
-/* NPN_Status */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_StatusUPP;
-enum {
-    uppNPN_StatusProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
-};
-
-#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))	
-
-#else
-
-typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message);
-#define NewNPN_StatusProc(FUNC)		\
-        ((NPN_StatusUPP) (FUNC))
-#define CallNPN_StatusProc(FUNC, npp, msg)		\
-        (*(FUNC))((npp), (msg))	
-
-#endif
-
-
-/* NPN_UserAgent */
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_UserAgentUPP;
-enum {
-        uppNPN_UserAgentProcInfo = kThinkCStackBased
-                | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-                | RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
-};
-
-#define NewNPN_UserAgentProc(FUNC)              \
-                (NPN_UserAgentUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_UserAgentProcInfo, GetCurrentArchitecture())
-#define CallNPN_UserAgentProc(FUNC, ARG1)               \
-                (const char*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_UserAgentProcInfo, (ARG1))
-
-#else
-
-typedef const char*	(* NP_LOADDS NPN_UserAgentUPP)(NPP instance);
-#define NewNPN_UserAgentProc(FUNC)              \
-                ((NPN_UserAgentUPP) (FUNC))
-#define CallNPN_UserAgentProc(FUNC, ARG1)               \
-                (*(FUNC))((ARG1))
-
-#endif
-
-
-/* NPN_MemAlloc */
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_MemAllocUPP;
-enum {
-    uppNPN_MemAllocProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(uint32)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(void *)))
-};
-
-#define NewNPN_MemAllocProc(FUNC)		\
-        (NPN_MemAllocUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemAllocProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_MemAllocUPP) (FUNC))
-#define CallNPN_MemAllocProc(FUNC, ARG1)		\
-        (*(FUNC))((ARG1))	
-
-#endif
-
-
-/* NPN__MemFree */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_MemFreeUPP;
-enum {
-    uppNPN_MemFreeProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(void *)))
-};
-
-#define NewNPN_MemFreeProc(FUNC)		\
-        (NPN_MemFreeUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFreeProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_MemFreeUPP) (FUNC))
-#define CallNPN_MemFreeProc(FUNC, ARG1)		\
-        (*(FUNC))((ARG1))	
-
-#endif
-
-
-/* NPN_MemFlush */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_MemFlushUPP;
-enum {
-    uppNPN_MemFlushProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(uint32)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(uint32)))
-};
-
-#define NewNPN_MemFlushProc(FUNC)		\
-        (NPN_MemFlushUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_MemFlushProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_MemFlushUPP) (FUNC))
-#define CallNPN_MemFlushProc(FUNC, ARG1)		\
-        (*(FUNC))((ARG1))	
-
-#endif
-
-
-
-/* NPN_ReloadPlugins */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_ReloadPluginsUPP;
-enum {
-    uppNPN_ReloadPluginsProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPBool)))
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#define NewNPN_ReloadPluginsProc(FUNC)		\
-        (NPN_ReloadPluginsUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ReloadPluginsProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_ReloadPluginsUPP) (FUNC))
-#define CallNPN_ReloadPluginsProc(FUNC, ARG1)		\
-        (*(FUNC))((ARG1))	
-
-#endif
-
-
-/* NPN_GetJavaEnv */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_GetJavaEnvUPP;
-enum {
-    uppNPN_GetJavaEnvProcInfo = kThinkCStackBased
-        | RESULT_SIZE(SIZE_CODE(sizeof(JRIEnv*)))
-};
-
-#define NewNPN_GetJavaEnvProc(FUNC)		\
-        (NPN_GetJavaEnvUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo, GetCurrentArchitecture())
-#define CallNPN_GetJavaEnvProc(FUNC)		\
-        (JRIEnv*)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_GetJavaEnvProcInfo)	
-
-#else
-typedef JRIEnv* (* NP_LOADDS NPN_GetJavaEnvUPP)(void);
-#define NewNPN_GetJavaEnvProc(FUNC)		\
-        ((NPN_GetJavaEnvUPP) (FUNC))
-#define CallNPN_GetJavaEnvProc(FUNC)		\
-        (*(FUNC))()	
-
-#endif
-
-
-/* NPN_GetJavaPeer */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_GetJavaPeerUPP;
-enum {
-    uppNPN_GetJavaPeerProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(jref)))
-};
-
-#define NewNPN_GetJavaPeerProc(FUNC)		\
-        (NPN_GetJavaPeerUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_GetJavaPeerProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_GetJavaPeerUPP) (FUNC))
-#define CallNPN_GetJavaPeerProc(FUNC, ARG1)		\
-        (*(FUNC))((ARG1))	
-
-#endif
-
-
-/* NPN_InvalidateRect */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_InvalidateRectUPP;
-enum {
-    uppNPN_InvalidateRectProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPRect *)))
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#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))	
-
-#else
-
-typedef void (* NP_LOADDS NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
-#define NewNPN_InvalidateRectProc(FUNC)		\
-        ((NPN_InvalidateRectUPP) (FUNC))
-#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2)		\
-        (*(FUNC))((ARG1), (ARG2))	
-
-#endif
-
-
-/* NPN_InvalidateRegion */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_InvalidateRegionUPP;
-enum {
-    uppNPN_InvalidateRegionProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPRegion)))
-        | RESULT_SIZE(SIZE_CODE(0))
-};
-
-#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))	
-
-#else
-
-typedef void (* NP_LOADDS NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
-#define NewNPN_InvalidateRegionProc(FUNC)		\
-        ((NPN_InvalidateRegionUPP) (FUNC))
-#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2)		\
-        (*(FUNC))((ARG1), (ARG2))	
-
-#endif
-
-/* NPN_ForceRedraw */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPN_ForceRedrawUPP;
-enum {
-    uppNPN_ForceRedrawProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(0)))
-};
-
-#define NewNPN_ForceRedrawProc(FUNC)		\
-        (NPN_ForceRedrawUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_ForceRedrawProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPN_ForceRedrawUPP) (FUNC))
-#define CallNPN_ForceRedrawProc(FUNC, ARG1)		\
-        (*(FUNC))((ARG1))	
-
-#endif
-
-
-/******************************************************************************************
- * The actual plugin function table definitions
- *******************************************************************************************/
-
-#ifdef XP_MAC
-#if PRAGMA_STRUCT_ALIGN
-#pragma options align=mac68k
-#endif
-#endif
-
-typedef struct _NPPluginFuncs {
-    uint16 size;
-    uint16 version;
-    NPP_NewUPP newp;
-    NPP_DestroyUPP destroy;
-    NPP_SetWindowUPP setwindow;
-    NPP_NewStreamUPP newstream;
-    NPP_DestroyStreamUPP destroystream;
-    NPP_StreamAsFileUPP asfile;
-    NPP_WriteReadyUPP writeready;
-    NPP_WriteUPP write;
-    NPP_PrintUPP print;
-    NPP_HandleEventUPP event;
-    NPP_URLNotifyUPP urlnotify;
-    JRIGlobalRef javaClass;
-    NPP_GetValueUPP getvalue;
-    NPP_SetValueUPP setvalue;
-} NPPluginFuncs;
-
-typedef struct _NPNetscapeFuncs {
-    uint16 size;
-    uint16 version;
-    NPN_GetURLUPP geturl;
-    NPN_PostURLUPP posturl;
-    NPN_RequestReadUPP requestread;
-    NPN_NewStreamUPP newstream;
-    NPN_WriteUPP write;
-    NPN_DestroyStreamUPP destroystream;
-    NPN_StatusUPP status;
-    NPN_UserAgentUPP uagent;
-    NPN_MemAllocUPP memalloc;
-    NPN_MemFreeUPP memfree;
-    NPN_MemFlushUPP memflush;
-    NPN_ReloadPluginsUPP reloadplugins;
-    NPN_GetJavaEnvUPP getJavaEnv;
-    NPN_GetJavaPeerUPP getJavaPeer;
-    NPN_GetURLNotifyUPP geturlnotify;
-    NPN_PostURLNotifyUPP posturlnotify;
-    NPN_GetValueUPP getvalue;
-    NPN_SetValueUPP setvalue;
-    NPN_InvalidateRectUPP invalidaterect;
-    NPN_InvalidateRegionUPP invalidateregion;
-    NPN_ForceRedrawUPP forceredraw;
-} NPNetscapeFuncs;
-
-#ifdef XP_MAC
-#if PRAGMA_STRUCT_ALIGN
-#pragma options align=reset
-#endif
-#endif
-
-
-#ifdef XP_MAC
-/******************************************************************************************
- * Mac platform-specific plugin glue stuff
- *******************************************************************************************/
-
-/*
- * Main entry point of the plugin.
- * This routine will be called when the plugin is loaded. The function
- * tables are passed in and the plugin fills in the NPPluginFuncs table
- * and NPPShutdownUPP for Netscape's use.
- */
-
-#if _NPUPP_USE_UPP_
-
-typedef UniversalProcPtr NPP_MainEntryUPP;
-enum {
-    uppNPP_MainEntryProcInfo = kThinkCStackBased
-        | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPNetscapeFuncs*)))
-        | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(NPPluginFuncs*)))
-        | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(NPP_ShutdownUPP*)))
-        | RESULT_SIZE(SIZE_CODE(sizeof(NPError)))
-};
-#define NewNPP_MainEntryProc(FUNC)		\
-        (NPP_MainEntryUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPP_MainEntryProcInfo, GetCurrentArchitecture())
-#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)		\
-        ((NPP_MainEntryUPP) (FUNC))
-#define CallNPP_MainEntryProc(FUNC,  netscapeFunc, pluginFunc, shutdownUPP)		\
-        (*(FUNC))((netscapeFunc), (pluginFunc), (shutdownUPP))
-
-#endif
-
-
-/*
- * Mac version(s) of NP_GetMIMEDescription(const char *)
- * 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 
- *       in furture version--use NP_GetMIMEDescription instead
- */
-
-enum
-{
- kBPSupportedMIMETypesStructVers_1    = 1
-};
-
-typedef struct _BPSupportedMIMETypes
-{
- SInt32    structVersion;      // struct version
- Handle    typeStrings;        // STR# formated handle, allocated by plug-in
- Handle    infoStrings;        // STR# formated handle, allocated by plug-in
-} BPSupportedMIMETypes;
-OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags);
-
-#if _NPUPP_USE_UPP_
-
-#define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescriptionRD"
-typedef UniversalProcPtr NP_GetMIMEDescriptionUPP;
-enum {
-    uppNP_GetMIMEDescEntryProc = kThinkCStackBased
-        | RESULT_SIZE(SIZE_CODE(sizeof(const char *)))
-};
-#define NewNP_GetMIMEDescEntryProc(FUNC)		\
-        (NP_GetMIMEDescriptionUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNP_GetMIMEDescEntryProc, GetCurrentArchitecture())
-#define CallNP_GetMIMEDescEntryProc(FUNC)		\
-        (const char *)CallUniversalProc((UniversalProcPtr)(FUNC), (ProcInfoType)uppNP_GetMIMEDescEntryProc)
-
-
-#else  // !_NPUPP_USE_UPP_
-
- // NP_GetMIMEDescription
-#define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription"
-typedef const char* (* NP_LOADDS NP_GetMIMEDescriptionUPP)();
-#define NewNP_GetMIMEDescEntryProc(FUNC)		\
-        ((NP_GetMIMEDescriptionUPP) (FUNC))
-#define CallNP_GetMIMEDescEntryProc(FUNC)		\
-        (*(FUNC))()
-// BP_GetSupportedMIMETypes
-typedef OSErr (* NP_LOADDS BP_GetSupportedMIMETypesUPP)(BPSupportedMIMETypes*, UInt32);
-#define NewBP_GetSupportedMIMETypesEntryProc(FUNC)		\
-        ((BP_GetSupportedMIMETypesUPP) (FUNC))
-#define CallBP_GetMIMEDescEntryProc(FUNC,  mimeInfo, flags)		\
-        (*(FUNC))((mimeInfo), (flags))
-
-#endif
-#endif /* MAC */
-
-#if defined(_WINDOWS)
-#define OSCALL WINAPI
-#else
-#define OSCALL
-#endif
-
-#if defined( _WINDOWS )
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* plugin meta member functions */
-
-NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* pFuncs);
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* pFuncs);
-
-NPError OSCALL NP_Shutdown();
-
-char*	NP_GetMIMEDescription();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WINDOWS */
-
-#ifdef XP_UNIX
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* plugin meta member functions */
-
-char*	NP_GetMIMEDescription(void);
-NPError	NP_Initialize(NPNetscapeFuncs*, NPPluginFuncs*);
-NPError	NP_Shutdown(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* XP_UNIX */
-
-#endif /* _NPUPP_H_ */
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
deleted file mode 100644
index 3c893b2..0000000
--- a/np_sdk/mozsrc/npwin.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * 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.
- *
- * 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 
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _NPAPI_H_
-#include "npapi.h"
-#endif
-#ifndef _NPUPP_H_
-#include "npupp.h"
-#endif
-
-//\\// DEFINE
-#define NP_EXPORT
-
-//\\// GLOBAL DATA
-NPNetscapeFuncs* g_pNavigatorFuncs = 0;
-
-extern "C"
-{
-#ifdef OJI
-JRIGlobalRef Private_GetJavaClass(void);
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// Private_GetJavaClass (global function)
-//
-//	Given a Java class reference (thru NPP_GetJavaClass) inform JRT
-//	of this class existence
-//
-JRIGlobalRef
-Private_GetJavaClass(void)
-{
-    jref clazz = NPP_GetJavaClass();
-    if (clazz) {
-        JRIEnv* env = NPN_GetJavaEnv();
-        return JRI_NewGlobalRef(env, clazz);
-    }
-    return NULL;
-}
-#endif /* OJI */
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-//						PLUGIN DLL entry points   
-//
-// These are the Windows specific DLL entry points. They must be exoprted
-//
-
-// we need these to be global since we have to fill one of its field
-// with a data (class) which requires knowlwdge of the navigator
-// jump-table. This jump table is known at Initialize time (NP_Initialize)
-// which is called after NP_GetEntryPoint
-static NPPluginFuncs* g_pluginFuncs;
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// NP_GetEntryPoints
-//
-//	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 
-    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 
-
-    pFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-    pFuncs->newp          = NPP_New;
-    pFuncs->destroy       = NPP_Destroy;
-    pFuncs->setwindow     = NPP_SetWindow;
-    pFuncs->newstream     = NPP_NewStream;
-    pFuncs->destroystream = NPP_DestroyStream;
-    pFuncs->asfile        = NPP_StreamAsFile;
-    pFuncs->writeready    = NPP_WriteReady;
-    pFuncs->write         = NPP_Write;
-    pFuncs->print         = NPP_Print;
-    pFuncs->event         = 0;       /// reserved 
-
-    g_pluginFuncs		  = pFuncs;
-
-    return NPERR_NO_ERROR;
-}
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// NP_Initialize
-//
-//	called immediately after the plugin DLL is loaded
-//
-NPError WINAPI NP_EXPORT 
-NP_Initialize(NPNetscapeFuncs* pFuncs)
-{
-    // trap a NULL ptr 
-    if(pFuncs == NULL)
-        return NPERR_INVALID_FUNCTABLE_ERROR;
-
-    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 
-    if(HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
-        return NPERR_INCOMPATIBLE_VERSION_ERROR;
-
-    // We have to defer these assignments until g_pNavigatorFuncs is set
-    int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
-
-    if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
-        g_pluginFuncs->urlnotify = NPP_URLNotify;
-    }
-    
-#ifdef OJI    
-    if( navMinorVers >= NPVERS_HAS_LIVECONNECT ) {
-        g_pluginFuncs->javaClass = Private_GetJavaClass();
-    }
-#endif
-
-    // NPP_Initialize is a standard (cross-platform) initialize function.
-    return NPP_Initialize();
-}
-
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-// 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. 
-//
-NPError WINAPI NP_EXPORT 
-NP_Shutdown()
-{
-    NPP_Shutdown();
-    g_pNavigatorFuncs = NULL;
-    return NPERR_NO_ERROR;
-}
-
-char * NP_GetMIMEDescription()
-{
-    return NPP_GetMIMEDescription();
-}
-
-//						END - PLUGIN DLL entry points   
-////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
-
-/*    NAVIGATOR Entry points    */
-
-/* These entry points expect to be called from within the plugin.  The
-   noteworthy assumption is that DS has already been set to point to the
-   plugin's DLL data segment.  Don't call these functions from outside
-   the plugin without ensuring DS is set to the DLLs data segment first,
-   typically using the NP_LOADDS macro
-*/
-
-/* returns the major/minor version numbers of the Plugin API for the plugin
-   and the Navigator
-*/
-void NPN_Version(int* plugin_major, int* plugin_minor, int* netscape_major, int* netscape_minor)
-{
-    *plugin_major   = NP_VERSION_MAJOR;
-    *plugin_minor   = NP_VERSION_MINOR;
-    *netscape_major = HIBYTE(g_pNavigatorFuncs->version);
-    *netscape_minor = LOBYTE(g_pNavigatorFuncs->version);
-}
-
-NPError NPN_GetValue(NPP instance, NPNVariable variable, void *result)
-{
-    return g_pNavigatorFuncs->getvalue(instance, variable, result);
-}
-
-
-/* causes the specified URL to be fetched and streamed in
-*/
-NPError NPN_GetURLNotify(NPP instance, const char *url, const char *target, void* notifyData)
-
-{
-    int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-    if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
-        err = g_pNavigatorFuncs->geturlnotify(instance, url, target, notifyData);
-    }
-    else {
-        err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-
-NPError NPN_GetURL(NPP instance, const char *url, const char *target)
-{
-    return g_pNavigatorFuncs->geturl(instance, url, target);
-}
-
-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
-{
-    int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-    if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) {
-        err = g_pNavigatorFuncs->posturlnotify(instance, url, window, len, buf, file, notifyData);
-    }
-    else {
-        err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-
-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
-{
-    return g_pNavigatorFuncs->posturl(instance, url, window, len, buf, file);
-}
-
-/* Requests that a number of bytes be provided on a stream.  Typically
-   this would be used if a stream was in "pull" mode.  An optional
-   position can be provided for streams which are seekable.
-*/
-NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
-{
-    return g_pNavigatorFuncs->requestread(stream, 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, 
-                                const char* target, NPStream** stream)
-{
-    int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-
-    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
-        err = g_pNavigatorFuncs->newstream(instance, type, target, stream);
-    }
-    else {
-        err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-/* Provides len bytes of data.
-*/
-int32 NPN_Write(NPP instance, NPStream *stream,
-                int32 len, void *buffer)
-{
-    int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
-    int32 result;
-
-    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
-        result = g_pNavigatorFuncs->write(instance, stream, len, buffer);
-    }
-    else {
-        result = -1;
-    }
-    return result;
-}
-
-/* Closes a stream object.  
-reason indicates why the stream was closed.
-*/
-NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
-{
-    int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
-    NPError err;
-
-    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
-        err = g_pNavigatorFuncs->destroystream(instance, stream, reason);
-    }
-    else {
-        err = NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-    return err;
-}
-
-/* Provides a text status message in the Netscape client user interface
-*/
-void NPN_Status(NPP instance, const char *message)
-{
-    g_pNavigatorFuncs->status(instance, message);
-}
-
-/* returns the user agent string of Navigator, which contains version info
-*/
-const char* NPN_UserAgent(NPP instance)
-{
-    return g_pNavigatorFuncs->uagent(instance);
-}
-
-/* allocates memory from the Navigator's memory space.  Necessary so that
-   saved instance data may be freed by Navigator when exiting.
-*/
-
-
-void* NPN_MemAlloc(uint32 size)
-{
-    return g_pNavigatorFuncs->memalloc(size);
-}
-
-/* reciprocal of MemAlloc() above
-*/
-void NPN_MemFree(void* ptr)
-{
-    g_pNavigatorFuncs->memfree(ptr);
-}
-
-#ifdef OJI
-/* private function to Netscape.  do not use!
-*/
-void NPN_ReloadPlugins(NPBool reloadPages)
-{
-    g_pNavigatorFuncs->reloadplugins(reloadPages);
-}
-
-JRIEnv* NPN_GetJavaEnv(void)
-{
-    return g_pNavigatorFuncs->getJavaEnv();
-}
-
-jref NPN_GetJavaPeer(NPP instance)
-{
-    return g_pNavigatorFuncs->getJavaPeer(instance);
-}
-#endif
-} //end of extern "C"
-
diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst
deleted file mode 100644
index 9617879..0000000
--- a/np_sdk/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-np  np_sdk : soltools NULL
-np	np_sdk			usr1	-	all	np_sdk NULL
-np	np_sdk\mozsrc	nmake	-	all	np_mozsrc NULL
diff --git a/np_sdk/prj/d.lst b/np_sdk/prj/d.lst
deleted file mode 100644
index cfd2429..0000000
--- a/np_sdk/prj/d.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-mkdir: %_DEST%\inc\npsdk
-
-..\mozsrc\*.h %_DEST%\inc\npsdk\*.h
-
-..\%__SRC%\slo\npunix.o %_DEST%\lib\npunix.o
-..\%__SRC%\slo\npunix.obj %_DEST%\lib\npunix.obj
-..\%__SRC%\slo\npwin.obj %_DEST%\lib\npwin.obj
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
deleted file mode 100644
index b8f0ec5..0000000
--- a/openssl/makefile.mk
+++ /dev/null
@@ -1,192 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=openssl
-TARGET=openssl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_OPENSSL)" == "YES"
-@all:
-    @echo "Using system openssl...."
-.ENDIF
-
-.IF "$(DISABLE_OPENSSL)" == "TRUE"
-@all:
-    @echo "openssl disabled...."
-.ENDIF
-
-OPENSSL_NAME=openssl-0.9.8o
-
-TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
-
-CONFIGURE_DIR=.
-CONFIGURE_ACTION=config
-CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
-
-BUILD_DIR=.
-
-COMPILER_AND_FLAGS=$(CC)
-#See fdo#35404 If we're only interested in getting a .a (i.e. not windows) then
-#force everything, when possible, as hidden symbols
-.IF "$(OS)" != "WNT" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-COMPILER_AND_FLAGS+=-fvisibility=hidden
-.ENDIF
-
-BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)'
-
-OUT2LIB = libssl.*
-OUT2LIB += libcrypto.*
-OUT2INC += include/openssl/*
-
-UNAME=$(shell uname)
-
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID"
-    PATCH_FILES=openssllnx.patch
-    ADDITIONAL_FILES:= \
-        libcrypto_OOo_0_9_8o.map \
-        libssl_OOo_0_9_8o.map
-    .IF "$(CPU)" == "I"
-        .IF "$(UNAME)" == "GNU/kFreeBSD"
-            CONFIGURE_ACTION=Configure debian-kfreebsd-i386
-        .ELSE
-            CONFIGURE_ACTION=Configure linux-elf
-        .ENDIF
-    .ELIF "$(BUILD64)" == "1"
-        .IF "$(UNAME)" == "GNU/kFreeBSD"
-            CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
-        .ELSE
-            CONFIGURE_ACTION=Configure linux-generic64
-        .ENDIF
-    .ELSE
-        CONFIGURE_ACTION=Configure linux-generic32
-    .ENDIF
-    # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
-    #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
-.ENDIF
-
-.IF "$(OS)" == "SOLARIS"
-    PATCH_FILES=opensslsol.patch
-    ADDITIONAL_FILES:= \
-        libcrypto_OOo_0_9_8o.map \
-        libssl_OOo_0_9_8o.map
-    #BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
-
-    # Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
-
-    .IF "$(CPUNAME)" == "INTEL" # Solaris INTEL
-        .IF "$(CPU)" == "X"
-           CONFIGURE_ACTION=Configure solaris64-x86_64-cc
-        .ELSE
-           CONFIGURE_ACTION=Configure solaris-x86-cc
-        .ENDIF
-    .ELIF "$(CPU)" == "U" # Solaris SPARC
-       CONFIGURE_ACTION=Configure solaris64-sparcv9-cc
-    .ELSE
-       CONFIGURE_ACTION=Configure solaris-sparcv9-cc
-    .ENDIF
-.ENDIF
-
-.IF "$(OS)" == "IOS"
-    PATCH_FILES=opensslios.patch
-    CONFIGURE_ACTION=Configure ios-armv7
-    CONFIGURE_FLAGS=no-shared no-idea
-.ENDIF
-
-.IF "$(OS)" == "WNT"
-
-.IF "$(COM)"=="GCC"
-PATCH_FILES=opensslmingw.patch
-.IF "$(USE_MINGW)" == "cygwin"
-CONFIGURE_ACTION=$(PERL) configure
-CONFIGURE_FLAGS=mingw shared 
-INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a
-OUT2LIB = libcrypto_static.*
-OUT2LIB += libssl_static.*
-OUT2LIB += libcrypto.*
-OUT2LIB += libssl.*
-OUT2BIN = ssleay32.dll
-OUT2BIN += libeay32.dll
-.ELSE
-CONFIGURE_ACTION=
-BUILD_ACTION=cmd /c "ms\mingw32"
-OUT2LIB = out/libcrypto_static.*
-OUT2LIB += out/libssl_static.*
-OUT2LIB += out/libcrypto.*
-OUT2LIB += out/libssl.*
-OUT2BIN = out/ssleay32.dll
-OUT2BIN += out/libeay32.dll
-.ENDIF
-.ELSE
-
-        PATCH_FILES=openssl.patch
-        .IF "$(MAKETARGETS)" == ""
-            # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s
-            # If WRAPCMD is set it is prepended before the compiler, don't touch that.
-            .IF "$(WRAPCMD)"==""
-                CC!:=$(subst,/,\ $(normpath,1 $(CC)))
-                .EXPORT : CC
-            .ENDIF
-            PERL_bak:=$(PERL)
-            PERL!:=$(subst,/,\ $(normpath,1 $(PERL)))
-            .EXPORT : PERL
-            PERL!:=$(PERL_bak)
-        .ENDIF
-
-        #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
-        CONFIGURE_ACTION=$(PERL) configure
-.IF "$(CPU)" == "I"
-        OPENSSL_PLATFORM=VC-WIN32
-.ELSE
-        OPENSSL_PLATFORM=VC-WIN64A
-.ENDIF
-        CONFIGURE_FLAGS=$(OPENSSL_PLATFORM) no-idea
-        BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL))) $(OPENSSL_PLATFORM)" && nmake -f ms/ntdll.mak
-
-        OUT2LIB = out32dll$/ssleay32.lib
-        OUT2LIB += out32dll$/libeay32.lib
-        OUT2BIN = out32dll$/ssleay32.dll
-        OUT2BIN += out32dll$/libeay32.dll
-        OUT2INC = inc32$/openssl$/*
-    .ENDIF
-.ENDIF
-
-#set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
deleted file mode 100644
index 88f7088..0000000
--- a/openssl/openssl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c	2007-03-05 01:06:47.000000000 +0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c	2010-03-26 12:04:20.961547300 +0100
-@@ -2,7 +2,7 @@
- /* Contributed to the OpenSSL Project 2004
-  * by Richard Levitte (richard@levitte.org)
-  */
--/* Copyright (c) 2004 Kungliga Tekniska H�gskolan
-+/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan
-  * (Royal Institute of Technology, Stockholm, Sweden).
-  * All rights reserved.
-  *
---- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c	2004-12-28 01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c	2010-03-26 12:04:20.961547300 +0100
-@@ -2,7 +2,7 @@
- /* Contributed to the OpenSSL Project 2004
-  * by Richard Levitte (richard@levitte.org)
-  */
--/* Copyright (c) 2004 Kungliga Tekniska H�gskolan
-+/* Copyright (c) 2004 Kungliga Tekniska Hoegskolan
-  * (Royal Institute of Technology, Stockholm, Sweden).
-  * All rights reserved.
-  *
---- misc/openssl-0.9.8o/ms/do_ms.bat	2009-07-28 14:51:19.000000000 +0200
-+++ misc/build/openssl-0.9.8o/ms/do_ms.bat	2010-03-26 12:19:19.399047300 +0100
-@@ -1,11 +1,11 @@
- 
--perl util\mkfiles.pl >MINFO
--perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
--perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
-+%1 util\mkfiles.pl >MINFO
-+if %2 == VC-WIN32 goto not64a
-+perl ms\uplink.pl win64a > ms\uptable.asm
-+ml64 -c -Foms\uptable.obj ms\uptable.asm
-+:not64a
-+%1 util\mk1mf.pl no-asm %2 >ms\nt.mak
-+%1 util\mk1mf.pl dll no-asm %2 >ms\ntdll.mak
--if x%OSVERSION% == x goto skipce
--perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
--perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
--:skipce
- 
--perl util\mkdef.pl 32 libeay > ms\libeay32.def
--perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
-+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
-+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
---- misc/openssl-0.9.8o/util/mk1mf.pl	2009-09-20 14:46:42.000000000 +0200
-+++ misc/build/openssl-0.9.8o/util/mk1mf.pl	2010-03-26 12:04:20.977172300 +0100
-@@ -128,7 +128,7 @@
- $inc_def="outinc";
- $tmp_def="tmp";
- 
--$perl="perl" unless defined $perl;
-+$perl="$ENV{PERL}" unless defined $perl;
- $mkdir="-mkdir" unless defined $mkdir;
- 
- ($ssl,$crypto)=("ssl","crypto");
-@@ -290,6 +290,11 @@
- 	chop;
- 
- 	($key,$val)=/^([^=]+)=(.*)/;
-+
-+	# On some Windows machines, $val has linefeeds at the end, which confuses
-+	# subsequent code in this file. So we strip all whitespace at the end.
-+	$val =~ s/\s+$//;
-+
- 	if ($key eq "RELATIVE_DIRECTORY")
- 		{
- 		if ($lib ne "")
-@@ -730,7 +735,7 @@
- printf OUT <<EOF;
- #ifdef $platform_cpp_symbol
-   /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
--  #define CFLAGS "$cc $cflags"
-+  #define CFLAGS "$cflags"
-   #define PLATFORM "$platform"
- EOF
- printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8o/util/pl/VC-32.pl	2010-02-04 02:10:24.000000000 +0100
-+++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl	2010-03-26 12:04:20.977172300 +0100
-@@ -32,7 +32,7 @@
- $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
- 
- # C compiler stuff
--$cc='cl';
-+$cc=$ENV{'CC'};
- if ($FLAVOR =~ /WIN64/)
-     {
-     # Note that we currently don't have /WX on Win64! There is a lot of
-@@ -103,21 +103,21 @@
-     }
- 
-     $cc='$(CC)';
--    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
-+    $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
-     $base_cflags.=" $wcecdefs";
--    $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...
--    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
-+    $opt_cflags=' -MC -O1i';	# optimize for space, but with intrinsics...
-+    $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG';
-     $lflags="/nologo /opt:ref $wcelflag";
-     }
- else	# Win32
-     {
--    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-+    $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-     $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
-     $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';	# shut up VC8
--    my $f = $shlib || $fips ?' /MD':' /MT';
--    $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
--    $opt_cflags=$f.' /Ox /O2 /Ob2';
--    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-+    my $f = $shlib || $fips ?' -MD':' -MT';
-+    $lib_cflag='-Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
-+    $opt_cflags=$f.' -Ox -O2 -Ob2';
-+    $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
-     $lflags="/nologo /subsystem:console /opt:ref";
-     }
- $mlflags='';
-@@ -138,7 +138,7 @@
- 	}
- 
- $obj='.obj';
--$ofile="/Fo";
-+$ofile="-Fo.\\";
- 
- # EXE linking stuff
- $link="link";
-@@ -298,7 +298,7 @@
- 	$tmp_def='tmp32dll_$(TARGETCPU)';
- 	}
- 
--$cflags.=" /Fd$out_def";
-+$cflags.=" -Fd$out_def";
- 
- sub do_lib_rule
- 	{
---- misc/build/openssl-0.9.8o/ms/uplink.c
-+++ misc/build/openssl-0.9.8o/ms/uplink.c
-@@ -1,5 +1,6 @@
- #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE)
- #define UNICODE
-+#define _CRT_NON_CONFORMING_SWPRINTFS
- #endif
- #if defined(UNICODE) && !defined(_UNICODE)
- #define _UNICODE
diff --git a/openssl/opensslios.patch b/openssl/opensslios.patch
deleted file mode 100644
index 64cb40f..0000000
--- a/openssl/opensslios.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/openssl-0.9.8o/Configure
-+++ misc/build/openssl-0.9.8o/Configure
-@@ -530,6 +530,9 @@
- "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- 
-+##### iOS
-+"ios-armv7","gcc:-O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::",
-+
- ##### A/UX
- "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
- 
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
deleted file mode 100644
index 449ebce..0000000
--- a/openssl/openssllnx.patch
+++ /dev/null
@@ -1,3816 +0,0 @@
---- misc/build/openssl-0.9.8o/Configure-old	2010-04-17 13:51:42.000000000 +0200
-+++ misc/build/openssl-0.9.8o/Configure	2010-04-17 13:52:03.000000000 +0200
-@@ -388,6 +388,9 @@
- 
- "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
- "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
- 
---- misc/build/openssl-0.9.8o/Makefile.org	2010-01-27 17:06:36.000000000 +0100
-+++ misc/build/openssl-0.9.8o/Makefile.org	2010-09-20 09:24:00.000000000 +0100
-@@ -199,7 +199,7 @@
- 
- BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
- 		CC='${CC}' CFLAG='${CFLAG}' 			\
--		AS='${CC}' ASFLAG='${CFLAG} -c'			\
-+		AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack'	\
- 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
- 		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)'	\
- 		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
---- misc/openssl-0.9.8o/config	2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8o/config	2009-03-30 08:59:09.588448000 +0200
-@@ -399,27 +399,21 @@
- # this is where the translation occurs into SSLeay terms
- # ---------------------------------------------------------------------------
- 
--GCCVER=`(gcc -dumpversion) 2>/dev/null`
--if [ "$GCCVER" != "" ]; then
--  # then strip off whatever prefix egcs prepends the number with...
--  # Hopefully, this will work for any future prefixes as well.
--  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
--  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
--  # does give us what we want though, so we use that.  We just just the
--  # major and minor version numbers.
--  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
--  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
--fi
--
--# Only set CC if not supplied already
--if [ -z "$CC" ]; then
--# figure out if gcc is available and if so we use it otherwise
--# we fallback to whatever cc does on the system
--  if [ "$GCCVER" != "" ]; then
--    CC=gcc
--  else
--    CC=cc
--  fi
-+if [ -z "$CC" ];then
-+   GCCVER=`(gcc -dumpversion) 2>/dev/null`
-+   if [ "$GCCVER" != "" ]; then
-+     CC=gcc
-+     # then strip off whatever prefix egcs prepends the number with...
-+     # Hopefully, this will work for any future prefixes as well.
-+     GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
-+     # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-+     # does give us what we want though, so we use that.  We just just the
-+     # major and minor version numbers.
-+     # peak single digit before and after first dot, e.g. 2.95.1 gives 29
-+     GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-+   else
-+     CC=cc
-+   fi
- fi
- GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
---- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	2010-03-26 15:26:55.958495757 +0100
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	2010-03-26 15:31:38.019501422 +0100
-@@ -1 +1,3295 @@
--dummy
-+LIBCRYPTO_OOO_0_9_8o {
-+	global:
-+ACCESS_DESCRIPTION_free;
-+ACCESS_DESCRIPTION_it;
-+ACCESS_DESCRIPTION_new;
-+AES_bi_ige_encrypt;
-+AES_cbc_encrypt;
-+AES_cfb128_encrypt;
-+AES_cfb1_encrypt;
-+AES_cfb8_encrypt;
-+AES_cfbr_encrypt_block;
-+AES_ctr128_encrypt;
-+AES_decrypt;
-+AES_ecb_encrypt;
-+AES_encrypt;
-+AES_ige_encrypt;
-+AES_ofb128_encrypt;
-+AES_options;
-+AES_set_decrypt_key;
-+AES_set_encrypt_key;
-+AES_version;
-+ASN1_ANY_it;
-+ASN1_BIT_STRING_asn1_meth;
-+ASN1_BIT_STRING_free;
-+ASN1_BIT_STRING_get_bit;
-+ASN1_BIT_STRING_it;
-+ASN1_BIT_STRING_name_print;
-+ASN1_BIT_STRING_new;
-+ASN1_BIT_STRING_num_asc;
-+ASN1_BIT_STRING_set;
-+ASN1_BIT_STRING_set_asc;
-+ASN1_BIT_STRING_set_bit;
-+ASN1_BMPSTRING_free;
-+ASN1_BMPSTRING_it;
-+ASN1_BMPSTRING_new;
-+ASN1_BOOLEAN_it;
-+ASN1_ENUMERATED_free;
-+ASN1_ENUMERATED_get;
-+ASN1_ENUMERATED_it;
-+ASN1_ENUMERATED_new;
-+ASN1_ENUMERATED_set;
-+ASN1_ENUMERATED_to_BN;
-+ASN1_FBOOLEAN_it;
-+ASN1_GENERALIZEDTIME_check;
-+ASN1_GENERALIZEDTIME_free;
-+ASN1_GENERALIZEDTIME_it;
-+ASN1_GENERALIZEDTIME_new;
-+ASN1_GENERALIZEDTIME_print;
-+ASN1_GENERALIZEDTIME_set;
-+ASN1_GENERALIZEDTIME_set_string;
-+ASN1_GENERALSTRING_free;
-+ASN1_GENERALSTRING_it;
-+ASN1_GENERALSTRING_new;
-+ASN1_HEADER_free;
-+ASN1_HEADER_new;
-+ASN1_IA5STRING_asn1_meth;
-+ASN1_IA5STRING_free;
-+ASN1_IA5STRING_it;
-+ASN1_IA5STRING_new;
-+ASN1_INTEGER_cmp;
-+ASN1_INTEGER_dup;
-+ASN1_INTEGER_free;
-+ASN1_INTEGER_get;
-+ASN1_INTEGER_it;
-+ASN1_INTEGER_new;
-+ASN1_INTEGER_set;
-+ASN1_INTEGER_to_BN;
-+ASN1_NULL_free;
-+ASN1_NULL_it;
-+ASN1_NULL_new;
-+ASN1_OBJECT_create;
-+ASN1_OBJECT_free;
-+ASN1_OBJECT_it;
-+ASN1_OBJECT_new;
-+ASN1_OCTET_STRING_NDEF_it;
-+ASN1_OCTET_STRING_cmp;
-+ASN1_OCTET_STRING_dup;
-+ASN1_OCTET_STRING_free;
-+ASN1_OCTET_STRING_it;
-+ASN1_OCTET_STRING_new;
-+ASN1_OCTET_STRING_set;
-+ASN1_PRINTABLESTRING_free;
-+ASN1_PRINTABLESTRING_it;
-+ASN1_PRINTABLESTRING_new;
-+ASN1_PRINTABLE_free;
-+ASN1_PRINTABLE_it;
-+ASN1_PRINTABLE_new;
-+ASN1_PRINTABLE_type;
-+ASN1_SEQUENCE_it;
-+ASN1_STRING_TABLE_add;
-+ASN1_STRING_TABLE_cleanup;
-+ASN1_STRING_TABLE_get;
-+ASN1_STRING_cmp;
-+ASN1_STRING_data;
-+ASN1_STRING_dup;
-+ASN1_STRING_encode;
-+ASN1_STRING_free;
-+ASN1_STRING_get_default_mask;
-+ASN1_STRING_length;
-+ASN1_STRING_length_set;
-+ASN1_STRING_new;
-+ASN1_STRING_print;
-+ASN1_STRING_print_ex;
-+ASN1_STRING_print_ex_fp;
-+ASN1_STRING_set;
-+ASN1_STRING_set_by_NID;
-+ASN1_STRING_set_default_mask;
-+ASN1_STRING_set_default_mask_asc;
-+ASN1_STRING_to_UTF8;
-+ASN1_STRING_type;
-+ASN1_STRING_type_new;
-+ASN1_T61STRING_free;
-+ASN1_T61STRING_it;
-+ASN1_T61STRING_new;
-+ASN1_TBOOLEAN_it;
-+ASN1_TIME_check;
-+ASN1_TIME_free;
-+ASN1_TIME_it;
-+ASN1_TIME_new;
-+ASN1_TIME_print;
-+ASN1_TIME_set;
-+ASN1_TIME_to_generalizedtime;
-+ASN1_TYPE_free;
-+ASN1_TYPE_get;
-+ASN1_TYPE_get_int_octetstring;
-+ASN1_TYPE_get_octetstring;
-+ASN1_TYPE_new;
-+ASN1_TYPE_set;
-+ASN1_TYPE_set_int_octetstring;
-+ASN1_TYPE_set_octetstring;
-+ASN1_UNIVERSALSTRING_free;
-+ASN1_UNIVERSALSTRING_it;
-+ASN1_UNIVERSALSTRING_new;
-+ASN1_UNIVERSALSTRING_to_string;
-+ASN1_UTCTIME_check;
-+ASN1_UTCTIME_cmp_time_t;
-+ASN1_UTCTIME_free;
-+ASN1_UTCTIME_it;
-+ASN1_UTCTIME_new;
-+ASN1_UTCTIME_print;
-+ASN1_UTCTIME_set;
-+ASN1_UTCTIME_set_string;
-+ASN1_UTF8STRING_free;
-+ASN1_UTF8STRING_it;
-+ASN1_UTF8STRING_new;
-+ASN1_VISIBLESTRING_free;
-+ASN1_VISIBLESTRING_it;
-+ASN1_VISIBLESTRING_new;
-+ASN1_add_oid_module;
-+ASN1_check_infinite_end;
-+ASN1_const_check_infinite_end;
-+ASN1_d2i_bio;
-+ASN1_d2i_fp;
-+ASN1_digest;
-+ASN1_dup;
-+ASN1_generate_nconf;
-+ASN1_generate_v3;
-+ASN1_get_object;
-+ASN1_i2d_bio;
-+ASN1_i2d_fp;
-+ASN1_item_d2i;
-+ASN1_item_d2i_bio;
-+ASN1_item_d2i_fp;
-+ASN1_item_digest;
-+ASN1_item_dup;
-+ASN1_item_ex_d2i;
-+ASN1_item_ex_free;
-+ASN1_item_ex_i2d;
-+ASN1_item_ex_new;
-+ASN1_item_free;
-+ASN1_item_i2d;
-+ASN1_item_i2d_bio;
-+ASN1_item_i2d_fp;
-+ASN1_item_ndef_i2d;
-+ASN1_item_new;
-+ASN1_item_pack;
-+ASN1_item_sign;
-+ASN1_item_unpack;
-+ASN1_item_verify;
-+ASN1_mbstring_copy;
-+ASN1_mbstring_ncopy;
-+ASN1_object_size;
-+ASN1_pack_string;
-+ASN1_parse;
-+ASN1_parse_dump;
-+ASN1_primitive_free;
-+ASN1_primitive_new;
-+ASN1_put_eoc;
-+ASN1_put_object;
-+ASN1_seq_pack;
-+ASN1_seq_unpack;
-+ASN1_sign;
-+ASN1_tag2bit;
-+ASN1_tag2str;
-+ASN1_template_d2i;
-+ASN1_template_free;
-+ASN1_template_i2d;
-+ASN1_template_new;
-+ASN1_unpack_string;
-+ASN1_verify;
-+ASN1_version;
-+AUTHORITY_INFO_ACCESS_free;
-+AUTHORITY_INFO_ACCESS_it;
-+AUTHORITY_INFO_ACCESS_new;
-+AUTHORITY_KEYID_free;
-+AUTHORITY_KEYID_it;
-+AUTHORITY_KEYID_new;
-+BASIC_CONSTRAINTS_free;
-+BASIC_CONSTRAINTS_it;
-+BASIC_CONSTRAINTS_new;
-+BF_cbc_encrypt;
-+BF_cfb64_encrypt;
-+BF_decrypt;
-+BF_ecb_encrypt;
-+BF_encrypt;
-+BF_ofb64_encrypt;
-+BF_options;
-+BF_set_key;
-+BF_version;
-+BIGNUM_it;
-+BIO_ACCEPT_free;
-+BIO_ACCEPT_new;
-+BIO_CONNECT_free;
-+BIO_CONNECT_new;
-+BIO_accept;
-+BIO_callback_ctrl;
-+BIO_clear_flags;
-+BIO_copy_next_retry;
-+BIO_ctrl;
-+BIO_ctrl_get_read_request;
-+BIO_ctrl_get_write_guarantee;
-+BIO_ctrl_pending;
-+BIO_ctrl_reset_read_request;
-+BIO_ctrl_wpending;
-+BIO_debug_callback;
-+BIO_dgram_non_fatal_error;
-+BIO_dgram_should_retry;
-+BIO_dump;
-+BIO_dump_cb;
-+BIO_dump_fp;
-+BIO_dump_indent;
-+BIO_dump_indent_cb;
-+BIO_dump_indent_fp;
-+BIO_dup_chain;
-+BIO_f_base64;
-+BIO_f_buffer;
-+BIO_f_cipher;
-+BIO_f_md;
-+BIO_f_nbio_test;
-+BIO_f_null;
-+BIO_f_reliable;
-+BIO_fd_non_fatal_error;
-+BIO_fd_should_retry;
-+BIO_find_type;
-+BIO_free;
-+BIO_free_all;
-+BIO_get_accept_socket;
-+BIO_get_callback;
-+BIO_get_callback_arg;
-+BIO_get_ex_data;
-+BIO_get_ex_new_index;
-+BIO_get_host_ip;
-+BIO_get_port;
-+BIO_get_retry_BIO;
-+BIO_get_retry_reason;
-+BIO_gethostbyname;
-+BIO_gets;
-+BIO_indent;
-+BIO_int_ctrl;
-+BIO_method_name;
-+BIO_method_type;
-+BIO_new;
-+BIO_new_accept;
-+BIO_new_bio_pair;
-+BIO_new_connect;
-+BIO_new_dgram;
-+BIO_new_fd;
-+BIO_new_file;
-+BIO_new_fp;
-+BIO_new_mem_buf;
-+BIO_new_socket;
-+BIO_next;
-+BIO_nread;
-+BIO_nread0;
-+BIO_number_read;
-+BIO_number_written;
-+BIO_nwrite;
-+BIO_nwrite0;
-+BIO_pop;
-+BIO_printf;
-+BIO_ptr_ctrl;
-+BIO_push;
-+BIO_puts;
-+BIO_read;
-+BIO_s_accept;
-+BIO_s_bio;
-+BIO_s_connect;
-+BIO_s_datagram;
-+BIO_s_fd;
-+BIO_s_file;
-+BIO_s_log;
-+BIO_s_mem;
-+BIO_s_null;
-+BIO_s_socket;
-+BIO_set;
-+BIO_set_callback;
-+BIO_set_callback_arg;
-+BIO_set_cipher;
-+BIO_set_ex_data;
-+BIO_set_flags;
-+BIO_set_tcp_ndelay;
-+BIO_snprintf;
-+BIO_sock_cleanup;
-+BIO_sock_error;
-+BIO_sock_init;
-+BIO_sock_non_fatal_error;
-+BIO_sock_should_retry;
-+BIO_socket_ioctl;
-+BIO_socket_nbio;
-+BIO_test_flags;
-+BIO_vfree;
-+BIO_vprintf;
-+BIO_vsnprintf;
-+BIO_write;
-+BN_BLINDING_convert;
-+BN_BLINDING_convert_ex;
-+BN_BLINDING_create_param;
-+BN_BLINDING_free;
-+BN_BLINDING_get_flags;
-+BN_BLINDING_get_thread_id;
-+BN_BLINDING_invert;
-+BN_BLINDING_invert_ex;
-+BN_BLINDING_new;
-+BN_BLINDING_set_flags;
-+BN_BLINDING_set_thread_id;
-+BN_BLINDING_update;
-+BN_CTX_end;
-+BN_CTX_free;
-+BN_CTX_get;
-+BN_CTX_init;
-+BN_CTX_new;
-+BN_CTX_start;
-+BN_GENCB_call;
-+BN_GF2m_add;
-+BN_GF2m_arr2poly;
-+BN_GF2m_mod;
-+BN_GF2m_mod_arr;
-+BN_GF2m_mod_div;
-+BN_GF2m_mod_div_arr;
-+BN_GF2m_mod_exp;
-+BN_GF2m_mod_exp_arr;
-+BN_GF2m_mod_inv;
-+BN_GF2m_mod_inv_arr;
-+BN_GF2m_mod_mul;
-+BN_GF2m_mod_mul_arr;
-+BN_GF2m_mod_solve_quad;
-+BN_GF2m_mod_solve_quad_arr;
-+BN_GF2m_mod_sqr;
-+BN_GF2m_mod_sqr_arr;
-+BN_GF2m_mod_sqrt;
-+BN_GF2m_mod_sqrt_arr;
-+BN_GF2m_poly2arr;
-+BN_MONT_CTX_copy;
-+BN_MONT_CTX_free;
-+BN_MONT_CTX_init;
-+BN_MONT_CTX_new;
-+BN_MONT_CTX_set;
-+BN_MONT_CTX_set_locked;
-+BN_RECP_CTX_free;
-+BN_RECP_CTX_init;
-+BN_RECP_CTX_new;
-+BN_RECP_CTX_set;
-+BN_add;
-+BN_add_word;
-+BN_bin2bn;
-+BN_bn2bin;
-+BN_bn2dec;
-+BN_bn2hex;
-+BN_bn2mpi;
-+BN_bntest_rand;
-+BN_clear;
-+BN_clear_bit;
-+BN_clear_free;
-+BN_cmp;
-+BN_copy;
-+BN_dec2bn;
-+BN_div;
-+BN_div_recp;
-+BN_div_word;
-+BN_dup;
-+BN_exp;
-+BN_free;
-+BN_from_montgomery;
-+BN_gcd;
-+BN_generate_prime;
-+BN_generate_prime_ex;
-+BN_get0_nist_prime_192;
-+BN_get0_nist_prime_224;
-+BN_get0_nist_prime_256;
-+BN_get0_nist_prime_384;
-+BN_get0_nist_prime_521;
-+BN_get_params;
-+BN_get_word;
-+BN_hex2bn;
-+BN_init;
-+BN_is_bit_set;
-+BN_is_prime;
-+BN_is_prime_ex;
-+BN_is_prime_fasttest;
-+BN_is_prime_fasttest_ex;
-+BN_kronecker;
-+BN_lshift;
-+BN_lshift1;
-+BN_mask_bits;
-+BN_mod_add;
-+BN_mod_add_quick;
-+BN_mod_exp;
-+BN_mod_exp2_mont;
-+BN_mod_exp_mont;
-+BN_mod_exp_mont_consttime;
-+BN_mod_exp_mont_word;
-+BN_mod_exp_recp;
-+BN_mod_exp_simple;
-+BN_mod_inverse;
-+BN_mod_lshift;
-+BN_mod_lshift1;
-+BN_mod_lshift1_quick;
-+BN_mod_lshift_quick;
-+BN_mod_mul;
-+BN_mod_mul_montgomery;
-+BN_mod_mul_reciprocal;
-+BN_mod_sqr;
-+BN_mod_sqrt;
-+BN_mod_sub;
-+BN_mod_sub_quick;
-+BN_mod_word;
-+BN_mpi2bn;
-+BN_mul;
-+BN_mul_word;
-+BN_new;
-+BN_nist_mod_192;
-+BN_nist_mod_224;
-+BN_nist_mod_256;
-+BN_nist_mod_384;
-+BN_nist_mod_521;
-+BN_nnmod;
-+BN_num_bits;
-+BN_num_bits_word;
-+BN_options;
-+BN_print;
-+BN_print_fp;
-+BN_pseudo_rand;
-+BN_pseudo_rand_range;
-+BN_rand;
-+BN_rand_range;
-+BN_reciprocal;
-+BN_rshift;
-+BN_rshift1;
-+BN_set_bit;
-+BN_set_negative;
-+BN_set_params;
-+BN_set_word;
-+BN_sqr;
-+BN_sub;
-+BN_sub_word;
-+BN_swap;
-+BN_to_ASN1_ENUMERATED;
-+BN_to_ASN1_INTEGER;
-+BN_uadd;
-+BN_ucmp;
-+BN_usub;
-+BN_value_one;
-+BN_version;
-+BUF_MEM_free;
-+BUF_MEM_grow;
-+BUF_MEM_grow_clean;
-+BUF_MEM_new;
-+BUF_memdup;
-+BUF_strdup;
-+BUF_strlcat;
-+BUF_strlcpy;
-+BUF_strndup;
-+CAST_S_table0;
-+CAST_S_table1;
-+CAST_S_table2;
-+CAST_S_table3;
-+CAST_S_table4;
-+CAST_S_table5;
-+CAST_S_table6;
-+CAST_S_table7;
-+CAST_cbc_encrypt;
-+CAST_cfb64_encrypt;
-+CAST_decrypt;
-+CAST_ecb_encrypt;
-+CAST_encrypt;
-+CAST_ofb64_encrypt;
-+CAST_set_key;
-+CAST_version;
-+CBIGNUM_it;
-+CERTIFICATEPOLICIES_free;
-+CERTIFICATEPOLICIES_it;
-+CERTIFICATEPOLICIES_new;
-+COMP_CTX_free;
-+COMP_CTX_new;
-+COMP_compress_block;
-+COMP_expand_block;
-+COMP_rle;
-+COMP_zlib;
-+CONF_def_version;
-+CONF_dump_bio;
-+CONF_dump_fp;
-+CONF_free;
-+CONF_get1_default_config_file;
-+CONF_get_number;
-+CONF_get_section;
-+CONF_get_string;
-+CONF_imodule_get_flags;
-+CONF_imodule_get_module;
-+CONF_imodule_get_name;
-+CONF_imodule_get_usr_data;
-+CONF_imodule_get_value;
-+CONF_imodule_set_flags;
-+CONF_imodule_set_usr_data;
-+CONF_load;
-+CONF_load_bio;
-+CONF_load_fp;
-+CONF_module_add;
-+CONF_module_get_usr_data;
-+CONF_module_set_usr_data;
-+CONF_modules_finish;
-+CONF_modules_free;
-+CONF_modules_load;
-+CONF_modules_load_file;
-+CONF_modules_unload;
-+CONF_parse_list;
-+CONF_set_default_method;
-+CONF_set_nconf;
-+CONF_version;
-+CRL_DIST_POINTS_free;
-+CRL_DIST_POINTS_it;
-+CRL_DIST_POINTS_new;
-+CRYPTO_add_lock;
-+CRYPTO_cleanup_all_ex_data;
-+CRYPTO_dbg_free;
-+CRYPTO_dbg_get_options;
-+CRYPTO_dbg_malloc;
-+CRYPTO_dbg_realloc;
-+CRYPTO_dbg_set_options;
-+CRYPTO_destroy_dynlockid;
-+CRYPTO_dup_ex_data;
-+CRYPTO_ex_data_new_class;
-+CRYPTO_free;
-+CRYPTO_free_ex_data;
-+CRYPTO_free_locked;
-+CRYPTO_get_add_lock_callback;
-+CRYPTO_get_dynlock_create_callback;
-+CRYPTO_get_dynlock_destroy_callback;
-+CRYPTO_get_dynlock_lock_callback;
-+CRYPTO_get_dynlock_value;
-+CRYPTO_get_ex_data;
-+CRYPTO_get_ex_data_implementation;
-+CRYPTO_get_ex_new_index;
-+CRYPTO_get_id_callback;
-+CRYPTO_get_lock_name;
-+CRYPTO_get_locked_mem_ex_functions;
-+CRYPTO_get_locked_mem_functions;
-+CRYPTO_get_locking_callback;
-+CRYPTO_get_mem_debug_functions;
-+CRYPTO_get_mem_debug_options;
-+CRYPTO_get_mem_ex_functions;
-+CRYPTO_get_mem_functions;
-+CRYPTO_get_new_dynlockid;
-+CRYPTO_get_new_lockid;
-+CRYPTO_is_mem_check_on;
-+CRYPTO_lock;
-+CRYPTO_malloc;
-+CRYPTO_malloc_locked;
-+CRYPTO_mem_ctrl;
-+CRYPTO_mem_leaks;
-+CRYPTO_mem_leaks_cb;
-+CRYPTO_mem_leaks_fp;
-+CRYPTO_new_ex_data;
-+CRYPTO_num_locks;
-+CRYPTO_pop_info;
-+CRYPTO_push_info_;
-+CRYPTO_realloc;
-+CRYPTO_realloc_clean;
-+CRYPTO_remalloc;
-+CRYPTO_remove_all_info;
-+CRYPTO_set_add_lock_callback;
-+CRYPTO_set_dynlock_create_callback;
-+CRYPTO_set_dynlock_destroy_callback;
-+CRYPTO_set_dynlock_lock_callback;
-+CRYPTO_set_ex_data;
-+CRYPTO_set_ex_data_implementation;
-+CRYPTO_set_id_callback;
-+CRYPTO_set_locked_mem_ex_functions;
-+CRYPTO_set_locked_mem_functions;
-+CRYPTO_set_locking_callback;
-+CRYPTO_set_mem_debug_functions;
-+CRYPTO_set_mem_debug_options;
-+CRYPTO_set_mem_ex_functions;
-+CRYPTO_set_mem_functions;
-+CRYPTO_thread_id;
-+DES_SPtrans;
-+DES_cbc_cksum;
-+DES_cbc_encrypt;
-+DES_cfb64_encrypt;
-+DES_cfb_encrypt;
-+DES_check_key_parity;
-+DES_crypt;
-+DES_decrypt3;
-+DES_ecb3_encrypt;
-+DES_ecb_encrypt;
-+DES_ede3_cbc_encrypt;
-+DES_ede3_cbcm_encrypt;
-+DES_ede3_cfb64_encrypt;
-+DES_ede3_cfb_encrypt;
-+DES_ede3_ofb64_encrypt;
-+DES_enc_read;
-+DES_enc_write;
-+DES_encrypt1;
-+DES_encrypt2;
-+DES_encrypt3;
-+DES_fcrypt;
-+DES_is_weak_key;
-+DES_key_sched;
-+DES_ncbc_encrypt;
-+DES_ofb64_encrypt;
-+DES_ofb_encrypt;
-+DES_options;
-+DES_pcbc_encrypt;
-+DES_quad_cksum;
-+DES_random_key;
-+DES_read_2passwords;
-+DES_read_password;
-+DES_set_key;
-+DES_set_key_checked;
-+DES_set_key_unchecked;
-+DES_set_odd_parity;
-+DES_string_to_2keys;
-+DES_string_to_key;
-+DES_xcbc_encrypt;
-+DES_xwhite_in2out;
-+DH_OpenSSL;
-+DH_check;
-+DH_check_pub_key;
-+DH_compute_key;
-+DH_free;
-+DH_generate_key;
-+DH_generate_parameters;
-+DH_generate_parameters_ex;
-+DH_get_default_method;
-+DH_get_ex_data;
-+DH_get_ex_new_index;
-+DH_new;
-+DH_new_method;
-+DH_set_default_method;
-+DH_set_ex_data;
-+DH_set_method;
-+DH_size;
-+DH_up_ref;
-+DH_version;
-+DHparams_it;
-+DHparams_print;
-+DHparams_print_fp;
-+DIRECTORYSTRING_free;
-+DIRECTORYSTRING_it;
-+DIRECTORYSTRING_new;
-+DISPLAYTEXT_free;
-+DISPLAYTEXT_it;
-+DISPLAYTEXT_new;
-+DIST_POINT_NAME_free;
-+DIST_POINT_NAME_it;
-+DIST_POINT_NAME_new;
-+DIST_POINT_free;
-+DIST_POINT_it;
-+DIST_POINT_new;
-+DSAPrivateKey_it;
-+DSAPublicKey_it;
-+DSA_OpenSSL;
-+DSA_SIG_free;
-+DSA_SIG_it;
-+DSA_SIG_new;
-+DSA_do_sign;
-+DSA_do_verify;
-+DSA_dup_DH;
-+DSA_free;
-+DSA_generate_key;
-+DSA_generate_parameters;
-+DSA_generate_parameters_ex;
-+DSA_get_default_method;
-+DSA_get_ex_data;
-+DSA_get_ex_new_index;
-+DSA_new;
-+DSA_new_method;
-+DSA_print;
-+DSA_print_fp;
-+DSA_set_default_method;
-+DSA_set_ex_data;
-+DSA_set_method;
-+DSA_sign;
-+DSA_sign_setup;
-+DSA_size;
-+DSA_up_ref;
-+DSA_verify;
-+DSA_version;
-+DSAparams_it;
-+DSAparams_print;
-+DSAparams_print_fp;
-+DSO_METHOD_dl;
-+DSO_METHOD_dlfcn;
-+DSO_METHOD_null;
-+DSO_METHOD_openssl;
-+DSO_METHOD_vms;
-+DSO_METHOD_win32;
-+DSO_bind_func;
-+DSO_bind_var;
-+DSO_convert_filename;
-+DSO_ctrl;
-+DSO_flags;
-+DSO_free;
-+DSO_get_default_method;
-+DSO_get_filename;
-+DSO_get_loaded_filename;
-+DSO_get_method;
-+DSO_load;
-+DSO_merge;
-+DSO_new;
-+DSO_new_method;
-+DSO_set_default_method;
-+DSO_set_filename;
-+DSO_set_method;
-+DSO_set_name_converter;
-+DSO_up_ref;
-+ECDH_OpenSSL;
-+ECDH_compute_key;
-+ECDH_get_default_method;
-+ECDH_get_ex_data;
-+ECDH_get_ex_new_index;
-+ECDH_set_default_method;
-+ECDH_set_ex_data;
-+ECDH_set_method;
-+ECDH_version;
-+ECDSA_OpenSSL;
-+ECDSA_SIG_free;
-+ECDSA_SIG_it;
-+ECDSA_SIG_new;
-+ECDSA_do_sign;
-+ECDSA_do_sign_ex;
-+ECDSA_do_verify;
-+ECDSA_get_default_method;
-+ECDSA_get_ex_data;
-+ECDSA_get_ex_new_index;
-+ECDSA_set_default_method;
-+ECDSA_set_ex_data;
-+ECDSA_set_method;
-+ECDSA_sign;
-+ECDSA_sign_ex;
-+ECDSA_sign_setup;
-+ECDSA_size;
-+ECDSA_verify;
-+ECDSA_version;
-+ECPARAMETERS_free;
-+ECPARAMETERS_it;
-+ECPARAMETERS_new;
-+ECPKPARAMETERS_free;
-+ECPKPARAMETERS_it;
-+ECPKPARAMETERS_new;
-+ECPKParameters_print;
-+ECPKParameters_print_fp;
-+ECParameters_print;
-+ECParameters_print_fp;
-+EC_EX_DATA_clear_free_all_data;
-+EC_EX_DATA_clear_free_data;
-+EC_EX_DATA_free_all_data;
-+EC_EX_DATA_free_data;
-+EC_EX_DATA_get_data;
-+EC_EX_DATA_set_data;
-+EC_GF2m_simple_method;
-+EC_GFp_mont_method;
-+EC_GFp_nist_method;
-+EC_GFp_simple_method;
-+EC_GROUP_check;
-+EC_GROUP_check_discriminant;
-+EC_GROUP_clear_free;
-+EC_GROUP_cmp;
-+EC_GROUP_copy;
-+EC_GROUP_dup;
-+EC_GROUP_free;
-+EC_GROUP_get0_generator;
-+EC_GROUP_get0_seed;
-+EC_GROUP_get_asn1_flag;
-+EC_GROUP_get_basis_type;
-+EC_GROUP_get_cofactor;
-+EC_GROUP_get_curve_GF2m;
-+EC_GROUP_get_curve_GFp;
-+EC_GROUP_get_curve_name;
-+EC_GROUP_get_degree;
-+EC_GROUP_get_order;
-+EC_GROUP_get_pentanomial_basis;
-+EC_GROUP_get_point_conversion_form;
-+EC_GROUP_get_seed_len;
-+EC_GROUP_get_trinomial_basis;
-+EC_GROUP_have_precompute_mult;
-+EC_GROUP_method_of;
-+EC_GROUP_new;
-+EC_GROUP_new_by_curve_name;
-+EC_GROUP_new_curve_GF2m;
-+EC_GROUP_new_curve_GFp;
-+EC_GROUP_precompute_mult;
-+EC_GROUP_set_asn1_flag;
-+EC_GROUP_set_curve_GF2m;
-+EC_GROUP_set_curve_GFp;
-+EC_GROUP_set_curve_name;
-+EC_GROUP_set_generator;
-+EC_GROUP_set_point_conversion_form;
-+EC_GROUP_set_seed;
-+EC_KEY_check_key;
-+EC_KEY_copy;
-+EC_KEY_dup;
-+EC_KEY_free;
-+EC_KEY_generate_key;
-+EC_KEY_get0_group;
-+EC_KEY_get0_private_key;
-+EC_KEY_get0_public_key;
-+EC_KEY_get_conv_form;
-+EC_KEY_get_enc_flags;
-+EC_KEY_get_key_method_data;
-+EC_KEY_insert_key_method_data;
-+EC_KEY_new;
-+EC_KEY_new_by_curve_name;
-+EC_KEY_precompute_mult;
-+EC_KEY_print;
-+EC_KEY_print_fp;
-+EC_KEY_set_asn1_flag;
-+EC_KEY_set_conv_form;
-+EC_KEY_set_enc_flags;
-+EC_KEY_set_group;
-+EC_KEY_set_private_key;
-+EC_KEY_set_public_key;
-+EC_KEY_up_ref;
-+EC_METHOD_get_field_type;
-+EC_POINT_add;
-+EC_POINT_bn2point;
-+EC_POINT_clear_free;
-+EC_POINT_cmp;
-+EC_POINT_copy;
-+EC_POINT_dbl;
-+EC_POINT_dup;
-+EC_POINT_free;
-+EC_POINT_get_Jprojective_coordinates_GFp;
-+EC_POINT_get_affine_coordinates_GF2m;
-+EC_POINT_get_affine_coordinates_GFp;
-+EC_POINT_hex2point;
-+EC_POINT_invert;
-+EC_POINT_is_at_infinity;
-+EC_POINT_is_on_curve;
-+EC_POINT_make_affine;
-+EC_POINT_method_of;
-+EC_POINT_mul;
-+EC_POINT_new;
-+EC_POINT_oct2point;
-+EC_POINT_point2bn;
-+EC_POINT_point2hex;
-+EC_POINT_point2oct;
-+EC_POINT_set_Jprojective_coordinates_GFp;
-+EC_POINT_set_affine_coordinates_GF2m;
-+EC_POINT_set_affine_coordinates_GFp;
-+EC_POINT_set_compressed_coordinates_GF2m;
-+EC_POINT_set_compressed_coordinates_GFp;
-+EC_POINT_set_to_infinity;
-+EC_POINTs_make_affine;
-+EC_POINTs_mul;
-+EC_PRIVATEKEY_free;
-+EC_PRIVATEKEY_it;
-+EC_PRIVATEKEY_new;
-+EC_get_builtin_curves;
-+EDIPARTYNAME_free;
-+EDIPARTYNAME_it;
-+EDIPARTYNAME_new;
-+ENGINE_add;
-+ENGINE_add_conf_module;
-+ENGINE_by_id;
-+ENGINE_cleanup;
-+ENGINE_cmd_is_executable;
-+ENGINE_ctrl;
-+ENGINE_ctrl_cmd;
-+ENGINE_ctrl_cmd_string;
-+ENGINE_finish;
-+ENGINE_free;
-+ENGINE_get_DH;
-+ENGINE_get_DSA;
-+ENGINE_get_ECDH;
-+ENGINE_get_ECDSA;
-+ENGINE_get_RAND;
-+ENGINE_get_RSA;
-+ENGINE_get_STORE;
-+ENGINE_get_cipher;
-+ENGINE_get_cipher_engine;
-+ENGINE_get_ciphers;
-+ENGINE_get_cmd_defns;
-+ENGINE_get_ctrl_function;
-+ENGINE_get_default_DH;
-+ENGINE_get_default_DSA;
-+ENGINE_get_default_ECDH;
-+ENGINE_get_default_ECDSA;
-+ENGINE_get_default_RAND;
-+ENGINE_get_default_RSA;
-+ENGINE_get_destroy_function;
-+ENGINE_get_digest;
-+ENGINE_get_digest_engine;
-+ENGINE_get_digests;
-+ENGINE_get_ex_data;
-+ENGINE_get_ex_new_index;
-+ENGINE_get_finish_function;
-+ENGINE_get_first;
-+ENGINE_get_flags;
-+ENGINE_get_id;
-+ENGINE_get_init_function;
-+ENGINE_get_last;
-+ENGINE_get_load_privkey_function;
-+ENGINE_get_load_pubkey_function;
-+ENGINE_get_name;
-+ENGINE_get_next;
-+ENGINE_get_prev;
-+ENGINE_get_static_state;
-+ENGINE_get_table_flags;
-+ENGINE_init;
-+ENGINE_load_builtin_engines;
-+ENGINE_load_cryptodev;
-+ENGINE_load_dynamic;
-+ENGINE_load_openssl;
-+ENGINE_load_padlock;
-+ENGINE_load_private_key;
-+ENGINE_load_public_key;
-+ENGINE_new;
-+ENGINE_register_DH;
-+ENGINE_register_DSA;
-+ENGINE_register_ECDH;
-+ENGINE_register_ECDSA;
-+ENGINE_register_RAND;
-+ENGINE_register_RSA;
-+ENGINE_register_STORE;
-+ENGINE_register_all_DH;
-+ENGINE_register_all_DSA;
-+ENGINE_register_all_ECDH;
-+ENGINE_register_all_ECDSA;
-+ENGINE_register_all_RAND;
-+ENGINE_register_all_RSA;
-+ENGINE_register_all_STORE;
-+ENGINE_register_all_ciphers;
-+ENGINE_register_all_complete;
-+ENGINE_register_all_digests;
-+ENGINE_register_ciphers;
-+ENGINE_register_complete;
-+ENGINE_register_digests;
-+ENGINE_remove;
-+ENGINE_set_DH;
-+ENGINE_set_DSA;
-+ENGINE_set_ECDH;
-+ENGINE_set_ECDSA;
-+ENGINE_set_RAND;
-+ENGINE_set_RSA;
-+ENGINE_set_STORE;
-+ENGINE_set_ciphers;
-+ENGINE_set_cmd_defns;
-+ENGINE_set_ctrl_function;
-+ENGINE_set_default;
-+ENGINE_set_default_DH;
-+ENGINE_set_default_DSA;
-+ENGINE_set_default_ECDH;
-+ENGINE_set_default_ECDSA;
-+ENGINE_set_default_RAND;
-+ENGINE_set_default_RSA;
-+ENGINE_set_default_ciphers;
-+ENGINE_set_default_digests;
-+ENGINE_set_default_string;
-+ENGINE_set_destroy_function;
-+ENGINE_set_digests;
-+ENGINE_set_ex_data;
-+ENGINE_set_finish_function;
-+ENGINE_set_flags;
-+ENGINE_set_id;
-+ENGINE_set_init_function;
-+ENGINE_set_load_privkey_function;
-+ENGINE_set_load_pubkey_function;
-+ENGINE_set_name;
-+ENGINE_set_table_flags;
-+ENGINE_unregister_DH;
-+ENGINE_unregister_DSA;
-+ENGINE_unregister_ECDH;
-+ENGINE_unregister_ECDSA;
-+ENGINE_unregister_RAND;
-+ENGINE_unregister_RSA;
-+ENGINE_unregister_STORE;
-+ENGINE_unregister_ciphers;
-+ENGINE_unregister_digests;
-+ENGINE_up_ref;
-+ERR_add_error_data;
-+ERR_clear_error;
-+ERR_error_string;
-+ERR_error_string_n;
-+ERR_free_strings;
-+ERR_func_error_string;
-+ERR_get_err_state_table;
-+ERR_get_error;
-+ERR_get_error_line;
-+ERR_get_error_line_data;
-+ERR_get_implementation;
-+ERR_get_next_error_library;
-+ERR_get_state;
-+ERR_get_string_table;
-+ERR_lib_error_string;
-+ERR_load_ASN1_strings;
-+ERR_load_BIO_strings;
-+ERR_load_BN_strings;
-+ERR_load_BUF_strings;
-+ERR_load_COMP_strings;
-+ERR_load_CONF_strings;
-+ERR_load_CRYPTO_strings;
-+ERR_load_DH_strings;
-+ERR_load_DSA_strings;
-+ERR_load_DSO_strings;
-+ERR_load_ECDH_strings;
-+ERR_load_ECDSA_strings;
-+ERR_load_EC_strings;
-+ERR_load_ENGINE_strings;
-+ERR_load_ERR_strings;
-+ERR_load_EVP_strings;
-+ERR_load_OBJ_strings;
-+ERR_load_OCSP_strings;
-+ERR_load_PEM_strings;
-+ERR_load_PKCS12_strings;
-+ERR_load_PKCS7_strings;
-+ERR_load_RAND_strings;
-+ERR_load_RSA_strings;
-+ERR_load_STORE_strings;
-+ERR_load_UI_strings;
-+ERR_load_X509V3_strings;
-+ERR_load_X509_strings;
-+ERR_load_crypto_strings;
-+ERR_load_strings;
-+ERR_peek_error;
-+ERR_peek_error_line;
-+ERR_peek_error_line_data;
-+ERR_peek_last_error;
-+ERR_peek_last_error_line;
-+ERR_peek_last_error_line_data;
-+ERR_pop_to_mark;
-+ERR_print_errors;
-+ERR_print_errors_cb;
-+ERR_print_errors_fp;
-+ERR_put_error;
-+ERR_reason_error_string;
-+ERR_release_err_state_table;
-+ERR_remove_state;
-+ERR_set_error_data;
-+ERR_set_implementation;
-+ERR_set_mark;
-+ERR_unload_strings;
-+EVP_BytesToKey;
-+EVP_CIPHER_CTX_block_size;
-+EVP_CIPHER_CTX_cipher;
-+EVP_CIPHER_CTX_cleanup;
-+EVP_CIPHER_CTX_ctrl;
-+EVP_CIPHER_CTX_flags;
-+EVP_CIPHER_CTX_free;
-+EVP_CIPHER_CTX_get_app_data;
-+EVP_CIPHER_CTX_init;
-+EVP_CIPHER_CTX_iv_length;
-+EVP_CIPHER_CTX_key_length;
-+EVP_CIPHER_CTX_new;
-+EVP_CIPHER_CTX_nid;
-+EVP_CIPHER_CTX_rand_key;
-+EVP_CIPHER_CTX_set_app_data;
-+EVP_CIPHER_CTX_set_key_length;
-+EVP_CIPHER_CTX_set_padding;
-+EVP_CIPHER_asn1_to_param;
-+EVP_CIPHER_block_size;
-+EVP_CIPHER_flags;
-+EVP_CIPHER_get_asn1_iv;
-+EVP_CIPHER_iv_length;
-+EVP_CIPHER_key_length;
-+EVP_CIPHER_nid;
-+EVP_CIPHER_param_to_asn1;
-+EVP_CIPHER_set_asn1_iv;
-+EVP_CIPHER_type;
-+EVP_Cipher;
-+EVP_CipherFinal;
-+EVP_CipherFinal_ex;
-+EVP_CipherInit;
-+EVP_CipherInit_ex;
-+EVP_CipherUpdate;
-+EVP_DecodeBlock;
-+EVP_DecodeFinal;
-+EVP_DecodeInit;
-+EVP_DecodeUpdate;
-+EVP_DecryptFinal;
-+EVP_DecryptFinal_ex;
-+EVP_DecryptInit;
-+EVP_DecryptInit_ex;
-+EVP_DecryptUpdate;
-+EVP_Digest;
-+EVP_DigestFinal;
-+EVP_DigestFinal_ex;
-+EVP_DigestInit;
-+EVP_DigestInit_ex;
-+EVP_DigestUpdate;
-+EVP_EncodeBlock;
-+EVP_EncodeFinal;
-+EVP_EncodeInit;
-+EVP_EncodeUpdate;
-+EVP_EncryptFinal;
-+EVP_EncryptFinal_ex;
-+EVP_EncryptInit;
-+EVP_EncryptInit_ex;
-+EVP_EncryptUpdate;
-+EVP_MD_CTX_cleanup;
-+EVP_MD_CTX_clear_flags;
-+EVP_MD_CTX_copy;
-+EVP_MD_CTX_copy_ex;
-+EVP_MD_CTX_create;
-+EVP_MD_CTX_destroy;
-+EVP_MD_CTX_init;
-+EVP_MD_CTX_md;
-+EVP_MD_CTX_set_flags;
-+EVP_MD_CTX_test_flags;
-+EVP_MD_block_size;
-+EVP_MD_pkey_type;
-+EVP_MD_size;
-+EVP_MD_type;
-+EVP_OpenFinal;
-+EVP_OpenInit;
-+EVP_PBE_CipherInit;
-+EVP_PBE_alg_add;
-+EVP_PBE_cleanup;
-+EVP_PKCS82PKEY;
-+EVP_PKEY2PKCS8;
-+EVP_PKEY2PKCS8_broken;
-+EVP_PKEY_add1_attr;
-+EVP_PKEY_add1_attr_by_NID;
-+EVP_PKEY_add1_attr_by_OBJ;
-+EVP_PKEY_add1_attr_by_txt;
-+EVP_PKEY_assign;
-+EVP_PKEY_bits;
-+EVP_PKEY_cmp;
-+EVP_PKEY_cmp_parameters;
-+EVP_PKEY_copy_parameters;
-+EVP_PKEY_decrypt;
-+EVP_PKEY_delete_attr;
-+EVP_PKEY_encrypt;
-+EVP_PKEY_free;
-+EVP_PKEY_get1_DH;
-+EVP_PKEY_get1_DSA;
-+EVP_PKEY_get1_EC_KEY;
-+EVP_PKEY_get1_RSA;
-+EVP_PKEY_get_attr;
-+EVP_PKEY_get_attr_by_NID;
-+EVP_PKEY_get_attr_by_OBJ;
-+EVP_PKEY_get_attr_count;
-+EVP_PKEY_missing_parameters;
-+EVP_PKEY_new;
-+EVP_PKEY_save_parameters;
-+EVP_PKEY_set1_DH;
-+EVP_PKEY_set1_DSA;
-+EVP_PKEY_set1_EC_KEY;
-+EVP_PKEY_set1_RSA;
-+EVP_PKEY_size;
-+EVP_PKEY_type;
-+EVP_SealFinal;
-+EVP_SealInit;
-+EVP_SignFinal;
-+EVP_VerifyFinal;
-+EVP_add_cipher;
-+EVP_add_digest;
-+EVP_aes_128_cbc;
-+EVP_aes_128_cfb;
-+EVP_aes_128_cfb1;
-+EVP_aes_128_cfb128;
-+EVP_aes_128_cfb8;
-+EVP_aes_128_ecb;
-+EVP_aes_128_ofb;
-+EVP_aes_192_cbc;
-+EVP_aes_192_cfb;
-+EVP_aes_192_cfb1;
-+EVP_aes_192_cfb128;
-+EVP_aes_192_cfb8;
-+EVP_aes_192_ecb;
-+EVP_aes_192_ofb;
-+EVP_aes_256_cbc;
-+EVP_aes_256_cfb;
-+EVP_aes_256_cfb1;
-+EVP_aes_256_cfb128;
-+EVP_aes_256_cfb8;
-+EVP_aes_256_ecb;
-+EVP_aes_256_ofb;
-+EVP_bf_cbc;
-+EVP_bf_cfb;
-+EVP_bf_cfb64;
-+EVP_bf_ecb;
-+EVP_bf_ofb;
-+EVP_cast5_cbc;
-+EVP_cast5_cfb;
-+EVP_cast5_cfb64;
-+EVP_cast5_ecb;
-+EVP_cast5_ofb;
-+EVP_cleanup;
-+EVP_des_cbc;
-+EVP_des_cfb;
-+EVP_des_cfb1;
-+EVP_des_cfb64;
-+EVP_des_cfb8;
-+EVP_des_ecb;
-+EVP_des_ede;
-+EVP_des_ede3;
-+EVP_des_ede3_cbc;
-+EVP_des_ede3_cfb;
-+EVP_des_ede3_cfb1;
-+EVP_des_ede3_cfb64;
-+EVP_des_ede3_cfb8;
-+EVP_des_ede3_ecb;
-+EVP_des_ede3_ofb;
-+EVP_des_ede_cbc;
-+EVP_des_ede_cfb;
-+EVP_des_ede_cfb64;
-+EVP_des_ede_ecb;
-+EVP_des_ede_ofb;
-+EVP_des_ofb;
-+EVP_desx_cbc;
-+EVP_dss;
-+EVP_dss1;
-+EVP_ecdsa;
-+EVP_enc_null;
-+EVP_get_cipherbyname;
-+EVP_get_digestbyname;
-+EVP_get_pw_prompt;
-+EVP_idea_cbc;
-+EVP_idea_cfb;
-+EVP_idea_cfb64;
-+EVP_idea_ecb;
-+EVP_idea_ofb;
-+EVP_md2;
-+EVP_md4;
-+EVP_md5;
-+EVP_md_null;
-+EVP_rc2_40_cbc;
-+EVP_rc2_64_cbc;
-+EVP_rc2_cbc;
-+EVP_rc2_cfb;
-+EVP_rc2_cfb64;
-+EVP_rc2_ecb;
-+EVP_rc2_ofb;
-+EVP_rc4;
-+EVP_rc4_40;
-+EVP_read_pw_string;
-+EVP_ripemd160;
-+EVP_set_pw_prompt;
-+EVP_sha;
-+EVP_sha1;
-+EVP_sha224;
-+EVP_sha256;
-+EVP_sha384;
-+EVP_sha512;
-+EVP_version;
-+EXTENDED_KEY_USAGE_free;
-+EXTENDED_KEY_USAGE_it;
-+EXTENDED_KEY_USAGE_new;
-+GENERAL_NAMES_free;
-+GENERAL_NAMES_it;
-+GENERAL_NAMES_new;
-+GENERAL_NAME_free;
-+GENERAL_NAME_it;
-+GENERAL_NAME_new;
-+GENERAL_NAME_print;
-+GENERAL_SUBTREE_free;
-+GENERAL_SUBTREE_it;
-+GENERAL_SUBTREE_new;
-+HMAC;
-+HMAC_CTX_cleanup;
-+HMAC_CTX_init;
-+HMAC_Final;
-+HMAC_Init;
-+HMAC_Init_ex;
-+HMAC_Update;
-+IDEA_version;
-+KRB5_APREQBODY_free;
-+KRB5_APREQBODY_it;
-+KRB5_APREQBODY_new;
-+KRB5_APREQ_free;
-+KRB5_APREQ_it;
-+KRB5_APREQ_new;
-+KRB5_AUTHDATA_free;
-+KRB5_AUTHDATA_it;
-+KRB5_AUTHDATA_new;
-+KRB5_AUTHENTBODY_free;
-+KRB5_AUTHENTBODY_it;
-+KRB5_AUTHENTBODY_new;
-+KRB5_AUTHENT_free;
-+KRB5_AUTHENT_it;
-+KRB5_AUTHENT_new;
-+KRB5_CHECKSUM_free;
-+KRB5_CHECKSUM_it;
-+KRB5_CHECKSUM_new;
-+KRB5_ENCDATA_free;
-+KRB5_ENCDATA_it;
-+KRB5_ENCDATA_new;
-+KRB5_ENCKEY_free;
-+KRB5_ENCKEY_it;
-+KRB5_ENCKEY_new;
-+KRB5_PRINCNAME_free;
-+KRB5_PRINCNAME_it;
-+KRB5_PRINCNAME_new;
-+KRB5_TICKET_free;
-+KRB5_TICKET_it;
-+KRB5_TICKET_new;
-+KRB5_TKTBODY_free;
-+KRB5_TKTBODY_it;
-+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8o;
-+LONG_it;
-+MD2;
-+MD2_Final;
-+MD2_Init;
-+MD2_Update;
-+MD2_options;
-+MD2_version;
-+MD4;
-+MD4_Final;
-+MD4_Init;
-+MD4_Transform;
-+MD4_Update;
-+MD4_version;
-+MD5;
-+MD5_Final;
-+MD5_Init;
-+MD5_Transform;
-+MD5_Update;
-+MD5_version;
-+MGF1;
-+NAME_CONSTRAINTS_free;
-+NAME_CONSTRAINTS_it;
-+NAME_CONSTRAINTS_new;
-+NCONF_WIN32;
-+NCONF_default;
-+NCONF_dump_bio;
-+NCONF_dump_fp;
-+NCONF_free;
-+NCONF_free_data;
-+NCONF_get_number_e;
-+NCONF_get_section;
-+NCONF_get_string;
-+NCONF_load;
-+NCONF_load_bio;
-+NCONF_load_fp;
-+NCONF_new;
-+NETSCAPE_CERT_SEQUENCE_free;
-+NETSCAPE_CERT_SEQUENCE_it;
-+NETSCAPE_CERT_SEQUENCE_new;
-+NETSCAPE_ENCRYPTED_PKEY_free;
-+NETSCAPE_ENCRYPTED_PKEY_it;
-+NETSCAPE_ENCRYPTED_PKEY_new;
-+NETSCAPE_PKEY_free;
-+NETSCAPE_PKEY_it;
-+NETSCAPE_PKEY_new;
-+NETSCAPE_SPKAC_free;
-+NETSCAPE_SPKAC_it;
-+NETSCAPE_SPKAC_new;
-+NETSCAPE_SPKI_b64_decode;
-+NETSCAPE_SPKI_b64_encode;
-+NETSCAPE_SPKI_free;
-+NETSCAPE_SPKI_get_pubkey;
-+NETSCAPE_SPKI_it;
-+NETSCAPE_SPKI_new;
-+NETSCAPE_SPKI_print;
-+NETSCAPE_SPKI_set_pubkey;
-+NETSCAPE_SPKI_sign;
-+NETSCAPE_SPKI_verify;
-+NOTICEREF_free;
-+NOTICEREF_it;
-+NOTICEREF_new;
-+OBJ_NAME_add;
-+OBJ_NAME_cleanup;
-+OBJ_NAME_do_all;
-+OBJ_NAME_do_all_sorted;
-+OBJ_NAME_get;
-+OBJ_NAME_init;
-+OBJ_NAME_new_index;
-+OBJ_NAME_remove;
-+OBJ_add_object;
-+OBJ_bsearch;
-+OBJ_bsearch_ex;
-+OBJ_cleanup;
-+OBJ_cmp;
-+OBJ_create;
-+OBJ_create_objects;
-+OBJ_dup;
-+OBJ_ln2nid;
-+OBJ_new_nid;
-+OBJ_nid2ln;
-+OBJ_nid2obj;
-+OBJ_nid2sn;
-+OBJ_obj2nid;
-+OBJ_obj2txt;
-+OBJ_sn2nid;
-+OBJ_txt2nid;
-+OBJ_txt2obj;
-+OCSP_BASICRESP_add1_ext_i2d;
-+OCSP_BASICRESP_add_ext;
-+OCSP_BASICRESP_delete_ext;
-+OCSP_BASICRESP_free;
-+OCSP_BASICRESP_get1_ext_d2i;
-+OCSP_BASICRESP_get_ext;
-+OCSP_BASICRESP_get_ext_by_NID;
-+OCSP_BASICRESP_get_ext_by_OBJ;
-+OCSP_BASICRESP_get_ext_by_critical;
-+OCSP_BASICRESP_get_ext_count;
-+OCSP_BASICRESP_it;
-+OCSP_BASICRESP_new;
-+OCSP_CERTID_free;
-+OCSP_CERTID_it;
-+OCSP_CERTID_new;
-+OCSP_CERTSTATUS_free;
-+OCSP_CERTSTATUS_it;
-+OCSP_CERTSTATUS_new;
-+OCSP_CRLID_free;
-+OCSP_CRLID_it;
-+OCSP_CRLID_new;
-+OCSP_ONEREQ_add1_ext_i2d;
-+OCSP_ONEREQ_add_ext;
-+OCSP_ONEREQ_delete_ext;
-+OCSP_ONEREQ_free;
-+OCSP_ONEREQ_get1_ext_d2i;
-+OCSP_ONEREQ_get_ext;
-+OCSP_ONEREQ_get_ext_by_NID;
-+OCSP_ONEREQ_get_ext_by_OBJ;
-+OCSP_ONEREQ_get_ext_by_critical;
-+OCSP_ONEREQ_get_ext_count;
-+OCSP_ONEREQ_it;
-+OCSP_ONEREQ_new;
-+OCSP_REQINFO_free;
-+OCSP_REQINFO_it;
-+OCSP_REQINFO_new;
-+OCSP_REQUEST_add1_ext_i2d;
-+OCSP_REQUEST_add_ext;
-+OCSP_REQUEST_delete_ext;
-+OCSP_REQUEST_free;
-+OCSP_REQUEST_get1_ext_d2i;
-+OCSP_REQUEST_get_ext;
-+OCSP_REQUEST_get_ext_by_NID;
-+OCSP_REQUEST_get_ext_by_OBJ;
-+OCSP_REQUEST_get_ext_by_critical;
-+OCSP_REQUEST_get_ext_count;
-+OCSP_REQUEST_it;
-+OCSP_REQUEST_new;
-+OCSP_REQUEST_print;
-+OCSP_RESPBYTES_free;
-+OCSP_RESPBYTES_it;
-+OCSP_RESPBYTES_new;
-+OCSP_RESPDATA_free;
-+OCSP_RESPDATA_it;
-+OCSP_RESPDATA_new;
-+OCSP_RESPID_free;
-+OCSP_RESPID_it;
-+OCSP_RESPID_new;
-+OCSP_RESPONSE_free;
-+OCSP_RESPONSE_it;
-+OCSP_RESPONSE_new;
-+OCSP_RESPONSE_print;
-+OCSP_REVOKEDINFO_free;
-+OCSP_REVOKEDINFO_it;
-+OCSP_REVOKEDINFO_new;
-+OCSP_SERVICELOC_free;
-+OCSP_SERVICELOC_it;
-+OCSP_SERVICELOC_new;
-+OCSP_SIGNATURE_free;
-+OCSP_SIGNATURE_it;
-+OCSP_SIGNATURE_new;
-+OCSP_SINGLERESP_add1_ext_i2d;
-+OCSP_SINGLERESP_add_ext;
-+OCSP_SINGLERESP_delete_ext;
-+OCSP_SINGLERESP_free;
-+OCSP_SINGLERESP_get1_ext_d2i;
-+OCSP_SINGLERESP_get_ext;
-+OCSP_SINGLERESP_get_ext_by_NID;
-+OCSP_SINGLERESP_get_ext_by_OBJ;
-+OCSP_SINGLERESP_get_ext_by_critical;
-+OCSP_SINGLERESP_get_ext_count;
-+OCSP_SINGLERESP_it;
-+OCSP_SINGLERESP_new;
-+OCSP_accept_responses_new;
-+OCSP_archive_cutoff_new;
-+OCSP_basic_add1_cert;
-+OCSP_basic_add1_nonce;
-+OCSP_basic_add1_status;
-+OCSP_basic_sign;
-+OCSP_basic_verify;
-+OCSP_cert_id_new;
-+OCSP_cert_status_str;
-+OCSP_cert_to_id;
-+OCSP_check_nonce;
-+OCSP_check_validity;
-+OCSP_copy_nonce;
-+OCSP_crlID_new;
-+OCSP_crl_reason_str;
-+OCSP_id_cmp;
-+OCSP_id_get0_info;
-+OCSP_id_issuer_cmp;
-+OCSP_onereq_get0_id;
-+OCSP_parse_url;
-+OCSP_request_add0_id;
-+OCSP_request_add1_cert;
-+OCSP_request_add1_nonce;
-+OCSP_request_is_signed;
-+OCSP_request_onereq_count;
-+OCSP_request_onereq_get0;
-+OCSP_request_set1_name;
-+OCSP_request_sign;
-+OCSP_request_verify;
-+OCSP_resp_count;
-+OCSP_resp_find;
-+OCSP_resp_find_status;
-+OCSP_resp_get0;
-+OCSP_response_create;
-+OCSP_response_get1_basic;
-+OCSP_response_status;
-+OCSP_response_status_str;
-+OCSP_sendreq_bio;
-+OCSP_single_get0_status;
-+OCSP_url_svcloc_new;
-+OPENSSL_DIR_end;
-+OPENSSL_DIR_read;
-+OPENSSL_NONPIC_relocated;
-+OPENSSL_add_all_algorithms_conf;
-+OPENSSL_add_all_algorithms_noconf;
-+OPENSSL_cleanse;
-+OPENSSL_config;
-+OPENSSL_cpuid_setup;
-+OPENSSL_gmtime;
-+OPENSSL_ia32cap_loc;
-+OPENSSL_isservice;
-+OPENSSL_issetugid;
-+OPENSSL_load_builtin_modules;
-+OPENSSL_memcmp;
-+OPENSSL_no_config;
-+OPENSSL_showfatal;
-+OPENSSL_stderr;
-+OPENSSL_strcasecmp;
-+OPENSSL_strncasecmp;
-+OSSL_DES_version;
-+OSSL_libdes_version;
-+OTHERNAME_free;
-+OTHERNAME_it;
-+OTHERNAME_new;
-+OpenSSLDie;
-+OpenSSL_add_all_ciphers;
-+OpenSSL_add_all_digests;
-+PBE2PARAM_free;
-+PBE2PARAM_it;
-+PBE2PARAM_new;
-+PBEPARAM_free;
-+PBEPARAM_it;
-+PBEPARAM_new;
-+PBKDF2PARAM_free;
-+PBKDF2PARAM_it;
-+PBKDF2PARAM_new;
-+PEM_ASN1_read;
-+PEM_ASN1_read_bio;
-+PEM_ASN1_write;
-+PEM_ASN1_write_bio;
-+PEM_SealFinal;
-+PEM_SealInit;
-+PEM_SealUpdate;
-+PEM_SignFinal;
-+PEM_SignInit;
-+PEM_SignUpdate;
-+PEM_X509_INFO_read;
-+PEM_X509_INFO_read_bio;
-+PEM_X509_INFO_write_bio;
-+PEM_bytes_read_bio;
-+PEM_def_callback;
-+PEM_dek_info;
-+PEM_do_header;
-+PEM_get_EVP_CIPHER_INFO;
-+PEM_proc_type;
-+PEM_read;
-+PEM_read_DHparams;
-+PEM_read_DSAPrivateKey;
-+PEM_read_DSA_PUBKEY;
-+PEM_read_DSAparams;
-+PEM_read_ECPKParameters;
-+PEM_read_ECPrivateKey;
-+PEM_read_EC_PUBKEY;
-+PEM_read_NETSCAPE_CERT_SEQUENCE;
-+PEM_read_PKCS7;
-+PEM_read_PKCS8;
-+PEM_read_PKCS8_PRIV_KEY_INFO;
-+PEM_read_PUBKEY;
-+PEM_read_PrivateKey;
-+PEM_read_RSAPrivateKey;
-+PEM_read_RSAPublicKey;
-+PEM_read_RSA_PUBKEY;
-+PEM_read_X509;
-+PEM_read_X509_AUX;
-+PEM_read_X509_CERT_PAIR;
-+PEM_read_X509_CRL;
-+PEM_read_X509_REQ;
-+PEM_read_bio;
-+PEM_read_bio_DHparams;
-+PEM_read_bio_DSAPrivateKey;
-+PEM_read_bio_DSA_PUBKEY;
-+PEM_read_bio_DSAparams;
-+PEM_read_bio_ECPKParameters;
-+PEM_read_bio_ECPrivateKey;
-+PEM_read_bio_EC_PUBKEY;
-+PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+PEM_read_bio_PKCS7;
-+PEM_read_bio_PKCS8;
-+PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+PEM_read_bio_PUBKEY;
-+PEM_read_bio_PrivateKey;
-+PEM_read_bio_RSAPrivateKey;
-+PEM_read_bio_RSAPublicKey;
-+PEM_read_bio_RSA_PUBKEY;
-+PEM_read_bio_X509;
-+PEM_read_bio_X509_AUX;
-+PEM_read_bio_X509_CERT_PAIR;
-+PEM_read_bio_X509_CRL;
-+PEM_read_bio_X509_REQ;
-+PEM_version;
-+PEM_write;
-+PEM_write_DHparams;
-+PEM_write_DSAPrivateKey;
-+PEM_write_DSA_PUBKEY;
-+PEM_write_DSAparams;
-+PEM_write_ECPKParameters;
-+PEM_write_ECPrivateKey;
-+PEM_write_EC_PUBKEY;
-+PEM_write_NETSCAPE_CERT_SEQUENCE;
-+PEM_write_PKCS7;
-+PEM_write_PKCS8;
-+PEM_write_PKCS8PrivateKey;
-+PEM_write_PKCS8PrivateKey_nid;
-+PEM_write_PKCS8_PRIV_KEY_INFO;
-+PEM_write_PUBKEY;
-+PEM_write_PrivateKey;
-+PEM_write_RSAPrivateKey;
-+PEM_write_RSAPublicKey;
-+PEM_write_RSA_PUBKEY;
-+PEM_write_X509;
-+PEM_write_X509_AUX;
-+PEM_write_X509_CERT_PAIR;
-+PEM_write_X509_CRL;
-+PEM_write_X509_REQ;
-+PEM_write_X509_REQ_NEW;
-+PEM_write_bio;
-+PEM_write_bio_DHparams;
-+PEM_write_bio_DSAPrivateKey;
-+PEM_write_bio_DSA_PUBKEY;
-+PEM_write_bio_DSAparams;
-+PEM_write_bio_ECPKParameters;
-+PEM_write_bio_ECPrivateKey;
-+PEM_write_bio_EC_PUBKEY;
-+PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+PEM_write_bio_PKCS7;
-+PEM_write_bio_PKCS8;
-+PEM_write_bio_PKCS8PrivateKey;
-+PEM_write_bio_PKCS8PrivateKey_nid;
-+PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+PEM_write_bio_PUBKEY;
-+PEM_write_bio_PrivateKey;
-+PEM_write_bio_RSAPrivateKey;
-+PEM_write_bio_RSAPublicKey;
-+PEM_write_bio_RSA_PUBKEY;
-+PEM_write_bio_X509;
-+PEM_write_bio_X509_AUX;
-+PEM_write_bio_X509_CERT_PAIR;
-+PEM_write_bio_X509_CRL;
-+PEM_write_bio_X509_REQ;
-+PEM_write_bio_X509_REQ_NEW;
-+PKCS12_AUTHSAFES_it;
-+PKCS12_BAGS_free;
-+PKCS12_BAGS_it;
-+PKCS12_BAGS_new;
-+PKCS12_MAC_DATA_free;
-+PKCS12_MAC_DATA_it;
-+PKCS12_MAC_DATA_new;
-+PKCS12_MAKE_KEYBAG;
-+PKCS12_MAKE_SHKEYBAG;
-+PKCS12_PBE_add;
-+PKCS12_PBE_keyivgen;
-+PKCS12_SAFEBAGS_it;
-+PKCS12_SAFEBAG_free;
-+PKCS12_SAFEBAG_it;
-+PKCS12_SAFEBAG_new;
-+PKCS12_add_CSPName_asc;
-+PKCS12_add_cert;
-+PKCS12_add_friendlyname_asc;
-+PKCS12_add_friendlyname_uni;
-+PKCS12_add_key;
-+PKCS12_add_localkeyid;
-+PKCS12_add_safe;
-+PKCS12_add_safes;
-+PKCS12_certbag2x509;
-+PKCS12_certbag2x509crl;
-+PKCS12_create;
-+PKCS12_decrypt_skey;
-+PKCS12_free;
-+PKCS12_gen_mac;
-+PKCS12_get_attr_gen;
-+PKCS12_get_friendlyname;
-+PKCS12_init;
-+PKCS12_it;
-+PKCS12_item_decrypt_d2i;
-+PKCS12_item_i2d_encrypt;
-+PKCS12_item_pack_safebag;
-+PKCS12_key_gen_asc;
-+PKCS12_key_gen_uni;
-+PKCS12_new;
-+PKCS12_newpass;
-+PKCS12_pack_authsafes;
-+PKCS12_pack_p7data;
-+PKCS12_pack_p7encdata;
-+PKCS12_parse;
-+PKCS12_pbe_crypt;
-+PKCS12_set_mac;
-+PKCS12_setup_mac;
-+PKCS12_unpack_authsafes;
-+PKCS12_unpack_p7data;
-+PKCS12_unpack_p7encdata;
-+PKCS12_verify_mac;
-+PKCS12_x5092certbag;
-+PKCS12_x509crl2certbag;
-+PKCS1_MGF1;
-+PKCS5_PBE_add;
-+PKCS5_PBE_keyivgen;
-+PKCS5_PBKDF2_HMAC_SHA1;
-+PKCS5_pbe2_set;
-+PKCS5_pbe_set;
-+PKCS5_v2_PBE_keyivgen;
-+PKCS7_ATTR_SIGN_it;
-+PKCS7_ATTR_VERIFY_it;
-+PKCS7_DIGEST_free;
-+PKCS7_DIGEST_it;
-+PKCS7_DIGEST_new;
-+PKCS7_ENCRYPT_free;
-+PKCS7_ENCRYPT_it;
-+PKCS7_ENCRYPT_new;
-+PKCS7_ENC_CONTENT_free;
-+PKCS7_ENC_CONTENT_it;
-+PKCS7_ENC_CONTENT_new;
-+PKCS7_ENVELOPE_free;
-+PKCS7_ENVELOPE_it;
-+PKCS7_ENVELOPE_new;
-+PKCS7_ISSUER_AND_SERIAL_digest;
-+PKCS7_ISSUER_AND_SERIAL_free;
-+PKCS7_ISSUER_AND_SERIAL_it;
-+PKCS7_ISSUER_AND_SERIAL_new;
-+PKCS7_RECIP_INFO_free;
-+PKCS7_RECIP_INFO_it;
-+PKCS7_RECIP_INFO_new;
-+PKCS7_RECIP_INFO_set;
-+PKCS7_SIGNED_free;
-+PKCS7_SIGNED_it;
-+PKCS7_SIGNED_new;
-+PKCS7_SIGNER_INFO_free;
-+PKCS7_SIGNER_INFO_it;
-+PKCS7_SIGNER_INFO_new;
-+PKCS7_SIGNER_INFO_set;
-+PKCS7_SIGN_ENVELOPE_free;
-+PKCS7_SIGN_ENVELOPE_it;
-+PKCS7_SIGN_ENVELOPE_new;
-+PKCS7_add_attrib_smimecap;
-+PKCS7_add_attribute;
-+PKCS7_add_certificate;
-+PKCS7_add_crl;
-+PKCS7_add_recipient;
-+PKCS7_add_recipient_info;
-+PKCS7_add_signature;
-+PKCS7_add_signed_attribute;
-+PKCS7_add_signer;
-+PKCS7_cert_from_signer_info;
-+PKCS7_content_new;
-+PKCS7_ctrl;
-+PKCS7_dataDecode;
-+PKCS7_dataFinal;
-+PKCS7_dataInit;
-+PKCS7_dataVerify;
-+PKCS7_decrypt;
-+PKCS7_digest_from_attributes;
-+PKCS7_dup;
-+PKCS7_encrypt;
-+PKCS7_free;
-+PKCS7_get0_signers;
-+PKCS7_get_attribute;
-+PKCS7_get_issuer_and_serial;
-+PKCS7_get_signed_attribute;
-+PKCS7_get_signer_info;
-+PKCS7_get_smimecap;
-+PKCS7_it;
-+PKCS7_new;
-+PKCS7_set0_type_other;
-+PKCS7_set_attributes;
-+PKCS7_set_cipher;
-+PKCS7_set_content;
-+PKCS7_set_digest;
-+PKCS7_set_signed_attributes;
-+PKCS7_set_type;
-+PKCS7_sign;
-+PKCS7_signatureVerify;
-+PKCS7_simple_smimecap;
-+PKCS7_verify;
-+PKCS8_PRIV_KEY_INFO_free;
-+PKCS8_PRIV_KEY_INFO_it;
-+PKCS8_PRIV_KEY_INFO_new;
-+PKCS8_add_keyusage;
-+PKCS8_decrypt;
-+PKCS8_encrypt;
-+PKCS8_set_broken;
-+PKEY_USAGE_PERIOD_free;
-+PKEY_USAGE_PERIOD_it;
-+PKEY_USAGE_PERIOD_new;
-+POLICYINFO_free;
-+POLICYINFO_it;
-+POLICYINFO_new;
-+POLICYQUALINFO_free;
-+POLICYQUALINFO_it;
-+POLICYQUALINFO_new;
-+POLICY_CONSTRAINTS_free;
-+POLICY_CONSTRAINTS_it;
-+POLICY_CONSTRAINTS_new;
-+POLICY_MAPPINGS_it;
-+POLICY_MAPPING_free;
-+POLICY_MAPPING_it;
-+POLICY_MAPPING_new;
-+PROXY_CERT_INFO_EXTENSION_free;
-+PROXY_CERT_INFO_EXTENSION_it;
-+PROXY_CERT_INFO_EXTENSION_new;
-+PROXY_POLICY_free;
-+PROXY_POLICY_it;
-+PROXY_POLICY_new;
-+RAND_SSLeay;
-+RAND_add;
-+RAND_bytes;
-+RAND_cleanup;
-+RAND_egd;
-+RAND_egd_bytes;
-+RAND_file_name;
-+RAND_get_rand_method;
-+RAND_load_file;
-+RAND_poll;
-+RAND_pseudo_bytes;
-+RAND_query_egd_bytes;
-+RAND_seed;
-+RAND_set_rand_engine;
-+RAND_set_rand_method;
-+RAND_status;
-+RAND_version;
-+RAND_write_file;
-+RC2_cbc_encrypt;
-+RC2_cfb64_encrypt;
-+RC2_decrypt;
-+RC2_ecb_encrypt;
-+RC2_encrypt;
-+RC2_ofb64_encrypt;
-+RC2_set_key;
-+RC2_version;
-+RC4;
-+RC4_options;
-+RC4_set_key;
-+RC4_version;
-+RIPEMD160;
-+RIPEMD160_Final;
-+RIPEMD160_Init;
-+RIPEMD160_Transform;
-+RIPEMD160_Update;
-+RMD160_version;
-+RSAPrivateKey_asn1_meth;
-+RSAPrivateKey_dup;
-+RSAPrivateKey_it;
-+RSAPublicKey_dup;
-+RSAPublicKey_it;
-+RSA_PKCS1_SSLeay;
-+RSA_X931_hash_id;
-+RSA_blinding_off;
-+RSA_blinding_on;
-+RSA_check_key;
-+RSA_flags;
-+RSA_free;
-+RSA_generate_key;
-+RSA_generate_key_ex;
-+RSA_get_default_method;
-+RSA_get_ex_data;
-+RSA_get_ex_new_index;
-+RSA_get_method;
-+RSA_memory_lock;
-+RSA_new;
-+RSA_new_method;
-+RSA_null_method;
-+RSA_padding_add_PKCS1_OAEP;
-+RSA_padding_add_PKCS1_PSS;
-+RSA_padding_add_PKCS1_type_1;
-+RSA_padding_add_PKCS1_type_2;
-+RSA_padding_add_SSLv23;
-+RSA_padding_add_X931;
-+RSA_padding_add_none;
-+RSA_padding_check_PKCS1_OAEP;
-+RSA_padding_check_PKCS1_type_1;
-+RSA_padding_check_PKCS1_type_2;
-+RSA_padding_check_SSLv23;
-+RSA_padding_check_X931;
-+RSA_padding_check_none;
-+RSA_print;
-+RSA_print_fp;
-+RSA_private_decrypt;
-+RSA_private_encrypt;
-+RSA_public_decrypt;
-+RSA_public_encrypt;
-+RSA_set_default_method;
-+RSA_set_ex_data;
-+RSA_set_method;
-+RSA_setup_blinding;
-+RSA_sign;
-+RSA_sign_ASN1_OCTET_STRING;
-+RSA_size;
-+RSA_up_ref;
-+RSA_verify;
-+RSA_verify_ASN1_OCTET_STRING;
-+RSA_verify_PKCS1_PSS;
-+RSA_version;
-+SHA;
-+SHA1;
-+SHA1_Final;
-+SHA1_Init;
-+SHA1_Transform;
-+SHA1_Update;
-+SHA1_version;
-+SHA224;
-+SHA224_Final;
-+SHA224_Init;
-+SHA224_Update;
-+SHA256;
-+SHA256_Final;
-+SHA256_Init;
-+SHA256_Transform;
-+SHA256_Update;
-+SHA256_version;
-+SHA384;
-+SHA384_Final;
-+SHA384_Init;
-+SHA384_Update;
-+SHA512;
-+SHA512_Final;
-+SHA512_Init;
-+SHA512_Transform;
-+SHA512_Update;
-+SHA512_version;
-+SHA_Final;
-+SHA_Init;
-+SHA_Transform;
-+SHA_Update;
-+SHA_version;
-+SMIME_crlf_copy;
-+SMIME_read_PKCS7;
-+SMIME_text;
-+SMIME_write_PKCS7;
-+SSLeay;
-+SSLeay_version;
-+STACK_version;
-+STORE_ATTR_INFO_compare;
-+STORE_ATTR_INFO_free;
-+STORE_ATTR_INFO_get0_cstr;
-+STORE_ATTR_INFO_get0_dn;
-+STORE_ATTR_INFO_get0_number;
-+STORE_ATTR_INFO_get0_sha1str;
-+STORE_ATTR_INFO_in;
-+STORE_ATTR_INFO_in_ex;
-+STORE_ATTR_INFO_in_range;
-+STORE_ATTR_INFO_modify_cstr;
-+STORE_ATTR_INFO_modify_dn;
-+STORE_ATTR_INFO_modify_number;
-+STORE_ATTR_INFO_modify_sha1str;
-+STORE_ATTR_INFO_new;
-+STORE_ATTR_INFO_set_cstr;
-+STORE_ATTR_INFO_set_dn;
-+STORE_ATTR_INFO_set_number;
-+STORE_ATTR_INFO_set_sha1str;
-+STORE_Memory;
-+STORE_OBJECT_free;
-+STORE_OBJECT_new;
-+STORE_attr_sizes;
-+STORE_create_method;
-+STORE_ctrl;
-+STORE_delete_arbitrary;
-+STORE_delete_certificate;
-+STORE_delete_crl;
-+STORE_delete_number;
-+STORE_delete_private_key;
-+STORE_delete_public_key;
-+STORE_destroy_method;
-+STORE_free;
-+STORE_generate_crl;
-+STORE_generate_key;
-+STORE_get_arbitrary;
-+STORE_get_certificate;
-+STORE_get_crl;
-+STORE_get_ex_data;
-+STORE_get_ex_new_index;
-+STORE_get_method;
-+STORE_get_number;
-+STORE_get_private_key;
-+STORE_get_public_key;
-+STORE_list_certificate_end;
-+STORE_list_certificate_endp;
-+STORE_list_certificate_next;
-+STORE_list_certificate_start;
-+STORE_list_crl_end;
-+STORE_list_crl_endp;
-+STORE_list_crl_next;
-+STORE_list_crl_start;
-+STORE_list_private_key_end;
-+STORE_list_private_key_endp;
-+STORE_list_private_key_next;
-+STORE_list_private_key_start;
-+STORE_list_public_key_end;
-+STORE_list_public_key_endp;
-+STORE_list_public_key_next;
-+STORE_list_public_key_start;
-+STORE_method_get_cleanup_function;
-+STORE_method_get_ctrl_function;
-+STORE_method_get_delete_function;
-+STORE_method_get_generate_function;
-+STORE_method_get_get_function;
-+STORE_method_get_initialise_function;
-+STORE_method_get_list_end_function;
-+STORE_method_get_list_next_function;
-+STORE_method_get_list_start_function;
-+STORE_method_get_lock_store_function;
-+STORE_method_get_modify_function;
-+STORE_method_get_revoke_function;
-+STORE_method_get_store_function;
-+STORE_method_get_unlock_store_function;
-+STORE_method_get_update_store_function;
-+STORE_method_set_cleanup_function;
-+STORE_method_set_ctrl_function;
-+STORE_method_set_delete_function;
-+STORE_method_set_generate_function;
-+STORE_method_set_get_function;
-+STORE_method_set_initialise_function;
-+STORE_method_set_list_end_function;
-+STORE_method_set_list_next_function;
-+STORE_method_set_list_start_function;
-+STORE_method_set_lock_store_function;
-+STORE_method_set_modify_function;
-+STORE_method_set_revoke_function;
-+STORE_method_set_store_function;
-+STORE_method_set_unlock_store_function;
-+STORE_method_set_update_store_function;
-+STORE_modify_arbitrary;
-+STORE_modify_certificate;
-+STORE_modify_crl;
-+STORE_modify_number;
-+STORE_modify_private_key;
-+STORE_modify_public_key;
-+STORE_new_engine;
-+STORE_new_method;
-+STORE_object_type_string;
-+STORE_param_sizes;
-+STORE_parse_attrs_end;
-+STORE_parse_attrs_endp;
-+STORE_parse_attrs_next;
-+STORE_parse_attrs_start;
-+STORE_revoke_certificate;
-+STORE_revoke_private_key;
-+STORE_revoke_public_key;
-+STORE_set_ex_data;
-+STORE_set_method;
-+STORE_store_arbitrary;
-+STORE_store_certificate;
-+STORE_store_crl;
-+STORE_store_number;
-+STORE_store_private_key;
-+STORE_store_public_key;
-+SXNETID_free;
-+SXNETID_it;
-+SXNETID_new;
-+SXNET_add_id_INTEGER;
-+SXNET_add_id_asc;
-+SXNET_add_id_ulong;
-+SXNET_free;
-+SXNET_get_id_INTEGER;
-+SXNET_get_id_asc;
-+SXNET_get_id_ulong;
-+SXNET_it;
-+SXNET_new;
-+TXT_DB_create_index;
-+TXT_DB_free;
-+TXT_DB_get_by_index;
-+TXT_DB_insert;
-+TXT_DB_read;
-+TXT_DB_version;
-+TXT_DB_write;
-+UI_OpenSSL;
-+UI_UTIL_read_pw;
-+UI_UTIL_read_pw_string;
-+UI_add_error_string;
-+UI_add_info_string;
-+UI_add_input_boolean;
-+UI_add_input_string;
-+UI_add_user_data;
-+UI_add_verify_string;
-+UI_construct_prompt;
-+UI_create_method;
-+UI_ctrl;
-+UI_destroy_method;
-+UI_dup_error_string;
-+UI_dup_info_string;
-+UI_dup_input_boolean;
-+UI_dup_input_string;
-+UI_dup_verify_string;
-+UI_free;
-+UI_get0_action_string;
-+UI_get0_output_string;
-+UI_get0_result;
-+UI_get0_result_string;
-+UI_get0_test_string;
-+UI_get0_user_data;
-+UI_get_default_method;
-+UI_get_ex_data;
-+UI_get_ex_new_index;
-+UI_get_input_flags;
-+UI_get_method;
-+UI_get_result_maxsize;
-+UI_get_result_minsize;
-+UI_get_string_type;
-+UI_method_get_closer;
-+UI_method_get_flusher;
-+UI_method_get_opener;
-+UI_method_get_reader;
-+UI_method_get_writer;
-+UI_method_set_closer;
-+UI_method_set_flusher;
-+UI_method_set_opener;
-+UI_method_set_reader;
-+UI_method_set_writer;
-+UI_new;
-+UI_new_method;
-+UI_process;
-+UI_set_default_method;
-+UI_set_ex_data;
-+UI_set_method;
-+UI_set_result;
-+USERNOTICE_free;
-+USERNOTICE_it;
-+USERNOTICE_new;
-+UTF8_getc;
-+UTF8_putc;
-+X509V3_EXT_CRL_add_conf;
-+X509V3_EXT_CRL_add_nconf;
-+X509V3_EXT_REQ_add_conf;
-+X509V3_EXT_REQ_add_nconf;
-+X509V3_EXT_add;
-+X509V3_EXT_add_alias;
-+X509V3_EXT_add_conf;
-+X509V3_EXT_add_list;
-+X509V3_EXT_add_nconf;
-+X509V3_EXT_add_nconf_sk;
-+X509V3_EXT_cleanup;
-+X509V3_EXT_conf;
-+X509V3_EXT_conf_nid;
-+X509V3_EXT_d2i;
-+X509V3_EXT_get;
-+X509V3_EXT_get_nid;
-+X509V3_EXT_i2d;
-+X509V3_EXT_nconf;
-+X509V3_EXT_nconf_nid;
-+X509V3_EXT_print;
-+X509V3_EXT_print_fp;
-+X509V3_EXT_val_prn;
-+X509V3_NAME_from_section;
-+X509V3_add1_i2d;
-+X509V3_add_standard_extensions;
-+X509V3_add_value;
-+X509V3_add_value_bool;
-+X509V3_add_value_bool_nf;
-+X509V3_add_value_int;
-+X509V3_add_value_uchar;
-+X509V3_conf_free;
-+X509V3_extensions_print;
-+X509V3_get_d2i;
-+X509V3_get_section;
-+X509V3_get_string;
-+X509V3_get_value_bool;
-+X509V3_get_value_int;
-+X509V3_parse_list;
-+X509V3_section_free;
-+X509V3_set_conf_lhash;
-+X509V3_set_ctx;
-+X509V3_set_nconf;
-+X509V3_string_free;
-+X509_ALGOR_dup;
-+X509_ALGOR_free;
-+X509_ALGOR_it;
-+X509_ALGOR_new;
-+X509_ATTRIBUTE_SET_it;
-+X509_ATTRIBUTE_count;
-+X509_ATTRIBUTE_create;
-+X509_ATTRIBUTE_create_by_NID;
-+X509_ATTRIBUTE_create_by_OBJ;
-+X509_ATTRIBUTE_create_by_txt;
-+X509_ATTRIBUTE_dup;
-+X509_ATTRIBUTE_free;
-+X509_ATTRIBUTE_get0_data;
-+X509_ATTRIBUTE_get0_object;
-+X509_ATTRIBUTE_get0_type;
-+X509_ATTRIBUTE_it;
-+X509_ATTRIBUTE_new;
-+X509_ATTRIBUTE_set1_data;
-+X509_ATTRIBUTE_set1_object;
-+X509_CERT_AUX_free;
-+X509_CERT_AUX_it;
-+X509_CERT_AUX_new;
-+X509_CERT_AUX_print;
-+X509_CERT_PAIR_free;
-+X509_CERT_PAIR_it;
-+X509_CERT_PAIR_new;
-+X509_CINF_free;
-+X509_CINF_it;
-+X509_CINF_new;
-+X509_CRL_INFO_free;
-+X509_CRL_INFO_it;
-+X509_CRL_INFO_new;
-+X509_CRL_add0_revoked;
-+X509_CRL_add1_ext_i2d;
-+X509_CRL_add_ext;
-+X509_CRL_cmp;
-+X509_CRL_delete_ext;
-+X509_CRL_digest;
-+X509_CRL_dup;
-+X509_CRL_free;
-+X509_CRL_get_ext;
-+X509_CRL_get_ext_by_NID;
-+X509_CRL_get_ext_by_OBJ;
-+X509_CRL_get_ext_by_critical;
-+X509_CRL_get_ext_count;
-+X509_CRL_get_ext_d2i;
-+X509_CRL_it;
-+X509_CRL_new;
-+X509_CRL_print;
-+X509_CRL_print_fp;
-+X509_CRL_set_issuer_name;
-+X509_CRL_set_lastUpdate;
-+X509_CRL_set_nextUpdate;
-+X509_CRL_set_version;
-+X509_CRL_sign;
-+X509_CRL_sort;
-+X509_CRL_verify;
-+X509_EXTENSION_create_by_NID;
-+X509_EXTENSION_create_by_OBJ;
-+X509_EXTENSION_dup;
-+X509_EXTENSION_free;
-+X509_EXTENSION_get_critical;
-+X509_EXTENSION_get_data;
-+X509_EXTENSION_get_object;
-+X509_EXTENSION_it;
-+X509_EXTENSION_new;
-+X509_EXTENSION_set_critical;
-+X509_EXTENSION_set_data;
-+X509_EXTENSION_set_object;
-+X509_INFO_free;
-+X509_INFO_new;
-+X509_LOOKUP_by_alias;
-+X509_LOOKUP_by_fingerprint;
-+X509_LOOKUP_by_issuer_serial;
-+X509_LOOKUP_by_subject;
-+X509_LOOKUP_ctrl;
-+X509_LOOKUP_file;
-+X509_LOOKUP_free;
-+X509_LOOKUP_hash_dir;
-+X509_LOOKUP_init;
-+X509_LOOKUP_new;
-+X509_LOOKUP_shutdown;
-+X509_NAME_ENTRIES_it;
-+X509_NAME_ENTRY_create_by_NID;
-+X509_NAME_ENTRY_create_by_OBJ;
-+X509_NAME_ENTRY_create_by_txt;
-+X509_NAME_ENTRY_dup;
-+X509_NAME_ENTRY_free;
-+X509_NAME_ENTRY_get_data;
-+X509_NAME_ENTRY_get_object;
-+X509_NAME_ENTRY_it;
-+X509_NAME_ENTRY_new;
-+X509_NAME_ENTRY_set_data;
-+X509_NAME_ENTRY_set_object;
-+X509_NAME_INTERNAL_it;
-+X509_NAME_add_entry;
-+X509_NAME_add_entry_by_NID;
-+X509_NAME_add_entry_by_OBJ;
-+X509_NAME_add_entry_by_txt;
-+X509_NAME_cmp;
-+X509_NAME_delete_entry;
-+X509_NAME_digest;
-+X509_NAME_dup;
-+X509_NAME_entry_count;
-+X509_NAME_free;
-+X509_NAME_get_entry;
-+X509_NAME_get_index_by_NID;
-+X509_NAME_get_index_by_OBJ;
-+X509_NAME_get_text_by_NID;
-+X509_NAME_get_text_by_OBJ;
-+X509_NAME_hash;
-+X509_NAME_it;
-+X509_NAME_new;
-+X509_NAME_oneline;
-+X509_NAME_print;
-+X509_NAME_print_ex;
-+X509_NAME_print_ex_fp;
-+X509_NAME_set;
-+X509_OBJECT_free_contents;
-+X509_OBJECT_idx_by_subject;
-+X509_OBJECT_retrieve_by_subject;
-+X509_OBJECT_retrieve_match;
-+X509_OBJECT_up_ref_count;
-+X509_PKEY_free;
-+X509_PKEY_new;
-+X509_POLICY_NODE_print;
-+X509_PUBKEY_free;
-+X509_PUBKEY_get;
-+X509_PUBKEY_it;
-+X509_PUBKEY_new;
-+X509_PUBKEY_set;
-+X509_PURPOSE_add;
-+X509_PURPOSE_cleanup;
-+X509_PURPOSE_get0;
-+X509_PURPOSE_get0_name;
-+X509_PURPOSE_get0_sname;
-+X509_PURPOSE_get_by_id;
-+X509_PURPOSE_get_by_sname;
-+X509_PURPOSE_get_count;
-+X509_PURPOSE_get_id;
-+X509_PURPOSE_get_trust;
-+X509_PURPOSE_set;
-+X509_REQ_INFO_free;
-+X509_REQ_INFO_it;
-+X509_REQ_INFO_new;
-+X509_REQ_add1_attr;
-+X509_REQ_add1_attr_by_NID;
-+X509_REQ_add1_attr_by_OBJ;
-+X509_REQ_add1_attr_by_txt;
-+X509_REQ_add_extensions;
-+X509_REQ_add_extensions_nid;
-+X509_REQ_check_private_key;
-+X509_REQ_delete_attr;
-+X509_REQ_digest;
-+X509_REQ_dup;
-+X509_REQ_extension_nid;
-+X509_REQ_free;
-+X509_REQ_get1_email;
-+X509_REQ_get_attr;
-+X509_REQ_get_attr_by_NID;
-+X509_REQ_get_attr_by_OBJ;
-+X509_REQ_get_attr_count;
-+X509_REQ_get_extension_nids;
-+X509_REQ_get_extensions;
-+X509_REQ_get_pubkey;
-+X509_REQ_it;
-+X509_REQ_new;
-+X509_REQ_print;
-+X509_REQ_print_ex;
-+X509_REQ_print_fp;
-+X509_REQ_set_extension_nids;
-+X509_REQ_set_pubkey;
-+X509_REQ_set_subject_name;
-+X509_REQ_set_version;
-+X509_REQ_sign;
-+X509_REQ_to_X509;
-+X509_REQ_verify;
-+X509_REVOKED_add1_ext_i2d;
-+X509_REVOKED_add_ext;
-+X509_REVOKED_delete_ext;
-+X509_REVOKED_free;
-+X509_REVOKED_get_ext;
-+X509_REVOKED_get_ext_by_NID;
-+X509_REVOKED_get_ext_by_OBJ;
-+X509_REVOKED_get_ext_by_critical;
-+X509_REVOKED_get_ext_count;
-+X509_REVOKED_get_ext_d2i;
-+X509_REVOKED_it;
-+X509_REVOKED_new;
-+X509_REVOKED_set_revocationDate;
-+X509_REVOKED_set_serialNumber;
-+X509_SIG_free;
-+X509_SIG_it;
-+X509_SIG_new;
-+X509_STORE_CTX_cleanup;
-+X509_STORE_CTX_free;
-+X509_STORE_CTX_get0_param;
-+X509_STORE_CTX_get0_policy_tree;
-+X509_STORE_CTX_get1_chain;
-+X509_STORE_CTX_get1_issuer;
-+X509_STORE_CTX_get_chain;
-+X509_STORE_CTX_get_current_cert;
-+X509_STORE_CTX_get_error;
-+X509_STORE_CTX_get_error_depth;
-+X509_STORE_CTX_get_ex_data;
-+X509_STORE_CTX_get_ex_new_index;
-+X509_STORE_CTX_get_explicit_policy;
-+X509_STORE_CTX_init;
-+X509_STORE_CTX_new;
-+X509_STORE_CTX_purpose_inherit;
-+X509_STORE_CTX_set0_crls;
-+X509_STORE_CTX_set0_param;
-+X509_STORE_CTX_set_cert;
-+X509_STORE_CTX_set_chain;
-+X509_STORE_CTX_set_default;
-+X509_STORE_CTX_set_depth;
-+X509_STORE_CTX_set_error;
-+X509_STORE_CTX_set_ex_data;
-+X509_STORE_CTX_set_flags;
-+X509_STORE_CTX_set_purpose;
-+X509_STORE_CTX_set_time;
-+X509_STORE_CTX_set_trust;
-+X509_STORE_CTX_set_verify_cb;
-+X509_STORE_CTX_trusted_stack;
-+X509_STORE_add_cert;
-+X509_STORE_add_crl;
-+X509_STORE_add_lookup;
-+X509_STORE_free;
-+X509_STORE_get_by_subject;
-+X509_STORE_load_locations;
-+X509_STORE_new;
-+X509_STORE_set1_param;
-+X509_STORE_set_default_paths;
-+X509_STORE_set_depth;
-+X509_STORE_set_flags;
-+X509_STORE_set_purpose;
-+X509_STORE_set_trust;
-+X509_TRUST_add;
-+X509_TRUST_cleanup;
-+X509_TRUST_get0;
-+X509_TRUST_get0_name;
-+X509_TRUST_get_by_id;
-+X509_TRUST_get_count;
-+X509_TRUST_get_flags;
-+X509_TRUST_get_trust;
-+X509_TRUST_set;
-+X509_TRUST_set_default;
-+X509_VAL_free;
-+X509_VAL_it;
-+X509_VAL_new;
-+X509_VERIFY_PARAM_add0_policy;
-+X509_VERIFY_PARAM_add0_table;
-+X509_VERIFY_PARAM_clear_flags;
-+X509_VERIFY_PARAM_free;
-+X509_VERIFY_PARAM_get_depth;
-+X509_VERIFY_PARAM_get_flags;
-+X509_VERIFY_PARAM_inherit;
-+X509_VERIFY_PARAM_lookup;
-+X509_VERIFY_PARAM_new;
-+X509_VERIFY_PARAM_set1;
-+X509_VERIFY_PARAM_set1_name;
-+X509_VERIFY_PARAM_set1_policies;
-+X509_VERIFY_PARAM_set_depth;
-+X509_VERIFY_PARAM_set_flags;
-+X509_VERIFY_PARAM_set_purpose;
-+X509_VERIFY_PARAM_set_time;
-+X509_VERIFY_PARAM_set_trust;
-+X509_VERIFY_PARAM_table_cleanup;
-+X509_add1_ext_i2d;
-+X509_add1_reject_object;
-+X509_add1_trust_object;
-+X509_add_ext;
-+X509_alias_get0;
-+X509_alias_set1;
-+X509_asn1_meth;
-+X509_certificate_type;
-+X509_check_ca;
-+X509_check_issued;
-+X509_check_private_key;
-+X509_check_purpose;
-+X509_check_trust;
-+X509_cmp;
-+X509_cmp_current_time;
-+X509_cmp_time;
-+X509_delete_ext;
-+X509_digest;
-+X509_dup;
-+X509_email_free;
-+X509_find_by_issuer_and_serial;
-+X509_find_by_subject;
-+X509_free;
-+X509_get0_pubkey_bitstr;
-+X509_get1_email;
-+X509_get_default_cert_area;
-+X509_get_default_cert_dir;
-+X509_get_default_cert_dir_env;
-+X509_get_default_cert_file;
-+X509_get_default_cert_file_env;
-+X509_get_default_private_dir;
-+X509_get_ex_data;
-+X509_get_ex_new_index;
-+X509_get_ext;
-+X509_get_ext_by_NID;
-+X509_get_ext_by_OBJ;
-+X509_get_ext_by_critical;
-+X509_get_ext_count;
-+X509_get_ext_d2i;
-+X509_get_issuer_name;
-+X509_get_pubkey;
-+X509_get_pubkey_parameters;
-+X509_get_serialNumber;
-+X509_get_subject_name;
-+X509_gmtime_adj;
-+X509_issuer_and_serial_cmp;
-+X509_issuer_and_serial_hash;
-+X509_issuer_name_cmp;
-+X509_issuer_name_hash;
-+X509_it;
-+X509_keyid_get0;
-+X509_keyid_set1;
-+X509_load_cert_crl_file;
-+X509_load_cert_file;
-+X509_load_crl_file;
-+X509_new;
-+X509_ocspid_print;
-+X509_policy_check;
-+X509_policy_level_get0_node;
-+X509_policy_level_node_count;
-+X509_policy_node_get0_parent;
-+X509_policy_node_get0_policy;
-+X509_policy_node_get0_qualifiers;
-+X509_policy_tree_free;
-+X509_policy_tree_get0_level;
-+X509_policy_tree_get0_policies;
-+X509_policy_tree_get0_user_policies;
-+X509_policy_tree_level_count;
-+X509_print;
-+X509_print_ex;
-+X509_print_ex_fp;
-+X509_print_fp;
-+X509_pubkey_digest;
-+X509_reject_clear;
-+X509_set_ex_data;
-+X509_set_issuer_name;
-+X509_set_notAfter;
-+X509_set_notBefore;
-+X509_set_pubkey;
-+X509_set_serialNumber;
-+X509_set_subject_name;
-+X509_set_version;
-+X509_sign;
-+X509_signature_print;
-+X509_subject_name_cmp;
-+X509_subject_name_hash;
-+X509_supported_extension;
-+X509_time_adj;
-+X509_to_X509_REQ;
-+X509_trust_clear;
-+X509_verify;
-+X509_verify_cert;
-+X509_verify_cert_error_string;
-+X509_version;
-+X509at_add1_attr;
-+X509at_add1_attr_by_NID;
-+X509at_add1_attr_by_OBJ;
-+X509at_add1_attr_by_txt;
-+X509at_delete_attr;
-+X509at_get_attr;
-+X509at_get_attr_by_NID;
-+X509at_get_attr_by_OBJ;
-+X509at_get_attr_count;
-+X509v3_add_ext;
-+X509v3_delete_ext;
-+X509v3_get_ext;
-+X509v3_get_ext_by_NID;
-+X509v3_get_ext_by_OBJ;
-+X509v3_get_ext_by_critical;
-+X509v3_get_ext_count;
-+X9_62_CHARACTERISTIC_TWO_free;
-+X9_62_CHARACTERISTIC_TWO_it;
-+X9_62_CHARACTERISTIC_TWO_new;
-+X9_62_CURVE_it;
-+X9_62_FIELDID_it;
-+X9_62_PENTANOMIAL_free;
-+X9_62_PENTANOMIAL_it;
-+X9_62_PENTANOMIAL_new;
-+ZLONG_it;
-+_CONF_add_string;
-+_CONF_free_data;
-+_CONF_get_section;
-+_CONF_get_section_values;
-+_CONF_get_string;
-+_CONF_new_data;
-+_CONF_new_section;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+_PROCEDURE_LINKAGE_TABLE_;
-+_des_crypt;
-+_edata;
-+_end;
-+_etext;
-+_fini;
-+_init;
-+_lib_version;
-+_ossl_096_des_random_seed;
-+_ossl_old_crypt;
-+_ossl_old_des_cbc_cksum;
-+_ossl_old_des_cbc_encrypt;
-+_ossl_old_des_cfb64_encrypt;
-+_ossl_old_des_cfb_encrypt;
-+_ossl_old_des_crypt;
-+_ossl_old_des_decrypt3;
-+_ossl_old_des_ecb3_encrypt;
-+_ossl_old_des_ecb_encrypt;
-+_ossl_old_des_ede3_cbc_encrypt;
-+_ossl_old_des_ede3_cfb64_encrypt;
-+_ossl_old_des_ede3_ofb64_encrypt;
-+_ossl_old_des_enc_read;
-+_ossl_old_des_enc_write;
-+_ossl_old_des_encrypt;
-+_ossl_old_des_encrypt2;
-+_ossl_old_des_encrypt3;
-+_ossl_old_des_fcrypt;
-+_ossl_old_des_is_weak_key;
-+_ossl_old_des_key_sched;
-+_ossl_old_des_ncbc_encrypt;
-+_ossl_old_des_ofb64_encrypt;
-+_ossl_old_des_ofb_encrypt;
-+_ossl_old_des_options;
-+_ossl_old_des_pcbc_encrypt;
-+_ossl_old_des_quad_cksum;
-+_ossl_old_des_random_key;
-+_ossl_old_des_random_seed;
-+_ossl_old_des_read_2passwords;
-+_ossl_old_des_read_password;
-+_ossl_old_des_read_pw;
-+_ossl_old_des_read_pw_string;
-+_ossl_old_des_set_key;
-+_ossl_old_des_set_odd_parity;
-+_ossl_old_des_string_to_2keys;
-+_ossl_old_des_string_to_key;
-+_ossl_old_des_xcbc_encrypt;
-+_ossl_old_des_xwhite_in2out;
-+_shadow_DES_check_key;
-+_shadow_DES_rw_mode;
-+a2d_ASN1_OBJECT;
-+a2i_ASN1_ENUMERATED;
-+a2i_ASN1_INTEGER;
-+a2i_ASN1_STRING;
-+a2i_IPADDRESS;
-+a2i_IPADDRESS_NC;
-+a2i_ipadd;
-+asc2uni;
-+asn1_Finish;
-+asn1_GetSequence;
-+asn1_add_error;
-+asn1_const_Finish;
-+asn1_do_adb;
-+asn1_do_lock;
-+asn1_enc_free;
-+asn1_enc_init;
-+asn1_enc_restore;
-+asn1_enc_save;
-+asn1_ex_c2i;
-+asn1_ex_i2c;
-+asn1_get_choice_selector;
-+asn1_get_field_ptr;
-+asn1_primitive_clear;
-+asn1_set_choice_selector;
-+bn_add_part_words;
-+bn_add_words;
-+bn_cmp_part_words;
-+bn_cmp_words;
-+bn_div_words;
-+bn_dup_expand;
-+bn_expand2;
-+bn_mul_add_words;
-+bn_mul_comba4;
-+bn_mul_comba8;
-+bn_mul_high;
-+bn_mul_low_normal;
-+bn_mul_low_recursive;
-+bn_mul_normal;
-+bn_mul_part_recursive;
-+bn_mul_recursive;
-+bn_mul_words;
-+bn_sqr_comba4;
-+bn_sqr_comba8;
-+bn_sqr_normal;
-+bn_sqr_recursive;
-+bn_sqr_words;
-+bn_sub_part_words;
-+bn_sub_words;
-+c2i_ASN1_BIT_STRING;
-+c2i_ASN1_INTEGER;
-+c2i_ASN1_OBJECT;
-+cleanse_ctr;
-+d2i_ACCESS_DESCRIPTION;
-+d2i_ASN1_BIT_STRING;
-+d2i_ASN1_BMPSTRING;
-+d2i_ASN1_BOOLEAN;
-+d2i_ASN1_ENUMERATED;
-+d2i_ASN1_GENERALIZEDTIME;
-+d2i_ASN1_GENERALSTRING;
-+d2i_ASN1_HEADER;
-+d2i_ASN1_IA5STRING;
-+d2i_ASN1_INTEGER;
-+d2i_ASN1_NULL;
-+d2i_ASN1_OBJECT;
-+d2i_ASN1_OCTET_STRING;
-+d2i_ASN1_PRINTABLE;
-+d2i_ASN1_PRINTABLESTRING;
-+d2i_ASN1_SET;
-+d2i_ASN1_T61STRING;
-+d2i_ASN1_TIME;
-+d2i_ASN1_TYPE;
-+d2i_ASN1_UINTEGER;
-+d2i_ASN1_UNIVERSALSTRING;
-+d2i_ASN1_UTCTIME;
-+d2i_ASN1_UTF8STRING;
-+d2i_ASN1_VISIBLESTRING;
-+d2i_ASN1_bytes;
-+d2i_ASN1_type_bytes;
-+d2i_AUTHORITY_INFO_ACCESS;
-+d2i_AUTHORITY_KEYID;
-+d2i_AutoPrivateKey;
-+d2i_BASIC_CONSTRAINTS;
-+d2i_CERTIFICATEPOLICIES;
-+d2i_CRL_DIST_POINTS;
-+d2i_DHparams;
-+d2i_DIRECTORYSTRING;
-+d2i_DISPLAYTEXT;
-+d2i_DIST_POINT;
-+d2i_DIST_POINT_NAME;
-+d2i_DSAPrivateKey;
-+d2i_DSAPrivateKey_bio;
-+d2i_DSAPrivateKey_fp;
-+d2i_DSAPublicKey;
-+d2i_DSA_PUBKEY;
-+d2i_DSA_PUBKEY_bio;
-+d2i_DSA_PUBKEY_fp;
-+d2i_DSA_SIG;
-+d2i_DSAparams;
-+d2i_ECDSA_SIG;
-+d2i_ECPKPARAMETERS;
-+d2i_ECPKParameters;
-+d2i_ECParameters;
-+d2i_ECPrivateKey;
-+d2i_ECPrivateKey_bio;
-+d2i_ECPrivateKey_fp;
-+d2i_EC_PRIVATEKEY;
-+d2i_EC_PUBKEY;
-+d2i_EC_PUBKEY_bio;
-+d2i_EC_PUBKEY_fp;
-+d2i_EDIPARTYNAME;
-+d2i_EXTENDED_KEY_USAGE;
-+d2i_GENERAL_NAME;
-+d2i_GENERAL_NAMES;
-+d2i_KRB5_APREQ;
-+d2i_KRB5_APREQBODY;
-+d2i_KRB5_AUTHDATA;
-+d2i_KRB5_AUTHENT;
-+d2i_KRB5_AUTHENTBODY;
-+d2i_KRB5_CHECKSUM;
-+d2i_KRB5_ENCDATA;
-+d2i_KRB5_ENCKEY;
-+d2i_KRB5_PRINCNAME;
-+d2i_KRB5_TICKET;
-+d2i_KRB5_TKTBODY;
-+d2i_NETSCAPE_CERT_SEQUENCE;
-+d2i_NETSCAPE_ENCRYPTED_PKEY;
-+d2i_NETSCAPE_PKEY;
-+d2i_NETSCAPE_SPKAC;
-+d2i_NETSCAPE_SPKI;
-+d2i_NOTICEREF;
-+d2i_Netscape_RSA;
-+d2i_OCSP_BASICRESP;
-+d2i_OCSP_CERTID;
-+d2i_OCSP_CERTSTATUS;
-+d2i_OCSP_CRLID;
-+d2i_OCSP_ONEREQ;
-+d2i_OCSP_REQINFO;
-+d2i_OCSP_REQUEST;
-+d2i_OCSP_RESPBYTES;
-+d2i_OCSP_RESPDATA;
-+d2i_OCSP_RESPID;
-+d2i_OCSP_RESPONSE;
-+d2i_OCSP_REVOKEDINFO;
-+d2i_OCSP_SERVICELOC;
-+d2i_OCSP_SIGNATURE;
-+d2i_OCSP_SINGLERESP;
-+d2i_OTHERNAME;
-+d2i_PBE2PARAM;
-+d2i_PBEPARAM;
-+d2i_PBKDF2PARAM;
-+d2i_PKCS12;
-+d2i_PKCS12_BAGS;
-+d2i_PKCS12_MAC_DATA;
-+d2i_PKCS12_SAFEBAG;
-+d2i_PKCS12_bio;
-+d2i_PKCS12_fp;
-+d2i_PKCS7;
-+d2i_PKCS7_DIGEST;
-+d2i_PKCS7_ENCRYPT;
-+d2i_PKCS7_ENC_CONTENT;
-+d2i_PKCS7_ENVELOPE;
-+d2i_PKCS7_ISSUER_AND_SERIAL;
-+d2i_PKCS7_RECIP_INFO;
-+d2i_PKCS7_SIGNED;
-+d2i_PKCS7_SIGNER_INFO;
-+d2i_PKCS7_SIGN_ENVELOPE;
-+d2i_PKCS7_bio;
-+d2i_PKCS7_fp;
-+d2i_PKCS8PrivateKey_bio;
-+d2i_PKCS8PrivateKey_fp;
-+d2i_PKCS8_PRIV_KEY_INFO;
-+d2i_PKCS8_PRIV_KEY_INFO_bio;
-+d2i_PKCS8_PRIV_KEY_INFO_fp;
-+d2i_PKCS8_bio;
-+d2i_PKCS8_fp;
-+d2i_PKEY_USAGE_PERIOD;
-+d2i_POLICYINFO;
-+d2i_POLICYQUALINFO;
-+d2i_PROXY_CERT_INFO_EXTENSION;
-+d2i_PROXY_POLICY;
-+d2i_PUBKEY;
-+d2i_PUBKEY_bio;
-+d2i_PUBKEY_fp;
-+d2i_PrivateKey;
-+d2i_PrivateKey_bio;
-+d2i_PrivateKey_fp;
-+d2i_PublicKey;
-+d2i_RSAPrivateKey;
-+d2i_RSAPrivateKey_bio;
-+d2i_RSAPrivateKey_fp;
-+d2i_RSAPublicKey;
-+d2i_RSAPublicKey_bio;
-+d2i_RSAPublicKey_fp;
-+d2i_RSA_NET;
-+d2i_RSA_PUBKEY;
-+d2i_RSA_PUBKEY_bio;
-+d2i_RSA_PUBKEY_fp;
-+d2i_SXNET;
-+d2i_SXNETID;
-+d2i_USERNOTICE;
-+d2i_X509;
-+d2i_X509_ALGOR;
-+d2i_X509_ATTRIBUTE;
-+d2i_X509_AUX;
-+d2i_X509_CERT_AUX;
-+d2i_X509_CERT_PAIR;
-+d2i_X509_CINF;
-+d2i_X509_CRL;
-+d2i_X509_CRL_INFO;
-+d2i_X509_CRL_bio;
-+d2i_X509_CRL_fp;
-+d2i_X509_EXTENSION;
-+d2i_X509_NAME;
-+d2i_X509_NAME_ENTRY;
-+d2i_X509_PKEY;
-+d2i_X509_PUBKEY;
-+d2i_X509_REQ;
-+d2i_X509_REQ_INFO;
-+d2i_X509_REQ_bio;
-+d2i_X509_REQ_fp;
-+d2i_X509_REVOKED;
-+d2i_X509_SIG;
-+d2i_X509_VAL;
-+d2i_X509_bio;
-+d2i_X509_fp;
-+dsa_pub_internal_it;
-+ec_GF2m_have_precompute_mult;
-+ec_GF2m_precompute_mult;
-+ec_GF2m_simple_add;
-+ec_GF2m_simple_cmp;
-+ec_GF2m_simple_dbl;
-+ec_GF2m_simple_field_div;
-+ec_GF2m_simple_field_mul;
-+ec_GF2m_simple_field_sqr;
-+ec_GF2m_simple_group_check_discriminant;
-+ec_GF2m_simple_group_clear_finish;
-+ec_GF2m_simple_group_copy;
-+ec_GF2m_simple_group_finish;
-+ec_GF2m_simple_group_get_curve;
-+ec_GF2m_simple_group_get_degree;
-+ec_GF2m_simple_group_init;
-+ec_GF2m_simple_group_set_curve;
-+ec_GF2m_simple_invert;
-+ec_GF2m_simple_is_at_infinity;
-+ec_GF2m_simple_is_on_curve;
-+ec_GF2m_simple_make_affine;
-+ec_GF2m_simple_mul;
-+ec_GF2m_simple_oct2point;
-+ec_GF2m_simple_point2oct;
-+ec_GF2m_simple_point_clear_finish;
-+ec_GF2m_simple_point_copy;
-+ec_GF2m_simple_point_finish;
-+ec_GF2m_simple_point_get_affine_coordinates;
-+ec_GF2m_simple_point_init;
-+ec_GF2m_simple_point_set_affine_coordinates;
-+ec_GF2m_simple_point_set_to_infinity;
-+ec_GF2m_simple_points_make_affine;
-+ec_GF2m_simple_set_compressed_coordinates;
-+ec_GFp_mont_field_decode;
-+ec_GFp_mont_field_encode;
-+ec_GFp_mont_field_mul;
-+ec_GFp_mont_field_set_to_one;
-+ec_GFp_mont_field_sqr;
-+ec_GFp_mont_group_clear_finish;
-+ec_GFp_mont_group_copy;
-+ec_GFp_mont_group_finish;
-+ec_GFp_mont_group_init;
-+ec_GFp_mont_group_set_curve;
-+ec_GFp_nist_field_mul;
-+ec_GFp_nist_field_sqr;
-+ec_GFp_nist_group_copy;
-+ec_GFp_nist_group_set_curve;
-+ec_GFp_simple_add;
-+ec_GFp_simple_cmp;
-+ec_GFp_simple_dbl;
-+ec_GFp_simple_field_mul;
-+ec_GFp_simple_field_sqr;
-+ec_GFp_simple_get_Jprojective_coordinates_GFp;
-+ec_GFp_simple_group_check_discriminant;
-+ec_GFp_simple_group_clear_finish;
-+ec_GFp_simple_group_copy;
-+ec_GFp_simple_group_finish;
-+ec_GFp_simple_group_get_curve;
-+ec_GFp_simple_group_get_degree;
-+ec_GFp_simple_group_init;
-+ec_GFp_simple_group_set_curve;
-+ec_GFp_simple_invert;
-+ec_GFp_simple_is_at_infinity;
-+ec_GFp_simple_is_on_curve;
-+ec_GFp_simple_make_affine;
-+ec_GFp_simple_oct2point;
-+ec_GFp_simple_point2oct;
-+ec_GFp_simple_point_clear_finish;
-+ec_GFp_simple_point_copy;
-+ec_GFp_simple_point_finish;
-+ec_GFp_simple_point_get_affine_coordinates;
-+ec_GFp_simple_point_init;
-+ec_GFp_simple_point_set_affine_coordinates;
-+ec_GFp_simple_point_set_to_infinity;
-+ec_GFp_simple_points_make_affine;
-+ec_GFp_simple_set_Jprojective_coordinates_GFp;
-+ec_GFp_simple_set_compressed_coordinates;
-+ec_wNAF_have_precompute_mult;
-+ec_wNAF_mul;
-+ec_wNAF_precompute_mult;
-+ecdh_check;
-+ecdsa_check;
-+engine_cleanup_add_first;
-+engine_cleanup_add_last;
-+engine_free_util;
-+engine_set_all_null;
-+engine_table_cleanup;
-+engine_table_register;
-+engine_table_select;
-+engine_table_unregister;
-+engine_unlocked_finish;
-+engine_unlocked_init;
-+fcrypt_body;
-+get_rfc2409_prime_1024;
-+get_rfc2409_prime_768;
-+get_rfc3526_prime_1536;
-+get_rfc3526_prime_2048;
-+get_rfc3526_prime_3072;
-+get_rfc3526_prime_4096;
-+get_rfc3526_prime_6144;
-+get_rfc3526_prime_8192;
-+hex_to_string;
-+i2a_ACCESS_DESCRIPTION;
-+i2a_ASN1_ENUMERATED;
-+i2a_ASN1_INTEGER;
-+i2a_ASN1_OBJECT;
-+i2a_ASN1_STRING;
-+i2c_ASN1_BIT_STRING;
-+i2c_ASN1_INTEGER;
-+i2d_ACCESS_DESCRIPTION;
-+i2d_ASN1_BIT_STRING;
-+i2d_ASN1_BMPSTRING;
-+i2d_ASN1_BOOLEAN;
-+i2d_ASN1_ENUMERATED;
-+i2d_ASN1_GENERALIZEDTIME;
-+i2d_ASN1_GENERALSTRING;
-+i2d_ASN1_HEADER;
-+i2d_ASN1_IA5STRING;
-+i2d_ASN1_INTEGER;
-+i2d_ASN1_NULL;
-+i2d_ASN1_OBJECT;
-+i2d_ASN1_OCTET_STRING;
-+i2d_ASN1_PRINTABLE;
-+i2d_ASN1_PRINTABLESTRING;
-+i2d_ASN1_SET;
-+i2d_ASN1_T61STRING;
-+i2d_ASN1_TIME;
-+i2d_ASN1_TYPE;
-+i2d_ASN1_UNIVERSALSTRING;
-+i2d_ASN1_UTCTIME;
-+i2d_ASN1_UTF8STRING;
-+i2d_ASN1_VISIBLESTRING;
-+i2d_ASN1_bytes;
-+i2d_AUTHORITY_INFO_ACCESS;
-+i2d_AUTHORITY_KEYID;
-+i2d_BASIC_CONSTRAINTS;
-+i2d_CERTIFICATEPOLICIES;
-+i2d_CRL_DIST_POINTS;
-+i2d_DHparams;
-+i2d_DIRECTORYSTRING;
-+i2d_DISPLAYTEXT;
-+i2d_DIST_POINT;
-+i2d_DIST_POINT_NAME;
-+i2d_DSAPrivateKey;
-+i2d_DSAPrivateKey_bio;
-+i2d_DSAPrivateKey_fp;
-+i2d_DSAPublicKey;
-+i2d_DSA_PUBKEY;
-+i2d_DSA_PUBKEY_bio;
-+i2d_DSA_PUBKEY_fp;
-+i2d_DSA_SIG;
-+i2d_DSAparams;
-+i2d_ECDSA_SIG;
-+i2d_ECPKPARAMETERS;
-+i2d_ECPKParameters;
-+i2d_ECParameters;
-+i2d_ECPrivateKey;
-+i2d_ECPrivateKey_bio;
-+i2d_ECPrivateKey_fp;
-+i2d_EC_PRIVATEKEY;
-+i2d_EC_PUBKEY;
-+i2d_EC_PUBKEY_bio;
-+i2d_EC_PUBKEY_fp;
-+i2d_EDIPARTYNAME;
-+i2d_EXTENDED_KEY_USAGE;
-+i2d_GENERAL_NAME;
-+i2d_GENERAL_NAMES;
-+i2d_KRB5_APREQ;
-+i2d_KRB5_APREQBODY;
-+i2d_KRB5_AUTHDATA;
-+i2d_KRB5_AUTHENT;
-+i2d_KRB5_AUTHENTBODY;
-+i2d_KRB5_CHECKSUM;
-+i2d_KRB5_ENCDATA;
-+i2d_KRB5_ENCKEY;
-+i2d_KRB5_PRINCNAME;
-+i2d_KRB5_TICKET;
-+i2d_KRB5_TKTBODY;
-+i2d_NETSCAPE_CERT_SEQUENCE;
-+i2d_NETSCAPE_ENCRYPTED_PKEY;
-+i2d_NETSCAPE_PKEY;
-+i2d_NETSCAPE_SPKAC;
-+i2d_NETSCAPE_SPKI;
-+i2d_NOTICEREF;
-+i2d_Netscape_RSA;
-+i2d_OCSP_BASICRESP;
-+i2d_OCSP_CERTID;
-+i2d_OCSP_CERTSTATUS;
-+i2d_OCSP_CRLID;
-+i2d_OCSP_ONEREQ;
-+i2d_OCSP_REQINFO;
-+i2d_OCSP_REQUEST;
-+i2d_OCSP_RESPBYTES;
-+i2d_OCSP_RESPDATA;
-+i2d_OCSP_RESPID;
-+i2d_OCSP_RESPONSE;
-+i2d_OCSP_REVOKEDINFO;
-+i2d_OCSP_SERVICELOC;
-+i2d_OCSP_SIGNATURE;
-+i2d_OCSP_SINGLERESP;
-+i2d_OTHERNAME;
-+i2d_PBE2PARAM;
-+i2d_PBEPARAM;
-+i2d_PBKDF2PARAM;
-+i2d_PKCS12;
-+i2d_PKCS12_BAGS;
-+i2d_PKCS12_MAC_DATA;
-+i2d_PKCS12_SAFEBAG;
-+i2d_PKCS12_bio;
-+i2d_PKCS12_fp;
-+i2d_PKCS7;
-+i2d_PKCS7_DIGEST;
-+i2d_PKCS7_ENCRYPT;
-+i2d_PKCS7_ENC_CONTENT;
-+i2d_PKCS7_ENVELOPE;
-+i2d_PKCS7_ISSUER_AND_SERIAL;
-+i2d_PKCS7_NDEF;
-+i2d_PKCS7_RECIP_INFO;
-+i2d_PKCS7_SIGNED;
-+i2d_PKCS7_SIGNER_INFO;
-+i2d_PKCS7_SIGN_ENVELOPE;
-+i2d_PKCS7_bio;
-+i2d_PKCS7_fp;
-+i2d_PKCS8PrivateKeyInfo_bio;
-+i2d_PKCS8PrivateKeyInfo_fp;
-+i2d_PKCS8PrivateKey_bio;
-+i2d_PKCS8PrivateKey_fp;
-+i2d_PKCS8PrivateKey_nid_bio;
-+i2d_PKCS8PrivateKey_nid_fp;
-+i2d_PKCS8_PRIV_KEY_INFO;
-+i2d_PKCS8_PRIV_KEY_INFO_bio;
-+i2d_PKCS8_PRIV_KEY_INFO_fp;
-+i2d_PKCS8_bio;
-+i2d_PKCS8_fp;
-+i2d_PKEY_USAGE_PERIOD;
-+i2d_POLICYINFO;
-+i2d_POLICYQUALINFO;
-+i2d_PROXY_CERT_INFO_EXTENSION;
-+i2d_PROXY_POLICY;
-+i2d_PUBKEY;
-+i2d_PUBKEY_bio;
-+i2d_PUBKEY_fp;
-+i2d_PrivateKey;
-+i2d_PrivateKey_bio;
-+i2d_PrivateKey_fp;
-+i2d_PublicKey;
-+i2d_RSAPrivateKey;
-+i2d_RSAPrivateKey_bio;
-+i2d_RSAPrivateKey_fp;
-+i2d_RSAPublicKey;
-+i2d_RSAPublicKey_bio;
-+i2d_RSAPublicKey_fp;
-+i2d_RSA_NET;
-+i2d_RSA_PUBKEY;
-+i2d_RSA_PUBKEY_bio;
-+i2d_RSA_PUBKEY_fp;
-+i2d_SXNET;
-+i2d_SXNETID;
-+i2d_USERNOTICE;
-+i2d_X509;
-+i2d_X509_ALGOR;
-+i2d_X509_ATTRIBUTE;
-+i2d_X509_AUX;
-+i2d_X509_CERT_AUX;
-+i2d_X509_CERT_PAIR;
-+i2d_X509_CINF;
-+i2d_X509_CRL;
-+i2d_X509_CRL_INFO;
-+i2d_X509_CRL_bio;
-+i2d_X509_CRL_fp;
-+i2d_X509_EXTENSION;
-+i2d_X509_NAME;
-+i2d_X509_NAME_ENTRY;
-+i2d_X509_PKEY;
-+i2d_X509_PUBKEY;
-+i2d_X509_REQ;
-+i2d_X509_REQ_INFO;
-+i2d_X509_REQ_bio;
-+i2d_X509_REQ_fp;
-+i2d_X509_REVOKED;
-+i2d_X509_SIG;
-+i2d_X509_VAL;
-+i2d_X509_bio;
-+i2d_X509_fp;
-+i2o_ECPublicKey;
-+i2s_ASN1_ENUMERATED;
-+i2s_ASN1_ENUMERATED_TABLE;
-+i2s_ASN1_INTEGER;
-+i2s_ASN1_OCTET_STRING;
-+i2t_ASN1_OBJECT;
-+i2v_ASN1_BIT_STRING;
-+i2v_GENERAL_NAME;
-+i2v_GENERAL_NAMES;
-+idea_cbc_encrypt;
-+idea_cfb64_encrypt;
-+idea_ecb_encrypt;
-+idea_encrypt;
-+idea_ofb64_encrypt;
-+idea_options;
-+idea_set_decrypt_key;
-+idea_set_encrypt_key;
-+level_add_node;
-+level_find_node;
-+lh_delete;
-+lh_doall;
-+lh_doall_arg;
-+lh_free;
-+lh_insert;
-+lh_new;
-+lh_node_stats;
-+lh_node_stats_bio;
-+lh_node_usage_stats;
-+lh_node_usage_stats_bio;
-+lh_num_items;
-+lh_retrieve;
-+lh_stats;
-+lh_stats_bio;
-+lh_strhash;
-+lh_version;
-+md4_block_data_order;
-+md4_block_host_order;
-+md5_block_asm_data_order_aligned;
-+md5_block_data_order;
-+md5_block_host_order;
-+ms_time_cmp;
-+ms_time_diff;
-+ms_time_free;
-+ms_time_get;
-+ms_time_new;
-+name_cmp;
-+o2i_ECPublicKey;
-+pitem_free;
-+pitem_new;
-+policy_cache_find_data;
-+policy_cache_free;
-+policy_cache_set;
-+policy_cache_set_mapping;
-+policy_data_free;
-+policy_data_new;
-+policy_node_cmp_new;
-+policy_node_free;
-+pqueue_find;
-+pqueue_free;
-+pqueue_insert;
-+pqueue_iterator;
-+pqueue_new;
-+pqueue_next;
-+pqueue_peek;
-+pqueue_pop;
-+pqueue_print;
-+rand_ssleay_meth;
-+ripemd160_block_data_order;
-+ripemd160_block_host_order;
-+s2i_ASN1_INTEGER;
-+s2i_ASN1_OCTET_STRING;
-+sha1_block_data_order;
-+sha1_block_host_order;
-+sha256_block_data_order;
-+sha256_block_host_order;
-+sha_block_data_order;
-+sha_block_host_order;
-+sk_delete;
-+sk_delete_ptr;
-+sk_dup;
-+sk_find;
-+sk_find_ex;
-+sk_free;
-+sk_insert;
-+sk_is_sorted;
-+sk_new;
-+sk_new_null;
-+sk_num;
-+sk_pop;
-+sk_pop_free;
-+sk_push;
-+sk_set;
-+sk_set_cmp_func;
-+sk_shift;
-+sk_sort;
-+sk_unshift;
-+sk_value;
-+sk_zero;
-+string_to_hex;
-+tree_find_sk;
-+uni2asc;
-+v2i_ASN1_BIT_STRING;
-+v2i_GENERAL_NAME;
-+v2i_GENERAL_NAMES;
-+v2i_GENERAL_NAME_ex;
-+v3_akey_id;
-+v3_alt;
-+v3_bcons;
-+v3_cpols;
-+v3_crl_hold;
-+v3_crl_invdate;
-+v3_crl_num;
-+v3_crl_reason;
-+v3_crld;
-+v3_delta_crl;
-+v3_ext_ku;
-+v3_info;
-+v3_inhibit_anyp;
-+v3_key_usage;
-+v3_name_constraints;
-+v3_ns_ia5_list;
-+v3_nscert;
-+v3_ocsp_accresp;
-+v3_ocsp_acutoff;
-+v3_ocsp_crlid;
-+v3_ocsp_nocheck;
-+v3_ocsp_nonce;
-+v3_ocsp_serviceloc;
-+v3_pci;
-+v3_pkey_usage_period;
-+v3_policy_constraints;
-+v3_policy_mappings;
-+v3_sinfo;
-+v3_skey_id;
-+v3_sxnet;
-+x509_dir_lookup;
-+x509_file_lookup;
-+x509_name_ff;
-+	local:
-+		*;
-+};
---- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map	2010-03-26 15:26:55.966057991 +0100
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	2010-03-26 15:31:58.552966503 +0100
-@@ -1 +1,445 @@
--dummy
-+LIBSSL_OOO_0_9_8o {
-+	global:
-+BIO_f_ssl;
-+BIO_new_buffer_ssl_connect;
-+BIO_new_ssl;
-+BIO_new_ssl_connect;
-+BIO_ssl_copy_session_id;
-+BIO_ssl_shutdown;
-+DTLSv1_client_method;
-+DTLSv1_enc_data;
-+DTLSv1_method;
-+DTLSv1_server_method;
-+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8o;
-+SSL_CIPHER_description;
-+SSL_CIPHER_get_bits;
-+SSL_CIPHER_get_name;
-+SSL_CIPHER_get_version;
-+SSL_COMP_add_compression_method;
-+SSL_COMP_get_compression_methods;
-+SSL_COMP_get_name;
-+SSL_CTX_add_client_CA;
-+SSL_CTX_add_session;
-+SSL_CTX_callback_ctrl;
-+SSL_CTX_check_private_key;
-+SSL_CTX_ctrl;
-+SSL_CTX_flush_sessions;
-+SSL_CTX_free;
-+SSL_CTX_get_cert_store;
-+SSL_CTX_get_client_CA_list;
-+SSL_CTX_get_client_cert_cb;
-+SSL_CTX_get_ex_data;
-+SSL_CTX_get_ex_new_index;
-+SSL_CTX_get_info_callback;
-+SSL_CTX_get_quiet_shutdown;
-+SSL_CTX_get_timeout;
-+SSL_CTX_get_verify_callback;
-+SSL_CTX_get_verify_depth;
-+SSL_CTX_get_verify_mode;
-+SSL_CTX_load_verify_locations;
-+SSL_CTX_new;
-+SSL_CTX_remove_session;
-+SSL_CTX_sess_get_get_cb;
-+SSL_CTX_sess_get_new_cb;
-+SSL_CTX_sess_get_remove_cb;
-+SSL_CTX_sess_set_get_cb;
-+SSL_CTX_sess_set_new_cb;
-+SSL_CTX_sess_set_remove_cb;
-+SSL_CTX_sessions;
-+SSL_CTX_set_cert_store;
-+SSL_CTX_set_cert_verify_callback;
-+SSL_CTX_set_cipher_list;
-+SSL_CTX_set_client_CA_list;
-+SSL_CTX_set_client_cert_cb;
-+SSL_CTX_set_cookie_generate_cb;
-+SSL_CTX_set_cookie_verify_cb;
-+SSL_CTX_set_default_passwd_cb;
-+SSL_CTX_set_default_passwd_cb_userdata;
-+SSL_CTX_set_default_verify_paths;
-+SSL_CTX_set_ex_data;
-+SSL_CTX_set_generate_session_id;
-+SSL_CTX_set_info_callback;
-+SSL_CTX_set_msg_callback;
-+SSL_CTX_set_purpose;
-+SSL_CTX_set_quiet_shutdown;
-+SSL_CTX_set_session_id_context;
-+SSL_CTX_set_ssl_version;
-+SSL_CTX_set_timeout;
-+SSL_CTX_set_tmp_dh_callback;
-+SSL_CTX_set_tmp_ecdh_callback;
-+SSL_CTX_set_tmp_rsa_callback;
-+SSL_CTX_set_trust;
-+SSL_CTX_set_verify;
-+SSL_CTX_set_verify_depth;
-+SSL_CTX_use_PrivateKey;
-+SSL_CTX_use_PrivateKey_ASN1;
-+SSL_CTX_use_PrivateKey_file;
-+SSL_CTX_use_RSAPrivateKey;
-+SSL_CTX_use_RSAPrivateKey_ASN1;
-+SSL_CTX_use_RSAPrivateKey_file;
-+SSL_CTX_use_certificate;
-+SSL_CTX_use_certificate_ASN1;
-+SSL_CTX_use_certificate_chain_file;
-+SSL_CTX_use_certificate_file;
-+SSL_SESSION_cmp;
-+SSL_SESSION_free;
-+SSL_SESSION_get_ex_data;
-+SSL_SESSION_get_ex_new_index;
-+SSL_SESSION_get_id;
-+SSL_SESSION_get_time;
-+SSL_SESSION_get_timeout;
-+SSL_SESSION_hash;
-+SSL_SESSION_new;
-+SSL_SESSION_print;
-+SSL_SESSION_print_fp;
-+SSL_SESSION_set_ex_data;
-+SSL_SESSION_set_time;
-+SSL_SESSION_set_timeout;
-+SSL_accept;
-+SSL_add_client_CA;
-+SSL_add_dir_cert_subjects_to_stack;
-+SSL_add_file_cert_subjects_to_stack;
-+SSL_alert_desc_string;
-+SSL_alert_desc_string_long;
-+SSL_alert_type_string;
-+SSL_alert_type_string_long;
-+SSL_callback_ctrl;
-+SSL_check_private_key;
-+SSL_clear;
-+SSL_connect;
-+SSL_copy_session_id;
-+SSL_ctrl;
-+SSL_do_handshake;
-+SSL_dup;
-+SSL_dup_CA_list;
-+SSL_free;
-+SSL_get1_session;
-+SSL_get_SSL_CTX;
-+SSL_get_certificate;
-+SSL_get_cipher_list;
-+SSL_get_ciphers;
-+SSL_get_client_CA_list;
-+SSL_get_current_cipher;
-+SSL_get_current_compression;
-+SSL_get_current_expansion;
-+SSL_get_default_timeout;
-+SSL_get_error;
-+SSL_get_ex_data;
-+SSL_get_ex_data_X509_STORE_CTX_idx;
-+SSL_get_ex_new_index;
-+SSL_get_fd;
-+SSL_get_finished;
-+SSL_get_info_callback;
-+SSL_get_peer_cert_chain;
-+SSL_get_peer_certificate;
-+SSL_get_peer_finished;
-+SSL_get_privatekey;
-+SSL_get_quiet_shutdown;
-+SSL_get_rbio;
-+SSL_get_read_ahead;
-+SSL_get_rfd;
-+SSL_get_session;
-+SSL_get_shared_ciphers;
-+SSL_get_shutdown;
-+SSL_get_ssl_method;
-+SSL_get_verify_callback;
-+SSL_get_verify_depth;
-+SSL_get_verify_mode;
-+SSL_get_verify_result;
-+SSL_get_version;
-+SSL_get_wbio;
-+SSL_get_wfd;
-+SSL_has_matching_session_id;
-+SSL_library_init;
-+SSL_load_client_CA_file;
-+SSL_load_error_strings;
-+SSL_new;
-+SSL_peek;
-+SSL_pending;
-+SSL_read;
-+SSL_renegotiate;
-+SSL_renegotiate_pending;
-+SSL_rstate_string;
-+SSL_rstate_string_long;
-+SSL_set_accept_state;
-+SSL_set_bio;
-+SSL_set_cipher_list;
-+SSL_set_client_CA_list;
-+SSL_set_connect_state;
-+SSL_set_ex_data;
-+SSL_set_fd;
-+SSL_set_generate_session_id;
-+SSL_set_info_callback;
-+SSL_set_msg_callback;
-+SSL_set_purpose;
-+SSL_set_quiet_shutdown;
-+SSL_set_read_ahead;
-+SSL_set_rfd;
-+SSL_set_session;
-+SSL_set_session_id_context;
-+SSL_set_shutdown;
-+SSL_set_ssl_method;
-+SSL_set_tmp_dh_callback;
-+SSL_set_tmp_ecdh_callback;
-+SSL_set_tmp_rsa_callback;
-+SSL_set_trust;
-+SSL_set_verify;
-+SSL_set_verify_depth;
-+SSL_set_verify_result;
-+SSL_set_wfd;
-+SSL_shutdown;
-+SSL_state;
-+SSL_state_string;
-+SSL_state_string_long;
-+SSL_use_PrivateKey;
-+SSL_use_PrivateKey_ASN1;
-+SSL_use_PrivateKey_file;
-+SSL_use_RSAPrivateKey;
-+SSL_use_RSAPrivateKey_ASN1;
-+SSL_use_RSAPrivateKey_file;
-+SSL_use_certificate;
-+SSL_use_certificate_ASN1;
-+SSL_use_certificate_file;
-+SSL_version;
-+SSL_version_str;
-+SSL_want;
-+SSL_write;
-+SSLv23_client_method;
-+SSLv23_method;
-+SSLv23_server_method;
-+SSLv2_client_method;
-+SSLv2_method;
-+SSLv2_server_method;
-+SSLv3_client_method;
-+SSLv3_enc_data;
-+SSLv3_method;
-+SSLv3_server_method;
-+TLSv1_client_method;
-+TLSv1_enc_data;
-+TLSv1_method;
-+TLSv1_server_method;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+_PROCEDURE_LINKAGE_TABLE_;
-+_edata;
-+_end;
-+_etext;
-+_fini;
-+_init;
-+_lib_version;
-+check_srvr_ecc_cert_and_alg;
-+d2i_SSL_SESSION;
-+do_dtls1_write;
-+dtls1_accept;
-+dtls1_buffer_message;
-+dtls1_clear;
-+dtls1_clear_record_buffer;
-+dtls1_client_hello;
-+dtls1_connect;
-+dtls1_default_timeout;
-+dtls1_dispatch_alert;
-+dtls1_do_write;
-+dtls1_enc;
-+dtls1_free;
-+dtls1_get_ccs_header;
-+dtls1_get_message;
-+dtls1_get_message_header;
-+dtls1_get_record;
-+dtls1_new;
-+dtls1_output_cert_chain;
-+dtls1_read_bytes;
-+dtls1_read_failed;
-+dtls1_reset_seq_numbers;
-+dtls1_retransmit_message;
-+dtls1_send_certificate_request;
-+dtls1_send_change_cipher_spec;
-+dtls1_send_client_certificate;
-+dtls1_send_client_key_exchange;
-+dtls1_send_client_verify;
-+dtls1_send_finished;
-+dtls1_send_hello_request;
-+dtls1_send_server_certificate;
-+dtls1_send_server_done;
-+dtls1_send_server_hello;
-+dtls1_send_server_key_exchange;
-+dtls1_set_message_header;
-+dtls1_version_str;
-+dtls1_write_app_data_bytes;
-+dtls1_write_bytes;
-+dtlsv1_base_method;
-+i2d_SSL_SESSION;
-+ssl23_accept;
-+ssl23_connect;
-+ssl23_default_timeout;
-+ssl23_get_cipher;
-+ssl23_get_cipher_by_char;
-+ssl23_get_client_hello;
-+ssl23_num_ciphers;
-+ssl23_peek;
-+ssl23_put_cipher_by_char;
-+ssl23_read;
-+ssl23_read_bytes;
-+ssl23_write;
-+ssl23_write_bytes;
-+ssl2_accept;
-+ssl2_callback_ctrl;
-+ssl2_ciphers;
-+ssl2_clear;
-+ssl2_connect;
-+ssl2_ctrl;
-+ssl2_ctx_callback_ctrl;
-+ssl2_ctx_ctrl;
-+ssl2_default_timeout;
-+ssl2_do_write;
-+ssl2_enc;
-+ssl2_enc_init;
-+ssl2_free;
-+ssl2_generate_key_material;
-+ssl2_get_cipher;
-+ssl2_get_cipher_by_char;
-+ssl2_mac;
-+ssl2_new;
-+ssl2_num_ciphers;
-+ssl2_part_read;
-+ssl2_peek;
-+ssl2_pending;
-+ssl2_put_cipher_by_char;
-+ssl2_read;
-+ssl2_return_error;
-+ssl2_set_certificate;
-+ssl2_shutdown;
-+ssl2_version_str;
-+ssl2_write;
-+ssl2_write_error;
-+ssl3_accept;
-+ssl3_alert_code;
-+ssl3_callback_ctrl;
-+ssl3_cert_verify_mac;
-+ssl3_change_cipher_state;
-+ssl3_check_cert_and_algorithm;
-+ssl3_check_client_hello;
-+ssl3_choose_cipher;
-+ssl3_ciphers;
-+ssl3_cleanup_key_block;
-+ssl3_clear;
-+ssl3_client_hello;
-+ssl3_comp_find;
-+ssl3_connect;
-+ssl3_ctrl;
-+ssl3_ctx_callback_ctrl;
-+ssl3_ctx_ctrl;
-+ssl3_default_timeout;
-+ssl3_dispatch_alert;
-+ssl3_do_change_cipher_spec;
-+ssl3_do_compress;
-+ssl3_do_uncompress;
-+ssl3_do_write;
-+ssl3_enc;
-+ssl3_final_finish_mac;
-+ssl3_finish_mac;
-+ssl3_free;
-+ssl3_generate_master_secret;
-+ssl3_get_cert_verify;
-+ssl3_get_certificate_request;
-+ssl3_get_cipher;
-+ssl3_get_cipher_by_char;
-+ssl3_get_client_certificate;
-+ssl3_get_client_hello;
-+ssl3_get_client_key_exchange;
-+ssl3_get_finished;
-+ssl3_get_key_exchange;
-+ssl3_get_message;
-+ssl3_get_req_cert_type;
-+ssl3_get_server_certificate;
-+ssl3_get_server_done;
-+ssl3_get_server_hello;
-+ssl3_init_finished_mac;
-+ssl3_mac;
-+ssl3_new;
-+ssl3_num_ciphers;
-+ssl3_output_cert_chain;
-+ssl3_peek;
-+ssl3_pending;
-+ssl3_put_cipher_by_char;
-+ssl3_read;
-+ssl3_read_bytes;
-+ssl3_read_n;
-+ssl3_record_sequence_update;
-+ssl3_renegotiate;
-+ssl3_renegotiate_check;
-+ssl3_send_alert;
-+ssl3_send_certificate_request;
-+ssl3_send_change_cipher_spec;
-+ssl3_send_client_certificate;
-+ssl3_send_client_key_exchange;
-+ssl3_send_client_verify;
-+ssl3_send_finished;
-+ssl3_send_hello_request;
-+ssl3_send_server_certificate;
-+ssl3_send_server_done;
-+ssl3_send_server_hello;
-+ssl3_send_server_key_exchange;
-+ssl3_setup_buffers;
-+ssl3_setup_key_block;
-+ssl3_shutdown;
-+ssl3_undef_enc_method;
-+ssl3_version_str;
-+ssl3_write;
-+ssl3_write_bytes;
-+ssl3_write_pending;
-+ssl_bad_method;
-+ssl_bytes_to_cipher_list;
-+ssl_cert_dup;
-+ssl_cert_free;
-+ssl_cert_inst;
-+ssl_cert_new;
-+ssl_cert_type;
-+ssl_cipher_get_disabled;
-+ssl_cipher_get_evp;
-+ssl_cipher_id_cmp;
-+ssl_cipher_list_to_bytes;
-+ssl_cipher_ptr_id_cmp;
-+ssl_clear_bad_session;
-+ssl_clear_cipher_ctx;
-+ssl_create_cipher_list;
-+ssl_free_wbio_buffer;
-+ssl_get_ciphers_by_id;
-+ssl_get_new_session;
-+ssl_get_prev_session;
-+ssl_get_server_send_cert;
-+ssl_get_sign_pkey;
-+ssl_init_wbio_buffer;
-+ssl_load_ciphers;
-+ssl_ok;
-+ssl_sess_cert_free;
-+ssl_sess_cert_new;
-+ssl_set_cert_masks;
-+ssl_set_peer_cert_type;
-+ssl_undefined_const_function;
-+ssl_undefined_function;
-+ssl_undefined_void_function;
-+ssl_update_cache;
-+ssl_verify_alarm_type;
-+ssl_verify_cert_chain;
-+sslv23_base_method;
-+sslv2_base_method;
-+sslv3_base_method;
-+tls1_alert_code;
-+tls1_cert_verify_mac;
-+tls1_change_cipher_state;
-+tls1_clear;
-+tls1_default_timeout;
-+tls1_enc;
-+tls1_final_finish_mac;
-+tls1_free;
-+tls1_generate_master_secret;
-+tls1_mac;
-+tls1_new;
-+tls1_setup_key_block;
-+tls1_version_str;
-+tlsv1_base_method;
-+	local:
-+		*;
-+};
-+
diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch
deleted file mode 100644
index 4c99853..0000000
--- a/openssl/opensslmacosx.patch
+++ /dev/null
@@ -1,3751 +0,0 @@
---- misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	2007-10-16 15:44:13.000000000 +0200
-@@ -0,1 +1,3304 @@
-+LIBCRYPTO_OOO_0_9_8o{
-+	global:
-+ACCESS_DESCRIPTION_free;
-+ACCESS_DESCRIPTION_it;
-+ACCESS_DESCRIPTION_new;
-+AES_Td;
-+AES_Te;
-+AES_bi_ige_encrypt;
-+AES_cbc_encrypt;
-+AES_cfb128_encrypt;
-+AES_cfb1_encrypt;
-+AES_cfb8_encrypt;
-+AES_cfbr_encrypt_block;
-+AES_ctr128_encrypt;
-+AES_decrypt;
-+AES_ecb_encrypt;
-+AES_encrypt;
-+AES_ige_encrypt;
-+AES_ofb128_encrypt;
-+AES_options;
-+AES_set_decrypt_key;
-+AES_set_encrypt_key;
-+AES_version;
-+ASN1_ANY_it;
-+ASN1_BIT_STRING_asn1_meth;
-+ASN1_BIT_STRING_free;
-+ASN1_BIT_STRING_get_bit;
-+ASN1_BIT_STRING_it;
-+ASN1_BIT_STRING_name_print;
-+ASN1_BIT_STRING_new;
-+ASN1_BIT_STRING_num_asc;
-+ASN1_BIT_STRING_set;
-+ASN1_BIT_STRING_set_asc;
-+ASN1_BIT_STRING_set_bit;
-+ASN1_BMPSTRING_free;
-+ASN1_BMPSTRING_it;
-+ASN1_BMPSTRING_new;
-+ASN1_BOOLEAN_it;
-+ASN1_ENUMERATED_free;
-+ASN1_ENUMERATED_get;
-+ASN1_ENUMERATED_it;
-+ASN1_ENUMERATED_new;
-+ASN1_ENUMERATED_set;
-+ASN1_ENUMERATED_to_BN;
-+ASN1_FBOOLEAN_it;
-+ASN1_GENERALIZEDTIME_check;
-+ASN1_GENERALIZEDTIME_free;
-+ASN1_GENERALIZEDTIME_it;
-+ASN1_GENERALIZEDTIME_new;
-+ASN1_GENERALIZEDTIME_print;
-+ASN1_GENERALIZEDTIME_set;
-+ASN1_GENERALIZEDTIME_set_string;
-+ASN1_GENERALSTRING_free;
-+ASN1_GENERALSTRING_it;
-+ASN1_GENERALSTRING_new;
-+ASN1_HEADER_free;
-+ASN1_HEADER_new;
-+ASN1_IA5STRING_asn1_meth;
-+ASN1_IA5STRING_free;
-+ASN1_IA5STRING_it;
-+ASN1_IA5STRING_new;
-+ASN1_INTEGER_cmp;
-+ASN1_INTEGER_dup;
-+ASN1_INTEGER_free;
-+ASN1_INTEGER_get;
-+ASN1_INTEGER_it;
-+ASN1_INTEGER_new;
-+ASN1_INTEGER_set;
-+ASN1_INTEGER_to_BN;
-+ASN1_NULL_free;
-+ASN1_NULL_it;
-+ASN1_NULL_new;
-+ASN1_OBJECT_create;
-+ASN1_OBJECT_free;
-+ASN1_OBJECT_it;
-+ASN1_OBJECT_new;
-+ASN1_OCTET_STRING_NDEF_it;
-+ASN1_OCTET_STRING_cmp;
-+ASN1_OCTET_STRING_dup;
-+ASN1_OCTET_STRING_free;
-+ASN1_OCTET_STRING_it;
-+ASN1_OCTET_STRING_new;
-+ASN1_OCTET_STRING_set;
-+ASN1_PRINTABLESTRING_free;
-+ASN1_PRINTABLESTRING_it;
-+ASN1_PRINTABLESTRING_new;
-+ASN1_PRINTABLE_free;
-+ASN1_PRINTABLE_it;
-+ASN1_PRINTABLE_new;
-+ASN1_PRINTABLE_type;
-+ASN1_SEQUENCE_it;
-+ASN1_STRING_TABLE_add;
-+ASN1_STRING_TABLE_cleanup;
-+ASN1_STRING_TABLE_get;
-+ASN1_STRING_cmp;
-+ASN1_STRING_data;
-+ASN1_STRING_dup;
-+ASN1_STRING_encode;
-+ASN1_STRING_free;
-+ASN1_STRING_get_default_mask;
-+ASN1_STRING_length;
-+ASN1_STRING_length_set;
-+ASN1_STRING_new;
-+ASN1_STRING_print;
-+ASN1_STRING_print_ex;
-+ASN1_STRING_print_ex_fp;
-+ASN1_STRING_set;
-+ASN1_STRING_set_by_NID;
-+ASN1_STRING_set_default_mask;
-+ASN1_STRING_set_default_mask_asc;
-+ASN1_STRING_to_UTF8;
-+ASN1_STRING_type;
-+ASN1_STRING_type_new;
-+ASN1_T61STRING_free;
-+ASN1_T61STRING_it;
-+ASN1_T61STRING_new;
-+ASN1_TBOOLEAN_it;
-+ASN1_TIME_check;
-+ASN1_TIME_free;
-+ASN1_TIME_it;
-+ASN1_TIME_new;
-+ASN1_TIME_print;
-+ASN1_TIME_set;
-+ASN1_TIME_to_generalizedtime;
-+ASN1_TYPE_free;
-+ASN1_TYPE_get;
-+ASN1_TYPE_get_int_octetstring;
-+ASN1_TYPE_get_octetstring;
-+ASN1_TYPE_new;
-+ASN1_TYPE_set;
-+ASN1_TYPE_set_int_octetstring;
-+ASN1_TYPE_set_octetstring;
-+ASN1_UNIVERSALSTRING_free;
-+ASN1_UNIVERSALSTRING_it;
-+ASN1_UNIVERSALSTRING_new;
-+ASN1_UNIVERSALSTRING_to_string;
-+ASN1_UTCTIME_check;
-+ASN1_UTCTIME_cmp_time_t;
-+ASN1_UTCTIME_free;
-+ASN1_UTCTIME_it;
-+ASN1_UTCTIME_new;
-+ASN1_UTCTIME_print;
-+ASN1_UTCTIME_set;
-+ASN1_UTCTIME_set_string;
-+ASN1_UTF8STRING_free;
-+ASN1_UTF8STRING_it;
-+ASN1_UTF8STRING_new;
-+ASN1_VISIBLESTRING_free;
-+ASN1_VISIBLESTRING_it;
-+ASN1_VISIBLESTRING_new;
-+ASN1_add_oid_module;
-+ASN1_check_infinite_end;
-+ASN1_const_check_infinite_end;
-+ASN1_d2i_bio;
-+ASN1_d2i_fp;
-+ASN1_digest;
-+ASN1_dup;
-+ASN1_generate_nconf;
-+ASN1_generate_v3;
-+ASN1_get_object;
-+ASN1_i2d_bio;
-+ASN1_i2d_fp;
-+ASN1_item_d2i;
-+ASN1_item_d2i_bio;
-+ASN1_item_d2i_fp;
-+ASN1_item_digest;
-+ASN1_item_dup;
-+ASN1_item_ex_d2i;
-+ASN1_item_ex_free;
-+ASN1_item_ex_i2d;
-+ASN1_item_ex_new;
-+ASN1_item_free;
-+ASN1_item_i2d;
-+ASN1_item_i2d_bio;
-+ASN1_item_i2d_fp;
-+ASN1_item_ndef_i2d;
-+ASN1_item_new;
-+ASN1_item_pack;
-+ASN1_item_sign;
-+ASN1_item_unpack;
-+ASN1_item_verify;
-+ASN1_mbstring_copy;
-+ASN1_mbstring_ncopy;
-+ASN1_object_size;
-+ASN1_pack_string;
-+ASN1_parse;
-+ASN1_parse_dump;
-+ASN1_primitive_free;
-+ASN1_primitive_new;
-+ASN1_put_eoc;
-+ASN1_put_object;
-+ASN1_seq_pack;
-+ASN1_seq_unpack;
-+ASN1_sign;
-+ASN1_tag2bit;
-+ASN1_tag2str;
-+ASN1_template_d2i;
-+ASN1_template_free;
-+ASN1_template_i2d;
-+ASN1_template_new;
-+ASN1_unpack_string;
-+ASN1_verify;
-+ASN1_version;
-+AUTHORITY_INFO_ACCESS_free;
-+AUTHORITY_INFO_ACCESS_it;
-+AUTHORITY_INFO_ACCESS_new;
-+AUTHORITY_KEYID_free;
-+AUTHORITY_KEYID_it;
-+AUTHORITY_KEYID_new;
-+BASIC_CONSTRAINTS_free;
-+BASIC_CONSTRAINTS_it;
-+BASIC_CONSTRAINTS_new;
-+BF_cbc_encrypt;
-+BF_cfb64_encrypt;
-+BF_decrypt;
-+BF_ecb_encrypt;
-+BF_encrypt;
-+BF_ofb64_encrypt;
-+BF_options;
-+BF_set_key;
-+BF_version;
-+BIGNUM_it;
-+BIO_ACCEPT_free;
-+BIO_ACCEPT_new;
-+BIO_CONNECT_free;
-+BIO_CONNECT_new;
-+BIO_accept;
-+BIO_callback_ctrl;
-+BIO_clear_flags;
-+BIO_copy_next_retry;
-+BIO_ctrl;
-+BIO_ctrl_get_read_request;
-+BIO_ctrl_get_write_guarantee;
-+BIO_ctrl_pending;
-+BIO_ctrl_reset_read_request;
-+BIO_ctrl_wpending;
-+BIO_debug_callback;
-+BIO_dgram_non_fatal_error;
-+BIO_dgram_should_retry;
-+BIO_dump;
-+BIO_dump_cb;
-+BIO_dump_fp;
-+BIO_dump_indent;
-+BIO_dump_indent_cb;
-+BIO_dump_indent_fp;
-+BIO_dup_chain;
-+BIO_f_base64;
-+BIO_f_buffer;
-+BIO_f_cipher;
-+BIO_f_md;
-+BIO_f_nbio_test;
-+BIO_f_null;
-+BIO_f_reliable;
-+BIO_fd_non_fatal_error;
-+BIO_fd_should_retry;
-+BIO_find_type;
-+BIO_free;
-+BIO_free_all;
-+BIO_get_accept_socket;
-+BIO_get_callback;
-+BIO_get_callback_arg;
-+BIO_get_ex_data;
-+BIO_get_ex_new_index;
-+BIO_get_host_ip;
-+BIO_get_port;
-+BIO_get_retry_BIO;
-+BIO_get_retry_reason;
-+BIO_gethostbyname;
-+BIO_gets;
-+BIO_indent;
-+BIO_int_ctrl;
-+BIO_method_name;
-+BIO_method_type;
-+BIO_new;
-+BIO_new_accept;
-+BIO_new_bio_pair;
-+BIO_new_connect;
-+BIO_new_dgram;
-+BIO_new_fd;
-+BIO_new_file;
-+BIO_new_fp;
-+BIO_new_mem_buf;
-+BIO_new_socket;
-+BIO_next;
-+BIO_nread;
-+BIO_nread0;
-+BIO_number_read;
-+BIO_number_written;
-+BIO_nwrite;
-+BIO_nwrite0;
-+BIO_pop;
-+BIO_printf;
-+BIO_ptr_ctrl;
-+BIO_push;
-+BIO_puts;
-+BIO_read;
-+BIO_s_accept;
-+BIO_s_bio;
-+BIO_s_connect;
-+BIO_s_datagram;
-+BIO_s_fd;
-+BIO_s_file;
-+BIO_s_log;
-+BIO_s_mem;
-+BIO_s_null;
-+BIO_s_socket;
-+BIO_set;
-+BIO_set_callback;
-+BIO_set_callback_arg;
-+BIO_set_cipher;
-+BIO_set_ex_data;
-+BIO_set_flags;
-+BIO_set_tcp_ndelay;
-+BIO_snprintf;
-+BIO_sock_cleanup;
-+BIO_sock_error;
-+BIO_sock_init;
-+BIO_sock_non_fatal_error;
-+BIO_sock_should_retry;
-+BIO_socket_ioctl;
-+BIO_socket_nbio;
-+BIO_test_flags;
-+BIO_vfree;
-+BIO_vprintf;
-+BIO_vsnprintf;
-+BIO_write;
-+BN_BLINDING_convert;
-+BN_BLINDING_convert_ex;
-+BN_BLINDING_create_param;
-+BN_BLINDING_free;
-+BN_BLINDING_get_flags;
-+BN_BLINDING_get_thread_id;
-+BN_BLINDING_invert;
-+BN_BLINDING_invert_ex;
-+BN_BLINDING_new;
-+BN_BLINDING_set_flags;
-+BN_BLINDING_set_thread_id;
-+BN_BLINDING_update;
-+BN_CTX_end;
-+BN_CTX_free;
-+BN_CTX_get;
-+BN_CTX_init;
-+BN_CTX_new;
-+BN_CTX_start;
-+BN_GENCB_call;
-+BN_GF2m_add;
-+BN_GF2m_arr2poly;
-+BN_GF2m_mod;
-+BN_GF2m_mod_arr;
-+BN_GF2m_mod_div;
-+BN_GF2m_mod_div_arr;
-+BN_GF2m_mod_exp;
-+BN_GF2m_mod_exp_arr;
-+BN_GF2m_mod_inv;
-+BN_GF2m_mod_inv_arr;
-+BN_GF2m_mod_mul;
-+BN_GF2m_mod_mul_arr;
-+BN_GF2m_mod_solve_quad;
-+BN_GF2m_mod_solve_quad_arr;
-+BN_GF2m_mod_sqr;
-+BN_GF2m_mod_sqr_arr;
-+BN_GF2m_mod_sqrt;
-+BN_GF2m_mod_sqrt_arr;
-+BN_GF2m_poly2arr;
-+BN_MONT_CTX_copy;
-+BN_MONT_CTX_free;
-+BN_MONT_CTX_init;
-+BN_MONT_CTX_new;
-+BN_MONT_CTX_set;
-+BN_MONT_CTX_set_locked;
-+BN_RECP_CTX_free;
-+BN_RECP_CTX_init;
-+BN_RECP_CTX_new;
-+BN_RECP_CTX_set;
-+BN_add;
-+BN_add_word;
-+BN_bin2bn;
-+BN_bn2bin;
-+BN_bn2dec;
-+BN_bn2hex;
-+BN_bn2mpi;
-+BN_bntest_rand;
-+BN_clear;
-+BN_clear_bit;
-+BN_clear_free;
-+BN_cmp;
-+BN_copy;
-+BN_dec2bn;
-+BN_div;
-+BN_div_recp;
-+BN_div_word;
-+BN_dup;
-+BN_exp;
-+BN_free;
-+BN_from_montgomery;
-+BN_gcd;
-+BN_generate_prime;
-+BN_generate_prime_ex;
-+BN_get0_nist_prime_192;
-+BN_get0_nist_prime_224;
-+BN_get0_nist_prime_256;
-+BN_get0_nist_prime_384;
-+BN_get0_nist_prime_521;
-+BN_get_params;
-+BN_get_word;
-+BN_hex2bn;
-+BN_init;
-+BN_is_bit_set;
-+BN_is_prime;
-+BN_is_prime_ex;
-+BN_is_prime_fasttest;
-+BN_is_prime_fasttest_ex;
-+BN_kronecker;
-+BN_lshift;
-+BN_lshift1;
-+BN_mask_bits;
-+BN_mod_add;
-+BN_mod_add_quick;
-+BN_mod_exp;
-+BN_mod_exp2_mont;
-+BN_mod_exp_mont;
-+BN_mod_exp_mont_consttime;
-+BN_mod_exp_mont_word;
-+BN_mod_exp_recp;
-+BN_mod_exp_simple;
-+BN_mod_inverse;
-+BN_mod_lshift;
-+BN_mod_lshift1;
-+BN_mod_lshift1_quick;
-+BN_mod_lshift_quick;
-+BN_mod_mul;
-+BN_mod_mul_montgomery;
-+BN_mod_mul_reciprocal;
-+BN_mod_sqr;
-+BN_mod_sqrt;
-+BN_mod_sub;
-+BN_mod_sub_quick;
-+BN_mod_word;
-+BN_mpi2bn;
-+BN_mul;
-+BN_mul_word;
-+BN_new;
-+BN_nist_mod_192;
-+BN_nist_mod_224;
-+BN_nist_mod_256;
-+BN_nist_mod_384;
-+BN_nist_mod_521;
-+BN_nnmod;
-+BN_num_bits;
-+BN_num_bits_word;
-+BN_options;
-+BN_print;
-+BN_print_fp;
-+BN_pseudo_rand;
-+BN_pseudo_rand_range;
-+BN_rand;
-+BN_rand_range;
-+BN_reciprocal;
-+BN_rshift;
-+BN_rshift1;
-+BN_set_bit;
-+BN_set_negative;
-+BN_set_params;
-+BN_set_word;
-+BN_sqr;
-+BN_sub;
-+BN_sub_word;
-+BN_swap;
-+BN_to_ASN1_ENUMERATED;
-+BN_to_ASN1_INTEGER;
-+BN_uadd;
-+BN_ucmp;
-+BN_usub;
-+BN_value_one;
-+BN_version;
-+BUF_MEM_free;
-+BUF_MEM_grow;
-+BUF_MEM_grow_clean;
-+BUF_MEM_new;
-+BUF_memdup;
-+BUF_strdup;
-+BUF_strlcat;
-+BUF_strlcpy;
-+BUF_strndup;
-+CAST_S_table0;
-+CAST_S_table1;
-+CAST_S_table2;
-+CAST_S_table3;
-+CAST_S_table4;
-+CAST_S_table5;
-+CAST_S_table6;
-+CAST_S_table7;
-+CAST_cbc_encrypt;
-+CAST_cfb64_encrypt;
-+CAST_decrypt;
-+CAST_ecb_encrypt;
-+CAST_encrypt;
-+CAST_ofb64_encrypt;
-+CAST_set_key;
-+CAST_version;
-+CBIGNUM_it;
-+CERTIFICATEPOLICIES_free;
-+CERTIFICATEPOLICIES_it;
-+CERTIFICATEPOLICIES_new;
-+COMP_CTX_free;
-+COMP_CTX_new;
-+COMP_compress_block;
-+COMP_expand_block;
-+COMP_rle;
-+COMP_zlib;
-+CONF_def_version;
-+CONF_dump_bio;
-+CONF_dump_fp;
-+CONF_free;
-+CONF_get1_default_config_file;
-+CONF_get_number;
-+CONF_get_section;
-+CONF_get_string;
-+CONF_imodule_get_flags;
-+CONF_imodule_get_module;
-+CONF_imodule_get_name;
-+CONF_imodule_get_usr_data;
-+CONF_imodule_get_value;
-+CONF_imodule_set_flags;
-+CONF_imodule_set_usr_data;
-+CONF_load;
-+CONF_load_bio;
-+CONF_load_fp;
-+CONF_module_add;
-+CONF_module_get_usr_data;
-+CONF_module_set_usr_data;
-+CONF_modules_finish;
-+CONF_modules_free;
-+CONF_modules_load;
-+CONF_modules_load_file;
-+CONF_modules_unload;
-+CONF_parse_list;
-+CONF_set_default_method;
-+CONF_set_nconf;
-+CONF_version;
-+CRL_DIST_POINTS_free;
-+CRL_DIST_POINTS_it;
-+CRL_DIST_POINTS_new;
-+CRYPTO_add_lock;
-+CRYPTO_cleanup_all_ex_data;
-+CRYPTO_dbg_free;
-+CRYPTO_dbg_get_options;
-+CRYPTO_dbg_malloc;
-+CRYPTO_dbg_realloc;
-+CRYPTO_dbg_set_options;
-+CRYPTO_destroy_dynlockid;
-+CRYPTO_dup_ex_data;
-+CRYPTO_ex_data_new_class;
-+CRYPTO_free;
-+CRYPTO_free_ex_data;
-+CRYPTO_free_locked;
-+CRYPTO_get_add_lock_callback;
-+CRYPTO_get_dynlock_create_callback;
-+CRYPTO_get_dynlock_destroy_callback;
-+CRYPTO_get_dynlock_lock_callback;
-+CRYPTO_get_dynlock_value;
-+CRYPTO_get_ex_data;
-+CRYPTO_get_ex_data_implementation;
-+CRYPTO_get_ex_new_index;
-+CRYPTO_get_id_callback;
-+CRYPTO_get_lock_name;
-+CRYPTO_get_locked_mem_ex_functions;
-+CRYPTO_get_locked_mem_functions;
-+CRYPTO_get_locking_callback;
-+CRYPTO_get_mem_debug_functions;
-+CRYPTO_get_mem_debug_options;
-+CRYPTO_get_mem_ex_functions;
-+CRYPTO_get_mem_functions;
-+CRYPTO_get_new_dynlockid;
-+CRYPTO_get_new_lockid;
-+CRYPTO_is_mem_check_on;
-+CRYPTO_lock;
-+CRYPTO_malloc;
-+CRYPTO_malloc_locked;
-+CRYPTO_mem_ctrl;
-+CRYPTO_mem_leaks;
-+CRYPTO_mem_leaks_cb;
-+CRYPTO_mem_leaks_fp;
-+CRYPTO_new_ex_data;
-+CRYPTO_num_locks;
-+CRYPTO_pop_info;
-+CRYPTO_push_info_;
-+CRYPTO_realloc;
-+CRYPTO_realloc_clean;
-+CRYPTO_remalloc;
-+CRYPTO_remove_all_info;
-+CRYPTO_set_add_lock_callback;
-+CRYPTO_set_dynlock_create_callback;
-+CRYPTO_set_dynlock_destroy_callback;
-+CRYPTO_set_dynlock_lock_callback;
-+CRYPTO_set_ex_data;
-+CRYPTO_set_ex_data_implementation;
-+CRYPTO_set_id_callback;
-+CRYPTO_set_locked_mem_ex_functions;
-+CRYPTO_set_locked_mem_functions;
-+CRYPTO_set_locking_callback;
-+CRYPTO_set_mem_debug_functions;
-+CRYPTO_set_mem_debug_options;
-+CRYPTO_set_mem_ex_functions;
-+CRYPTO_set_mem_functions;
-+CRYPTO_thread_id;
-+DES_SPtrans;
-+DES_cbc_cksum;
-+DES_cbc_encrypt;
-+DES_cfb64_encrypt;
-+DES_cfb_encrypt;
-+DES_check_key_parity;
-+DES_crypt;
-+DES_decrypt3;
-+DES_ecb3_encrypt;
-+DES_ecb_encrypt;
-+DES_ede3_cbc_encrypt;
-+DES_ede3_cbcm_encrypt;
-+DES_ede3_cfb64_encrypt;
-+DES_ede3_cfb_encrypt;
-+DES_ede3_ofb64_encrypt;
-+DES_enc_read;
-+DES_enc_write;
-+DES_encrypt1;
-+DES_encrypt2;
-+DES_encrypt3;
-+DES_fcrypt;
-+DES_is_weak_key;
-+DES_key_sched;
-+DES_ncbc_encrypt;
-+DES_ofb64_encrypt;
-+DES_ofb_encrypt;
-+DES_options;
-+DES_pcbc_encrypt;
-+DES_quad_cksum;
-+DES_random_key;
-+DES_read_2passwords;
-+DES_read_password;
-+DES_set_key;
-+DES_set_key_checked;
-+DES_set_key_unchecked;
-+DES_set_odd_parity;
-+DES_string_to_2keys;
-+DES_string_to_key;
-+DES_xcbc_encrypt;
-+DES_xwhite_in2out;
-+DH_OpenSSL;
-+DH_check;
-+DH_check_pub_key;
-+DH_compute_key;
-+DH_free;
-+DH_generate_key;
-+DH_generate_parameters;
-+DH_generate_parameters_ex;
-+DH_get_default_method;
-+DH_get_ex_data;
-+DH_get_ex_new_index;
-+DH_new;
-+DH_new_method;
-+DH_set_default_method;
-+DH_set_ex_data;
-+DH_set_method;
-+DH_size;
-+DH_up_ref;
-+DH_version;
-+DHparams_it;
-+DHparams_print;
-+DHparams_print_fp;
-+DIRECTORYSTRING_free;
-+DIRECTORYSTRING_it;
-+DIRECTORYSTRING_new;
-+DISPLAYTEXT_free;
-+DISPLAYTEXT_it;
-+DISPLAYTEXT_new;
-+DIST_POINT_NAME_free;
-+DIST_POINT_NAME_it;
-+DIST_POINT_NAME_new;
-+DIST_POINT_free;
-+DIST_POINT_it;
-+DIST_POINT_new;
-+DSAPrivateKey_it;
-+DSAPublicKey_it;
-+DSA_OpenSSL;
-+DSA_SIG_free;
-+DSA_SIG_it;
-+DSA_SIG_new;
-+DSA_do_sign;
-+DSA_do_verify;
-+DSA_dup_DH;
-+DSA_free;
-+DSA_generate_key;
-+DSA_generate_parameters;
-+DSA_generate_parameters_ex;
-+DSA_get_default_method;
-+DSA_get_ex_data;
-+DSA_get_ex_new_index;
-+DSA_new;
-+DSA_new_method;
-+DSA_print;
-+DSA_print_fp;
-+DSA_set_default_method;
-+DSA_set_ex_data;
-+DSA_set_method;
-+DSA_sign;
-+DSA_sign_setup;
-+DSA_size;
-+DSA_up_ref;
-+DSA_verify;
-+DSA_version;
-+DSAparams_it;
-+DSAparams_print;
-+DSAparams_print_fp;
-+DSO_METHOD_dl;
-+DSO_METHOD_dlfcn;
-+DSO_METHOD_null;
-+DSO_METHOD_openssl;
-+DSO_METHOD_vms;
-+DSO_METHOD_win32;
-+DSO_bind_func;
-+DSO_bind_var;
-+DSO_convert_filename;
-+DSO_ctrl;
-+DSO_flags;
-+DSO_free;
-+DSO_get_default_method;
-+DSO_get_filename;
-+DSO_get_loaded_filename;
-+DSO_get_method;
-+DSO_load;
-+DSO_merge;
-+DSO_new;
-+DSO_new_method;
-+DSO_set_default_method;
-+DSO_set_filename;
-+DSO_set_method;
-+DSO_set_name_converter;
-+DSO_up_ref;
-+ECDH_OpenSSL;
-+ECDH_compute_key;
-+ECDH_get_default_method;
-+ECDH_get_ex_data;
-+ECDH_get_ex_new_index;
-+ECDH_set_default_method;
-+ECDH_set_ex_data;
-+ECDH_set_method;
-+ECDH_version;
-+ECDSA_OpenSSL;
-+ECDSA_SIG_free;
-+ECDSA_SIG_it;
-+ECDSA_SIG_new;
-+ECDSA_do_sign;
-+ECDSA_do_sign_ex;
-+ECDSA_do_verify;
-+ECDSA_get_default_method;
-+ECDSA_get_ex_data;
-+ECDSA_get_ex_new_index;
-+ECDSA_set_default_method;
-+ECDSA_set_ex_data;
-+ECDSA_set_method;
-+ECDSA_sign;
-+ECDSA_sign_ex;
-+ECDSA_sign_setup;
-+ECDSA_size;
-+ECDSA_verify;
-+ECDSA_version;
-+ECPARAMETERS_free;
-+ECPARAMETERS_it;
-+ECPARAMETERS_new;
-+ECPKPARAMETERS_free;
-+ECPKPARAMETERS_it;
-+ECPKPARAMETERS_new;
-+ECPKParameters_print;
-+ECPKParameters_print_fp;
-+ECParameters_print;
-+ECParameters_print_fp;
-+EC_EX_DATA_clear_free_all_data;
-+EC_EX_DATA_clear_free_data;
-+EC_EX_DATA_free_all_data;
-+EC_EX_DATA_free_data;
-+EC_EX_DATA_get_data;
-+EC_EX_DATA_set_data;
-+EC_GF2m_simple_method;
-+EC_GFp_mont_method;
-+EC_GFp_nist_method;
-+EC_GFp_simple_method;
-+EC_GROUP_check;
-+EC_GROUP_check_discriminant;
-+EC_GROUP_clear_free;
-+EC_GROUP_cmp;
-+EC_GROUP_copy;
-+EC_GROUP_dup;
-+EC_GROUP_free;
-+EC_GROUP_get0_generator;
-+EC_GROUP_get0_seed;
-+EC_GROUP_get_asn1_flag;
-+EC_GROUP_get_basis_type;
-+EC_GROUP_get_cofactor;
-+EC_GROUP_get_curve_GF2m;
-+EC_GROUP_get_curve_GFp;
-+EC_GROUP_get_curve_name;
-+EC_GROUP_get_degree;
-+EC_GROUP_get_order;
-+EC_GROUP_get_pentanomial_basis;
-+EC_GROUP_get_point_conversion_form;
-+EC_GROUP_get_seed_len;
-+EC_GROUP_get_trinomial_basis;
-+EC_GROUP_have_precompute_mult;
-+EC_GROUP_method_of;
-+EC_GROUP_new;
-+EC_GROUP_new_by_curve_name;
-+EC_GROUP_new_curve_GF2m;
-+EC_GROUP_new_curve_GFp;
-+EC_GROUP_precompute_mult;
-+EC_GROUP_set_asn1_flag;
-+EC_GROUP_set_curve_GF2m;
-+EC_GROUP_set_curve_GFp;
-+EC_GROUP_set_curve_name;
-+EC_GROUP_set_generator;
-+EC_GROUP_set_point_conversion_form;
-+EC_GROUP_set_seed;
-+EC_KEY_check_key;
-+EC_KEY_copy;
-+EC_KEY_dup;
-+EC_KEY_free;
-+EC_KEY_generate_key;
-+EC_KEY_get0_group;
-+EC_KEY_get0_private_key;
-+EC_KEY_get0_public_key;
-+EC_KEY_get_conv_form;
-+EC_KEY_get_enc_flags;
-+EC_KEY_get_key_method_data;
-+EC_KEY_insert_key_method_data;
-+EC_KEY_new;
-+EC_KEY_new_by_curve_name;
-+EC_KEY_precompute_mult;
-+EC_KEY_print;
-+EC_KEY_print_fp;
-+EC_KEY_set_asn1_flag;
-+EC_KEY_set_conv_form;
-+EC_KEY_set_enc_flags;
-+EC_KEY_set_group;
-+EC_KEY_set_private_key;
-+EC_KEY_set_public_key;
-+EC_KEY_up_ref;
-+EC_METHOD_get_field_type;
-+EC_POINT_add;
-+EC_POINT_bn2point;
-+EC_POINT_clear_free;
-+EC_POINT_cmp;
-+EC_POINT_copy;
-+EC_POINT_dbl;
-+EC_POINT_dup;
-+EC_POINT_free;
-+EC_POINT_get_Jprojective_coordinates_GFp;
-+EC_POINT_get_affine_coordinates_GF2m;
-+EC_POINT_get_affine_coordinates_GFp;
-+EC_POINT_hex2point;
-+EC_POINT_invert;
-+EC_POINT_is_at_infinity;
-+EC_POINT_is_on_curve;
-+EC_POINT_make_affine;
-+EC_POINT_method_of;
-+EC_POINT_mul;
-+EC_POINT_new;
-+EC_POINT_oct2point;
-+EC_POINT_point2bn;
-+EC_POINT_point2hex;
-+EC_POINT_point2oct;
-+EC_POINT_set_Jprojective_coordinates_GFp;
-+EC_POINT_set_affine_coordinates_GF2m;
-+EC_POINT_set_affine_coordinates_GFp;
-+EC_POINT_set_compressed_coordinates_GF2m;
-+EC_POINT_set_compressed_coordinates_GFp;
-+EC_POINT_set_to_infinity;
-+EC_POINTs_make_affine;
-+EC_POINTs_mul;
-+EC_PRIVATEKEY_free;
-+EC_PRIVATEKEY_it;
-+EC_PRIVATEKEY_new;
-+EC_get_builtin_curves;
-+EDIPARTYNAME_free;
-+EDIPARTYNAME_it;
-+EDIPARTYNAME_new;
-+ENGINE_add;
-+ENGINE_add_conf_module;
-+ENGINE_by_id;
-+ENGINE_cleanup;
-+ENGINE_cmd_is_executable;
-+ENGINE_ctrl;
-+ENGINE_ctrl_cmd;
-+ENGINE_ctrl_cmd_string;
-+ENGINE_finish;
-+ENGINE_free;
-+ENGINE_get_DH;
-+ENGINE_get_DSA;
-+ENGINE_get_ECDH;
-+ENGINE_get_ECDSA;
-+ENGINE_get_RAND;
-+ENGINE_get_RSA;
-+ENGINE_get_STORE;
-+ENGINE_get_cipher;
-+ENGINE_get_cipher_engine;
-+ENGINE_get_ciphers;
-+ENGINE_get_cmd_defns;
-+ENGINE_get_ctrl_function;
-+ENGINE_get_default_DH;
-+ENGINE_get_default_DSA;
-+ENGINE_get_default_ECDH;
-+ENGINE_get_default_ECDSA;
-+ENGINE_get_default_RAND;
-+ENGINE_get_default_RSA;
-+ENGINE_get_destroy_function;
-+ENGINE_get_digest;
-+ENGINE_get_digest_engine;
-+ENGINE_get_digests;
-+ENGINE_get_ex_data;
-+ENGINE_get_ex_new_index;
-+ENGINE_get_finish_function;
-+ENGINE_get_first;
-+ENGINE_get_flags;
-+ENGINE_get_id;
-+ENGINE_get_init_function;
-+ENGINE_get_last;
-+ENGINE_get_load_privkey_function;
-+ENGINE_get_load_pubkey_function;
-+ENGINE_get_name;
-+ENGINE_get_next;
-+ENGINE_get_prev;
-+ENGINE_get_static_state;
-+ENGINE_get_table_flags;
-+ENGINE_init;
-+ENGINE_load_builtin_engines;
-+ENGINE_load_cryptodev;
-+ENGINE_load_dynamic;
-+ENGINE_load_openssl;
-+ENGINE_load_padlock;
-+ENGINE_load_private_key;
-+ENGINE_load_public_key;
-+ENGINE_new;
-+ENGINE_register_DH;
-+ENGINE_register_DSA;
-+ENGINE_register_ECDH;
-+ENGINE_register_ECDSA;
-+ENGINE_register_RAND;
-+ENGINE_register_RSA;
-+ENGINE_register_STORE;
-+ENGINE_register_all_DH;
-+ENGINE_register_all_DSA;
-+ENGINE_register_all_ECDH;
-+ENGINE_register_all_ECDSA;
-+ENGINE_register_all_RAND;
-+ENGINE_register_all_RSA;
-+ENGINE_register_all_STORE;
-+ENGINE_register_all_ciphers;
-+ENGINE_register_all_complete;
-+ENGINE_register_all_digests;
-+ENGINE_register_ciphers;
-+ENGINE_register_complete;
-+ENGINE_register_digests;
-+ENGINE_remove;
-+ENGINE_set_DH;
-+ENGINE_set_DSA;
-+ENGINE_set_ECDH;
-+ENGINE_set_ECDSA;
-+ENGINE_set_RAND;
-+ENGINE_set_RSA;
-+ENGINE_set_STORE;
-+ENGINE_set_ciphers;
-+ENGINE_set_cmd_defns;
-+ENGINE_set_ctrl_function;
-+ENGINE_set_default;
-+ENGINE_set_default_DH;
-+ENGINE_set_default_DSA;
-+ENGINE_set_default_ECDH;
-+ENGINE_set_default_ECDSA;
-+ENGINE_set_default_RAND;
-+ENGINE_set_default_RSA;
-+ENGINE_set_default_ciphers;
-+ENGINE_set_default_digests;
-+ENGINE_set_default_string;
-+ENGINE_set_destroy_function;
-+ENGINE_set_digests;
-+ENGINE_set_ex_data;
-+ENGINE_set_finish_function;
-+ENGINE_set_flags;
-+ENGINE_set_id;
-+ENGINE_set_init_function;
-+ENGINE_set_load_privkey_function;
-+ENGINE_set_load_pubkey_function;
-+ENGINE_set_name;
-+ENGINE_set_table_flags;
-+ENGINE_unregister_DH;
-+ENGINE_unregister_DSA;
-+ENGINE_unregister_ECDH;
-+ENGINE_unregister_ECDSA;
-+ENGINE_unregister_RAND;
-+ENGINE_unregister_RSA;
-+ENGINE_unregister_STORE;
-+ENGINE_unregister_ciphers;
-+ENGINE_unregister_digests;
-+ENGINE_up_ref;
-+ERR_add_error_data;
-+ERR_clear_error;
-+ERR_error_string;
-+ERR_error_string_n;
-+ERR_free_strings;
-+ERR_func_error_string;
-+ERR_get_err_state_table;
-+ERR_get_error;
-+ERR_get_error_line;
-+ERR_get_error_line_data;
-+ERR_get_implementation;
-+ERR_get_next_error_library;
-+ERR_get_state;
-+ERR_get_string_table;
-+ERR_lib_error_string;
-+ERR_load_ASN1_strings;
-+ERR_load_BIO_strings;
-+ERR_load_BN_strings;
-+ERR_load_BUF_strings;
-+ERR_load_COMP_strings;
-+ERR_load_CONF_strings;
-+ERR_load_CRYPTO_strings;
-+ERR_load_DH_strings;
-+ERR_load_DSA_strings;
-+ERR_load_DSO_strings;
-+ERR_load_ECDH_strings;
-+ERR_load_ECDSA_strings;
-+ERR_load_EC_strings;
-+ERR_load_ENGINE_strings;
-+ERR_load_ERR_strings;
-+ERR_load_EVP_strings;
-+ERR_load_OBJ_strings;
-+ERR_load_OCSP_strings;
-+ERR_load_PEM_strings;
-+ERR_load_PKCS12_strings;
-+ERR_load_PKCS7_strings;
-+ERR_load_RAND_strings;
-+ERR_load_RSA_strings;
-+ERR_load_STORE_strings;
-+ERR_load_UI_strings;
-+ERR_load_X509V3_strings;
-+ERR_load_X509_strings;
-+ERR_load_crypto_strings;
-+ERR_load_strings;
-+ERR_peek_error;
-+ERR_peek_error_line;
-+ERR_peek_error_line_data;
-+ERR_peek_last_error;
-+ERR_peek_last_error_line;
-+ERR_peek_last_error_line_data;
-+ERR_pop_to_mark;
-+ERR_print_errors;
-+ERR_print_errors_cb;
-+ERR_print_errors_fp;
-+ERR_put_error;
-+ERR_reason_error_string;
-+ERR_release_err_state_table;
-+ERR_remove_state;
-+ERR_set_error_data;
-+ERR_set_implementation;
-+ERR_set_mark;
-+ERR_unload_strings;
-+EVP_BytesToKey;
-+EVP_CIPHER_CTX_block_size;
-+EVP_CIPHER_CTX_cipher;
-+EVP_CIPHER_CTX_cleanup;
-+EVP_CIPHER_CTX_ctrl;
-+EVP_CIPHER_CTX_flags;
-+EVP_CIPHER_CTX_free;
-+EVP_CIPHER_CTX_get_app_data;
-+EVP_CIPHER_CTX_init;
-+EVP_CIPHER_CTX_iv_length;
-+EVP_CIPHER_CTX_key_length;
-+EVP_CIPHER_CTX_new;
-+EVP_CIPHER_CTX_nid;
-+EVP_CIPHER_CTX_rand_key;
-+EVP_CIPHER_CTX_set_app_data;
-+EVP_CIPHER_CTX_set_key_length;
-+EVP_CIPHER_CTX_set_padding;
-+EVP_CIPHER_asn1_to_param;
-+EVP_CIPHER_block_size;
-+EVP_CIPHER_flags;
-+EVP_CIPHER_get_asn1_iv;
-+EVP_CIPHER_iv_length;
-+EVP_CIPHER_key_length;
-+EVP_CIPHER_nid;
-+EVP_CIPHER_param_to_asn1;
-+EVP_CIPHER_set_asn1_iv;
-+EVP_CIPHER_type;
-+EVP_Cipher;
-+EVP_CipherFinal;
-+EVP_CipherFinal_ex;
-+EVP_CipherInit;
-+EVP_CipherInit_ex;
-+EVP_CipherUpdate;
-+EVP_DecodeBlock;
-+EVP_DecodeFinal;
-+EVP_DecodeInit;
-+EVP_DecodeUpdate;
-+EVP_DecryptFinal;
-+EVP_DecryptFinal_ex;
-+EVP_DecryptInit;
-+EVP_DecryptInit_ex;
-+EVP_DecryptUpdate;
-+EVP_Digest;
-+EVP_DigestFinal;
-+EVP_DigestFinal_ex;
-+EVP_DigestInit;
-+EVP_DigestInit_ex;
-+EVP_DigestUpdate;
-+EVP_EncodeBlock;
-+EVP_EncodeFinal;
-+EVP_EncodeInit;
-+EVP_EncodeUpdate;
-+EVP_EncryptFinal;
-+EVP_EncryptFinal_ex;
-+EVP_EncryptInit;
-+EVP_EncryptInit_ex;
-+EVP_EncryptUpdate;
-+EVP_MD_CTX_cleanup;
-+EVP_MD_CTX_clear_flags;
-+EVP_MD_CTX_copy;
-+EVP_MD_CTX_copy_ex;
-+EVP_MD_CTX_create;
-+EVP_MD_CTX_destroy;
-+EVP_MD_CTX_init;
-+EVP_MD_CTX_md;
-+EVP_MD_CTX_set_flags;
-+EVP_MD_CTX_test_flags;
-+EVP_MD_block_size;
-+EVP_MD_pkey_type;
-+EVP_MD_size;
-+EVP_MD_type;
-+EVP_OpenFinal;
-+EVP_OpenInit;
-+EVP_PBE_CipherInit;
-+EVP_PBE_alg_add;
-+EVP_PBE_cleanup;
-+EVP_PKCS82PKEY;
-+EVP_PKEY2PKCS8;
-+EVP_PKEY2PKCS8_broken;
-+EVP_PKEY_add1_attr;
-+EVP_PKEY_add1_attr_by_NID;
-+EVP_PKEY_add1_attr_by_OBJ;
-+EVP_PKEY_add1_attr_by_txt;
-+EVP_PKEY_assign;
-+EVP_PKEY_bits;
-+EVP_PKEY_cmp;
-+EVP_PKEY_cmp_parameters;
-+EVP_PKEY_copy_parameters;
-+EVP_PKEY_decrypt;
-+EVP_PKEY_delete_attr;
-+EVP_PKEY_encrypt;
-+EVP_PKEY_free;
-+EVP_PKEY_get1_DH;
-+EVP_PKEY_get1_DSA;
-+EVP_PKEY_get1_EC_KEY;
-+EVP_PKEY_get1_RSA;
-+EVP_PKEY_get_attr;
-+EVP_PKEY_get_attr_by_NID;
-+EVP_PKEY_get_attr_by_OBJ;
-+EVP_PKEY_get_attr_count;
-+EVP_PKEY_missing_parameters;
-+EVP_PKEY_new;
-+EVP_PKEY_save_parameters;
-+EVP_PKEY_set1_DH;
-+EVP_PKEY_set1_DSA;
-+EVP_PKEY_set1_EC_KEY;
-+EVP_PKEY_set1_RSA;
-+EVP_PKEY_size;
-+EVP_PKEY_type;
-+EVP_SealFinal;
-+EVP_SealInit;
-+EVP_SignFinal;
-+EVP_VerifyFinal;
-+EVP_add_cipher;
-+EVP_add_digest;
-+EVP_aes_128_cbc;
-+EVP_aes_128_cfb;
-+EVP_aes_128_cfb1;
-+EVP_aes_128_cfb128;
-+EVP_aes_128_cfb8;
-+EVP_aes_128_ecb;
-+EVP_aes_128_ofb;
-+EVP_aes_192_cbc;
-+EVP_aes_192_cfb;
-+EVP_aes_192_cfb1;
-+EVP_aes_192_cfb128;
-+EVP_aes_192_cfb8;
-+EVP_aes_192_ecb;
-+EVP_aes_192_ofb;
-+EVP_aes_256_cbc;
-+EVP_aes_256_cfb;
-+EVP_aes_256_cfb1;
-+EVP_aes_256_cfb128;
-+EVP_aes_256_cfb8;
-+EVP_aes_256_ecb;
-+EVP_aes_256_ofb;
-+EVP_bf_cbc;
-+EVP_bf_cfb;
-+EVP_bf_cfb64;
-+EVP_bf_ecb;
-+EVP_bf_ofb;
-+EVP_cast5_cbc;
-+EVP_cast5_cfb;
-+EVP_cast5_cfb64;
-+EVP_cast5_ecb;
-+EVP_cast5_ofb;
-+EVP_cleanup;
-+EVP_des_cbc;
-+EVP_des_cfb;
-+EVP_des_cfb1;
-+EVP_des_cfb64;
-+EVP_des_cfb8;
-+EVP_des_ecb;
-+EVP_des_ede;
-+EVP_des_ede3;
-+EVP_des_ede3_cbc;
-+EVP_des_ede3_cfb;
-+EVP_des_ede3_cfb1;
-+EVP_des_ede3_cfb64;
-+EVP_des_ede3_cfb8;
-+EVP_des_ede3_ecb;
-+EVP_des_ede3_ofb;
-+EVP_des_ede_cbc;
-+EVP_des_ede_cfb;
-+EVP_des_ede_cfb64;
-+EVP_des_ede_ecb;
-+EVP_des_ede_ofb;
-+EVP_des_ofb;
-+EVP_desx_cbc;
-+EVP_dss;
-+EVP_dss1;
-+EVP_ecdsa;
-+EVP_enc_null;
-+EVP_get_cipherbyname;
-+EVP_get_digestbyname;
-+EVP_get_pw_prompt;
-+EVP_idea_cbc;
-+EVP_idea_cfb;
-+EVP_idea_cfb64;
-+EVP_idea_ecb;
-+EVP_idea_ofb;
-+EVP_md2;
-+EVP_md4;
-+EVP_md5;
-+EVP_md_null;
-+EVP_rc2_40_cbc;
-+EVP_rc2_64_cbc;
-+EVP_rc2_cbc;
-+EVP_rc2_cfb;
-+EVP_rc2_cfb64;
-+EVP_rc2_ecb;
-+EVP_rc2_ofb;
-+EVP_rc4;
-+EVP_rc4_40;
-+EVP_read_pw_string;
-+EVP_ripemd160;
-+EVP_set_pw_prompt;
-+EVP_sha;
-+EVP_sha1;
-+EVP_sha224;
-+EVP_sha256;
-+EVP_sha384;
-+EVP_sha512;
-+EVP_version;
-+EXTENDED_KEY_USAGE_free;
-+EXTENDED_KEY_USAGE_it;
-+EXTENDED_KEY_USAGE_new;
-+GENERAL_NAMES_free;
-+GENERAL_NAMES_it;
-+GENERAL_NAMES_new;
-+GENERAL_NAME_free;
-+GENERAL_NAME_it;
-+GENERAL_NAME_new;
-+GENERAL_NAME_print;
-+GENERAL_SUBTREE_free;
-+GENERAL_SUBTREE_it;
-+GENERAL_SUBTREE_new;
-+HMAC;
-+HMAC_CTX_cleanup;
-+HMAC_CTX_init;
-+HMAC_Final;
-+HMAC_Init;
-+HMAC_Init_ex;
-+HMAC_Update;
-+IDEA_version;
-+KRB5_APREQBODY_free;
-+KRB5_APREQBODY_it;
-+KRB5_APREQBODY_new;
-+KRB5_APREQ_free;
-+KRB5_APREQ_it;
-+KRB5_APREQ_new;
-+KRB5_AUTHDATA_free;
-+KRB5_AUTHDATA_it;
-+KRB5_AUTHDATA_new;
-+KRB5_AUTHENTBODY_free;
-+KRB5_AUTHENTBODY_it;
-+KRB5_AUTHENTBODY_new;
-+KRB5_AUTHENT_free;
-+KRB5_AUTHENT_it;
-+KRB5_AUTHENT_new;
-+KRB5_CHECKSUM_free;
-+KRB5_CHECKSUM_it;
-+KRB5_CHECKSUM_new;
-+KRB5_ENCDATA_free;
-+KRB5_ENCDATA_it;
-+KRB5_ENCDATA_new;
-+KRB5_ENCKEY_free;
-+KRB5_ENCKEY_it;
-+KRB5_ENCKEY_new;
-+KRB5_PRINCNAME_free;
-+KRB5_PRINCNAME_it;
-+KRB5_PRINCNAME_new;
-+KRB5_TICKET_free;
-+KRB5_TICKET_it;
-+KRB5_TICKET_new;
-+KRB5_TKTBODY_free;
-+KRB5_TKTBODY_it;
-+KRB5_TKTBODY_new;
-+LONG_it;
-+MD2;
-+MD2_Final;
-+MD2_Init;
-+MD2_Update;
-+MD2_options;
-+MD2_version;
-+MD4;
-+MD4_Final;
-+MD4_Init;
-+MD4_Transform;
-+MD4_Update;
-+MD4_version;
-+MD5;
-+MD5_Final;
-+MD5_Init;
-+MD5_Transform;
-+MD5_Update;
-+MD5_version;
-+MGF1;
-+NAME_CONSTRAINTS_free;
-+NAME_CONSTRAINTS_it;
-+NAME_CONSTRAINTS_new;
-+NCONF_WIN32;
-+NCONF_default;
-+NCONF_dump_bio;
-+NCONF_dump_fp;
-+NCONF_free;
-+NCONF_free_data;
-+NCONF_get_number_e;
-+NCONF_get_section;
-+NCONF_get_string;
-+NCONF_load;
-+NCONF_load_bio;
-+NCONF_load_fp;
-+NCONF_new;
-+NETSCAPE_CERT_SEQUENCE_free;
-+NETSCAPE_CERT_SEQUENCE_it;
-+NETSCAPE_CERT_SEQUENCE_new;
-+NETSCAPE_ENCRYPTED_PKEY_free;
-+NETSCAPE_ENCRYPTED_PKEY_it;
-+NETSCAPE_ENCRYPTED_PKEY_new;
-+NETSCAPE_PKEY_free;
-+NETSCAPE_PKEY_it;
-+NETSCAPE_PKEY_new;
-+NETSCAPE_SPKAC_free;
-+NETSCAPE_SPKAC_it;
-+NETSCAPE_SPKAC_new;
-+NETSCAPE_SPKI_b64_decode;
-+NETSCAPE_SPKI_b64_encode;
-+NETSCAPE_SPKI_free;
-+NETSCAPE_SPKI_get_pubkey;
-+NETSCAPE_SPKI_it;
-+NETSCAPE_SPKI_new;
-+NETSCAPE_SPKI_print;
-+NETSCAPE_SPKI_set_pubkey;
-+NETSCAPE_SPKI_sign;
-+NETSCAPE_SPKI_verify;
-+NOTICEREF_free;
-+NOTICEREF_it;
-+NOTICEREF_new;
-+OBJ_NAME_add;
-+OBJ_NAME_cleanup;
-+OBJ_NAME_do_all;
-+OBJ_NAME_do_all_sorted;
-+OBJ_NAME_get;
-+OBJ_NAME_init;
-+OBJ_NAME_new_index;
-+OBJ_NAME_remove;
-+OBJ_add_object;
-+OBJ_bsearch;
-+OBJ_bsearch_ex;
-+OBJ_cleanup;
-+OBJ_cmp;
-+OBJ_create;
-+OBJ_create_objects;
-+OBJ_dup;
-+OBJ_ln2nid;
-+OBJ_new_nid;
-+OBJ_nid2ln;
-+OBJ_nid2obj;
-+OBJ_nid2sn;
-+OBJ_obj2nid;
-+OBJ_obj2txt;
-+OBJ_sn2nid;
-+OBJ_txt2nid;
-+OBJ_txt2obj;
-+OCSP_BASICRESP_add1_ext_i2d;
-+OCSP_BASICRESP_add_ext;
-+OCSP_BASICRESP_delete_ext;
-+OCSP_BASICRESP_free;
-+OCSP_BASICRESP_get1_ext_d2i;
-+OCSP_BASICRESP_get_ext;
-+OCSP_BASICRESP_get_ext_by_NID;
-+OCSP_BASICRESP_get_ext_by_OBJ;
-+OCSP_BASICRESP_get_ext_by_critical;
-+OCSP_BASICRESP_get_ext_count;
-+OCSP_BASICRESP_it;
-+OCSP_BASICRESP_new;
-+OCSP_CERTID_free;
-+OCSP_CERTID_it;
-+OCSP_CERTID_new;
-+OCSP_CERTSTATUS_free;
-+OCSP_CERTSTATUS_it;
-+OCSP_CERTSTATUS_new;
-+OCSP_CRLID_free;
-+OCSP_CRLID_it;
-+OCSP_CRLID_new;
-+OCSP_ONEREQ_add1_ext_i2d;
-+OCSP_ONEREQ_add_ext;
-+OCSP_ONEREQ_delete_ext;
-+OCSP_ONEREQ_free;
-+OCSP_ONEREQ_get1_ext_d2i;
-+OCSP_ONEREQ_get_ext;
-+OCSP_ONEREQ_get_ext_by_NID;
-+OCSP_ONEREQ_get_ext_by_OBJ;
-+OCSP_ONEREQ_get_ext_by_critical;
-+OCSP_ONEREQ_get_ext_count;
-+OCSP_ONEREQ_it;
-+OCSP_ONEREQ_new;
-+OCSP_REQINFO_free;
-+OCSP_REQINFO_it;
-+OCSP_REQINFO_new;
-+OCSP_REQUEST_add1_ext_i2d;
-+OCSP_REQUEST_add_ext;
-+OCSP_REQUEST_delete_ext;
-+OCSP_REQUEST_free;
-+OCSP_REQUEST_get1_ext_d2i;
-+OCSP_REQUEST_get_ext;
-+OCSP_REQUEST_get_ext_by_NID;
-+OCSP_REQUEST_get_ext_by_OBJ;
-+OCSP_REQUEST_get_ext_by_critical;
-+OCSP_REQUEST_get_ext_count;
-+OCSP_REQUEST_it;
-+OCSP_REQUEST_new;
-+OCSP_REQUEST_print;
-+OCSP_RESPBYTES_free;
-+OCSP_RESPBYTES_it;
-+OCSP_RESPBYTES_new;
-+OCSP_RESPDATA_free;
-+OCSP_RESPDATA_it;
-+OCSP_RESPDATA_new;
-+OCSP_RESPID_free;
-+OCSP_RESPID_it;
-+OCSP_RESPID_new;
-+OCSP_RESPONSE_free;
-+OCSP_RESPONSE_it;
-+OCSP_RESPONSE_new;
-+OCSP_RESPONSE_print;
-+OCSP_REVOKEDINFO_free;
-+OCSP_REVOKEDINFO_it;
-+OCSP_REVOKEDINFO_new;
-+OCSP_SERVICELOC_free;
-+OCSP_SERVICELOC_it;
-+OCSP_SERVICELOC_new;
-+OCSP_SIGNATURE_free;
-+OCSP_SIGNATURE_it;
-+OCSP_SIGNATURE_new;
-+OCSP_SINGLERESP_add1_ext_i2d;
-+OCSP_SINGLERESP_add_ext;
-+OCSP_SINGLERESP_delete_ext;
-+OCSP_SINGLERESP_free;
-+OCSP_SINGLERESP_get1_ext_d2i;
-+OCSP_SINGLERESP_get_ext;
-+OCSP_SINGLERESP_get_ext_by_NID;
-+OCSP_SINGLERESP_get_ext_by_OBJ;
-+OCSP_SINGLERESP_get_ext_by_critical;
-+OCSP_SINGLERESP_get_ext_count;
-+OCSP_SINGLERESP_it;
-+OCSP_SINGLERESP_new;
-+OCSP_accept_responses_new;
-+OCSP_archive_cutoff_new;
-+OCSP_basic_add1_cert;
-+OCSP_basic_add1_nonce;
-+OCSP_basic_add1_status;
-+OCSP_basic_sign;
-+OCSP_basic_verify;
-+OCSP_cert_id_new;
-+OCSP_cert_status_str;
-+OCSP_cert_to_id;
-+OCSP_check_nonce;
-+OCSP_check_validity;
-+OCSP_copy_nonce;
-+OCSP_crlID_new;
-+OCSP_crl_reason_str;
-+OCSP_id_cmp;
-+OCSP_id_get0_info;
-+OCSP_id_issuer_cmp;
-+OCSP_onereq_get0_id;
-+OCSP_parse_url;
-+OCSP_request_add0_id;
-+OCSP_request_add1_cert;
-+OCSP_request_add1_nonce;
-+OCSP_request_is_signed;
-+OCSP_request_onereq_count;
-+OCSP_request_onereq_get0;
-+OCSP_request_set1_name;
-+OCSP_request_sign;
-+OCSP_request_verify;
-+OCSP_resp_count;
-+OCSP_resp_find;
-+OCSP_resp_find_status;
-+OCSP_resp_get0;
-+OCSP_response_create;
-+OCSP_response_get1_basic;
-+OCSP_response_status;
-+OCSP_response_status_str;
-+OCSP_sendreq_bio;
-+OCSP_single_get0_status;
-+OCSP_url_svcloc_new;
-+OPENSSL_DIR_end;
-+OPENSSL_DIR_read;
-+OPENSSL_NONPIC_relocated;
-+OPENSSL_add_all_algorithms_conf;
-+OPENSSL_add_all_algorithms_noconf;
-+OPENSSL_atomic_add;
-+OPENSSL_cleanse;
-+OPENSSL_config;
-+OPENSSL_cpuid_setup;
-+OPENSSL_far_spin;
-+OPENSSL_gmtime;
-+OPENSSL_ia32_cpuid;
-+OPENSSL_ia32cap_P;
-+OPENSSL_ia32cap_loc;
-+OPENSSL_indirect_call;
-+OPENSSL_instrument_halt;
-+OPENSSL_isservice;
-+OPENSSL_issetugid;
-+OPENSSL_load_builtin_modules;
-+OPENSSL_memcmp;
-+OPENSSL_no_config;
-+OPENSSL_rdtsc;
-+OPENSSL_showfatal;
-+OPENSSL_stderr;
-+OPENSSL_strcasecmp;
-+OPENSSL_strncasecmp;
-+OPENSSL_wipe_cpu;
-+OSSL_DES_version;
-+OSSL_libdes_version;
-+OTHERNAME_free;
-+OTHERNAME_it;
-+OTHERNAME_new;
-+OpenSSLDie;
-+OpenSSL_add_all_ciphers;
-+OpenSSL_add_all_digests;
-+PBE2PARAM_free;
-+PBE2PARAM_it;
-+PBE2PARAM_new;
-+PBEPARAM_free;
-+PBEPARAM_it;
-+PBEPARAM_new;
-+PBKDF2PARAM_free;
-+PBKDF2PARAM_it;
-+PBKDF2PARAM_new;
-+PEM_ASN1_read;
-+PEM_ASN1_read_bio;
-+PEM_ASN1_write;
-+PEM_ASN1_write_bio;
-+PEM_SealFinal;
-+PEM_SealInit;
-+PEM_SealUpdate;
-+PEM_SignFinal;
-+PEM_SignInit;
-+PEM_SignUpdate;
-+PEM_X509_INFO_read;
-+PEM_X509_INFO_read_bio;
-+PEM_X509_INFO_write_bio;
-+PEM_bytes_read_bio;
-+PEM_def_callback;
-+PEM_dek_info;
-+PEM_do_header;
-+PEM_get_EVP_CIPHER_INFO;
-+PEM_proc_type;
-+PEM_read;
-+PEM_read_DHparams;
-+PEM_read_DSAPrivateKey;
-+PEM_read_DSA_PUBKEY;
-+PEM_read_DSAparams;
-+PEM_read_ECPKParameters;
-+PEM_read_ECPrivateKey;
-+PEM_read_EC_PUBKEY;
-+PEM_read_NETSCAPE_CERT_SEQUENCE;
-+PEM_read_PKCS7;
-+PEM_read_PKCS8;
-+PEM_read_PKCS8_PRIV_KEY_INFO;
-+PEM_read_PUBKEY;
-+PEM_read_PrivateKey;
-+PEM_read_RSAPrivateKey;
-+PEM_read_RSAPublicKey;
-+PEM_read_RSA_PUBKEY;
-+PEM_read_X509;
-+PEM_read_X509_AUX;
-+PEM_read_X509_CERT_PAIR;
-+PEM_read_X509_CRL;
-+PEM_read_X509_REQ;
-+PEM_read_bio;
-+PEM_read_bio_DHparams;
-+PEM_read_bio_DSAPrivateKey;
-+PEM_read_bio_DSA_PUBKEY;
-+PEM_read_bio_DSAparams;
-+PEM_read_bio_ECPKParameters;
-+PEM_read_bio_ECPrivateKey;
-+PEM_read_bio_EC_PUBKEY;
-+PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+PEM_read_bio_PKCS7;
-+PEM_read_bio_PKCS8;
-+PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+PEM_read_bio_PUBKEY;
-+PEM_read_bio_PrivateKey;
-+PEM_read_bio_RSAPrivateKey;
-+PEM_read_bio_RSAPublicKey;
-+PEM_read_bio_RSA_PUBKEY;
-+PEM_read_bio_X509;
-+PEM_read_bio_X509_AUX;
-+PEM_read_bio_X509_CERT_PAIR;
-+PEM_read_bio_X509_CRL;
-+PEM_read_bio_X509_REQ;
-+PEM_version;
-+PEM_write;
-+PEM_write_DHparams;
-+PEM_write_DSAPrivateKey;
-+PEM_write_DSA_PUBKEY;
-+PEM_write_DSAparams;
-+PEM_write_ECPKParameters;
-+PEM_write_ECPrivateKey;
-+PEM_write_EC_PUBKEY;
-+PEM_write_NETSCAPE_CERT_SEQUENCE;
-+PEM_write_PKCS7;
-+PEM_write_PKCS8;
-+PEM_write_PKCS8PrivateKey;
-+PEM_write_PKCS8PrivateKey_nid;
-+PEM_write_PKCS8_PRIV_KEY_INFO;
-+PEM_write_PUBKEY;
-+PEM_write_PrivateKey;
-+PEM_write_RSAPrivateKey;
-+PEM_write_RSAPublicKey;
-+PEM_write_RSA_PUBKEY;
-+PEM_write_X509;
-+PEM_write_X509_AUX;
-+PEM_write_X509_CERT_PAIR;
-+PEM_write_X509_CRL;
-+PEM_write_X509_REQ;
-+PEM_write_X509_REQ_NEW;
-+PEM_write_bio;
-+PEM_write_bio_DHparams;
-+PEM_write_bio_DSAPrivateKey;
-+PEM_write_bio_DSA_PUBKEY;
-+PEM_write_bio_DSAparams;
-+PEM_write_bio_ECPKParameters;
-+PEM_write_bio_ECPrivateKey;
-+PEM_write_bio_EC_PUBKEY;
-+PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+PEM_write_bio_PKCS7;
-+PEM_write_bio_PKCS8;
-+PEM_write_bio_PKCS8PrivateKey;
-+PEM_write_bio_PKCS8PrivateKey_nid;
-+PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+PEM_write_bio_PUBKEY;
-+PEM_write_bio_PrivateKey;
-+PEM_write_bio_RSAPrivateKey;
-+PEM_write_bio_RSAPublicKey;
-+PEM_write_bio_RSA_PUBKEY;
-+PEM_write_bio_X509;
-+PEM_write_bio_X509_AUX;
-+PEM_write_bio_X509_CERT_PAIR;
-+PEM_write_bio_X509_CRL;
-+PEM_write_bio_X509_REQ;
-+PEM_write_bio_X509_REQ_NEW;
-+PKCS12_AUTHSAFES_it;
-+PKCS12_BAGS_free;
-+PKCS12_BAGS_it;
-+PKCS12_BAGS_new;
-+PKCS12_MAC_DATA_free;
-+PKCS12_MAC_DATA_it;
-+PKCS12_MAC_DATA_new;
-+PKCS12_MAKE_KEYBAG;
-+PKCS12_MAKE_SHKEYBAG;
-+PKCS12_PBE_add;
-+PKCS12_PBE_keyivgen;
-+PKCS12_SAFEBAGS_it;
-+PKCS12_SAFEBAG_free;
-+PKCS12_SAFEBAG_it;
-+PKCS12_SAFEBAG_new;
-+PKCS12_add_CSPName_asc;
-+PKCS12_add_cert;
-+PKCS12_add_friendlyname_asc;
-+PKCS12_add_friendlyname_uni;
-+PKCS12_add_key;
-+PKCS12_add_localkeyid;
-+PKCS12_add_safe;
-+PKCS12_add_safes;
-+PKCS12_certbag2x509;
-+PKCS12_certbag2x509crl;
-+PKCS12_create;
-+PKCS12_decrypt_skey;
-+PKCS12_free;
-+PKCS12_gen_mac;
-+PKCS12_get_attr_gen;
-+PKCS12_get_friendlyname;
-+PKCS12_init;
-+PKCS12_it;
-+PKCS12_item_decrypt_d2i;
-+PKCS12_item_i2d_encrypt;
-+PKCS12_item_pack_safebag;
-+PKCS12_key_gen_asc;
-+PKCS12_key_gen_uni;
-+PKCS12_new;
-+PKCS12_newpass;
-+PKCS12_pack_authsafes;
-+PKCS12_pack_p7data;
-+PKCS12_pack_p7encdata;
-+PKCS12_parse;
-+PKCS12_pbe_crypt;
-+PKCS12_set_mac;
-+PKCS12_setup_mac;
-+PKCS12_unpack_authsafes;
-+PKCS12_unpack_p7data;
-+PKCS12_unpack_p7encdata;
-+PKCS12_verify_mac;
-+PKCS12_x5092certbag;
-+PKCS12_x509crl2certbag;
-+PKCS1_MGF1;
-+PKCS5_PBE_add;
-+PKCS5_PBE_keyivgen;
-+PKCS5_PBKDF2_HMAC_SHA1;
-+PKCS5_pbe2_set;
-+PKCS5_pbe_set;
-+PKCS5_v2_PBE_keyivgen;
-+PKCS7_ATTR_SIGN_it;
-+PKCS7_ATTR_VERIFY_it;
-+PKCS7_DIGEST_free;
-+PKCS7_DIGEST_it;
-+PKCS7_DIGEST_new;
-+PKCS7_ENCRYPT_free;
-+PKCS7_ENCRYPT_it;
-+PKCS7_ENCRYPT_new;
-+PKCS7_ENC_CONTENT_free;
-+PKCS7_ENC_CONTENT_it;
-+PKCS7_ENC_CONTENT_new;
-+PKCS7_ENVELOPE_free;
-+PKCS7_ENVELOPE_it;
-+PKCS7_ENVELOPE_new;
-+PKCS7_ISSUER_AND_SERIAL_digest;
-+PKCS7_ISSUER_AND_SERIAL_free;
-+PKCS7_ISSUER_AND_SERIAL_it;
-+PKCS7_ISSUER_AND_SERIAL_new;
-+PKCS7_RECIP_INFO_free;
-+PKCS7_RECIP_INFO_it;
-+PKCS7_RECIP_INFO_new;
-+PKCS7_RECIP_INFO_set;
-+PKCS7_SIGNED_free;
-+PKCS7_SIGNED_it;
-+PKCS7_SIGNED_new;
-+PKCS7_SIGNER_INFO_free;
-+PKCS7_SIGNER_INFO_it;
-+PKCS7_SIGNER_INFO_new;
-+PKCS7_SIGNER_INFO_set;
-+PKCS7_SIGN_ENVELOPE_free;
-+PKCS7_SIGN_ENVELOPE_it;
-+PKCS7_SIGN_ENVELOPE_new;
-+PKCS7_add_attrib_smimecap;
-+PKCS7_add_attribute;
-+PKCS7_add_certificate;
-+PKCS7_add_crl;
-+PKCS7_add_recipient;
-+PKCS7_add_recipient_info;
-+PKCS7_add_signature;
-+PKCS7_add_signed_attribute;
-+PKCS7_add_signer;
-+PKCS7_cert_from_signer_info;
-+PKCS7_content_new;
-+PKCS7_ctrl;
-+PKCS7_dataDecode;
-+PKCS7_dataFinal;
-+PKCS7_dataInit;
-+PKCS7_dataVerify;
-+PKCS7_decrypt;
-+PKCS7_digest_from_attributes;
-+PKCS7_dup;
-+PKCS7_encrypt;
-+PKCS7_free;
-+PKCS7_get0_signers;
-+PKCS7_get_attribute;
-+PKCS7_get_issuer_and_serial;
-+PKCS7_get_signed_attribute;
-+PKCS7_get_signer_info;
-+PKCS7_get_smimecap;
-+PKCS7_it;
-+PKCS7_new;
-+PKCS7_set0_type_other;
-+PKCS7_set_attributes;
-+PKCS7_set_cipher;
-+PKCS7_set_content;
-+PKCS7_set_digest;
-+PKCS7_set_signed_attributes;
-+PKCS7_set_type;
-+PKCS7_sign;
-+PKCS7_signatureVerify;
-+PKCS7_simple_smimecap;
-+PKCS7_verify;
-+PKCS8_PRIV_KEY_INFO_free;
-+PKCS8_PRIV_KEY_INFO_it;
-+PKCS8_PRIV_KEY_INFO_new;
-+PKCS8_add_keyusage;
-+PKCS8_decrypt;
-+PKCS8_encrypt;
-+PKCS8_set_broken;
-+PKEY_USAGE_PERIOD_free;
-+PKEY_USAGE_PERIOD_it;
-+PKEY_USAGE_PERIOD_new;
-+POLICYINFO_free;
-+POLICYINFO_it;
-+POLICYINFO_new;
-+POLICYQUALINFO_free;
-+POLICYQUALINFO_it;
-+POLICYQUALINFO_new;
-+POLICY_CONSTRAINTS_free;
-+POLICY_CONSTRAINTS_it;
-+POLICY_CONSTRAINTS_new;
-+POLICY_MAPPINGS_it;
-+POLICY_MAPPING_free;
-+POLICY_MAPPING_it;
-+POLICY_MAPPING_new;
-+PROXY_CERT_INFO_EXTENSION_free;
-+PROXY_CERT_INFO_EXTENSION_it;
-+PROXY_CERT_INFO_EXTENSION_new;
-+PROXY_POLICY_free;
-+PROXY_POLICY_it;
-+PROXY_POLICY_new;
-+RAND_SSLeay;
-+RAND_add;
-+RAND_bytes;
-+RAND_cleanup;
-+RAND_egd;
-+RAND_egd_bytes;
-+RAND_file_name;
-+RAND_get_rand_method;
-+RAND_load_file;
-+RAND_poll;
-+RAND_pseudo_bytes;
-+RAND_query_egd_bytes;
-+RAND_seed;
-+RAND_set_rand_engine;
-+RAND_set_rand_method;
-+RAND_status;
-+RAND_version;
-+RAND_write_file;
-+RC2_cbc_encrypt;
-+RC2_cfb64_encrypt;
-+RC2_decrypt;
-+RC2_ecb_encrypt;
-+RC2_encrypt;
-+RC2_ofb64_encrypt;
-+RC2_set_key;
-+RC2_version;
-+RC4;
-+RC4_options;
-+RC4_set_key;
-+RC4_version;
-+RIPEMD160;
-+RIPEMD160_Final;
-+RIPEMD160_Init;
-+RIPEMD160_Transform;
-+RIPEMD160_Update;
-+RMD160_version;
-+RSAPrivateKey_asn1_meth;
-+RSAPrivateKey_dup;
-+RSAPrivateKey_it;
-+RSAPublicKey_dup;
-+RSAPublicKey_it;
-+RSA_PKCS1_SSLeay;
-+RSA_X931_hash_id;
-+RSA_blinding_off;
-+RSA_blinding_on;
-+RSA_check_key;
-+RSA_flags;
-+RSA_free;
-+RSA_generate_key;
-+RSA_generate_key_ex;
-+RSA_get_default_method;
-+RSA_get_ex_data;
-+RSA_get_ex_new_index;
-+RSA_get_method;
-+RSA_memory_lock;
-+RSA_new;
-+RSA_new_method;
-+RSA_null_method;
-+RSA_padding_add_PKCS1_OAEP;
-+RSA_padding_add_PKCS1_PSS;
-+RSA_padding_add_PKCS1_type_1;
-+RSA_padding_add_PKCS1_type_2;
-+RSA_padding_add_SSLv23;
-+RSA_padding_add_X931;
-+RSA_padding_add_none;
-+RSA_padding_check_PKCS1_OAEP;
-+RSA_padding_check_PKCS1_type_1;
-+RSA_padding_check_PKCS1_type_2;
-+RSA_padding_check_SSLv23;
-+RSA_padding_check_X931;
-+RSA_padding_check_none;
-+RSA_print;
-+RSA_print_fp;
-+RSA_private_decrypt;
-+RSA_private_encrypt;
-+RSA_public_decrypt;
-+RSA_public_encrypt;
-+RSA_set_default_method;
-+RSA_set_ex_data;
-+RSA_set_method;
-+RSA_setup_blinding;
-+RSA_sign;
-+RSA_sign_ASN1_OCTET_STRING;
-+RSA_size;
-+RSA_up_ref;
-+RSA_verify;
-+RSA_verify_ASN1_OCTET_STRING;
-+RSA_verify_PKCS1_PSS;
-+RSA_version;
-+SHA;
-+SHA1;
-+SHA1_Final;
-+SHA1_Init;
-+SHA1_Transform;
-+SHA1_Update;
-+SHA1_version;
-+SHA224;
-+SHA224_Final;
-+SHA224_Init;
-+SHA224_Update;
-+SHA256;
-+SHA256_Final;
-+SHA256_Init;
-+SHA256_Transform;
-+SHA256_Update;
-+SHA256_version;
-+SHA384;
-+SHA384_Final;
-+SHA384_Init;
-+SHA384_Update;
-+SHA512;
-+SHA512_Final;
-+SHA512_Init;
-+SHA512_Transform;
-+SHA512_Update;
-+SHA512_version;
-+SHA_Final;
-+SHA_Init;
-+SHA_Transform;
-+SHA_Update;
-+SHA_version;
-+SMIME_crlf_copy;
-+SMIME_read_PKCS7;
-+SMIME_text;
-+SMIME_write_PKCS7;
-+SSLeay;
-+SSLeay_version;
-+STACK_version;
-+STORE_ATTR_INFO_compare;
-+STORE_ATTR_INFO_free;
-+STORE_ATTR_INFO_get0_cstr;
-+STORE_ATTR_INFO_get0_dn;
-+STORE_ATTR_INFO_get0_number;
-+STORE_ATTR_INFO_get0_sha1str;
-+STORE_ATTR_INFO_in;
-+STORE_ATTR_INFO_in_ex;
-+STORE_ATTR_INFO_in_range;
-+STORE_ATTR_INFO_modify_cstr;
-+STORE_ATTR_INFO_modify_dn;
-+STORE_ATTR_INFO_modify_number;
-+STORE_ATTR_INFO_modify_sha1str;
-+STORE_ATTR_INFO_new;
-+STORE_ATTR_INFO_set_cstr;
-+STORE_ATTR_INFO_set_dn;
-+STORE_ATTR_INFO_set_number;
-+STORE_ATTR_INFO_set_sha1str;
-+STORE_Memory;
-+STORE_OBJECT_free;
-+STORE_OBJECT_new;
-+STORE_attr_sizes;
-+STORE_create_method;
-+STORE_ctrl;
-+STORE_delete_arbitrary;
-+STORE_delete_certificate;
-+STORE_delete_crl;
-+STORE_delete_number;
-+STORE_delete_private_key;
-+STORE_delete_public_key;
-+STORE_destroy_method;
-+STORE_free;
-+STORE_generate_crl;
-+STORE_generate_key;
-+STORE_get_arbitrary;
-+STORE_get_certificate;
-+STORE_get_crl;
-+STORE_get_ex_data;
-+STORE_get_ex_new_index;
-+STORE_get_method;
-+STORE_get_number;
-+STORE_get_private_key;
-+STORE_get_public_key;
-+STORE_list_certificate_end;
-+STORE_list_certificate_endp;
-+STORE_list_certificate_next;
-+STORE_list_certificate_start;
-+STORE_list_crl_end;
-+STORE_list_crl_endp;
-+STORE_list_crl_next;
-+STORE_list_crl_start;
-+STORE_list_private_key_end;
-+STORE_list_private_key_endp;
-+STORE_list_private_key_next;
-+STORE_list_private_key_start;
-+STORE_list_public_key_end;
-+STORE_list_public_key_endp;
-+STORE_list_public_key_next;
-+STORE_list_public_key_start;
-+STORE_method_get_cleanup_function;
-+STORE_method_get_ctrl_function;
-+STORE_method_get_delete_function;
-+STORE_method_get_generate_function;
-+STORE_method_get_get_function;
-+STORE_method_get_initialise_function;
-+STORE_method_get_list_end_function;
-+STORE_method_get_list_next_function;
-+STORE_method_get_list_start_function;
-+STORE_method_get_lock_store_function;
-+STORE_method_get_modify_function;
-+STORE_method_get_revoke_function;
-+STORE_method_get_store_function;
-+STORE_method_get_unlock_store_function;
-+STORE_method_get_update_store_function;
-+STORE_method_set_cleanup_function;
-+STORE_method_set_ctrl_function;
-+STORE_method_set_delete_function;
-+STORE_method_set_generate_function;
-+STORE_method_set_get_function;
-+STORE_method_set_initialise_function;
-+STORE_method_set_list_end_function;
-+STORE_method_set_list_next_function;
-+STORE_method_set_list_start_function;
-+STORE_method_set_lock_store_function;
-+STORE_method_set_modify_function;
-+STORE_method_set_revoke_function;
-+STORE_method_set_store_function;
-+STORE_method_set_unlock_store_function;
-+STORE_method_set_update_store_function;
-+STORE_modify_arbitrary;
-+STORE_modify_certificate;
-+STORE_modify_crl;
-+STORE_modify_number;
-+STORE_modify_private_key;
-+STORE_modify_public_key;
-+STORE_new_engine;
-+STORE_new_method;
-+STORE_object_type_string;
-+STORE_param_sizes;
-+STORE_parse_attrs_end;
-+STORE_parse_attrs_endp;
-+STORE_parse_attrs_next;
-+STORE_parse_attrs_start;
-+STORE_revoke_certificate;
-+STORE_revoke_private_key;
-+STORE_revoke_public_key;
-+STORE_set_ex_data;
-+STORE_set_method;
-+STORE_store_arbitrary;
-+STORE_store_certificate;
-+STORE_store_crl;
-+STORE_store_number;
-+STORE_store_private_key;
-+STORE_store_public_key;
-+SXNETID_free;
-+SXNETID_it;
-+SXNETID_new;
-+SXNET_add_id_INTEGER;
-+SXNET_add_id_asc;
-+SXNET_add_id_ulong;
-+SXNET_free;
-+SXNET_get_id_INTEGER;
-+SXNET_get_id_asc;
-+SXNET_get_id_ulong;
-+SXNET_it;
-+SXNET_new;
-+TXT_DB_create_index;
-+TXT_DB_free;
-+TXT_DB_get_by_index;
-+TXT_DB_insert;
-+TXT_DB_read;
-+TXT_DB_version;
-+TXT_DB_write;
-+UI_OpenSSL;
-+UI_UTIL_read_pw;
-+UI_UTIL_read_pw_string;
-+UI_add_error_string;
-+UI_add_info_string;
-+UI_add_input_boolean;
-+UI_add_input_string;
-+UI_add_user_data;
-+UI_add_verify_string;
-+UI_construct_prompt;
-+UI_create_method;
-+UI_ctrl;
-+UI_destroy_method;
-+UI_dup_error_string;
-+UI_dup_info_string;
-+UI_dup_input_boolean;
-+UI_dup_input_string;
-+UI_dup_verify_string;
-+UI_free;
-+UI_get0_action_string;
-+UI_get0_output_string;
-+UI_get0_result;
-+UI_get0_result_string;
-+UI_get0_test_string;
-+UI_get0_user_data;
-+UI_get_default_method;
-+UI_get_ex_data;
-+UI_get_ex_new_index;
-+UI_get_input_flags;
-+UI_get_method;
-+UI_get_result_maxsize;
-+UI_get_result_minsize;
-+UI_get_string_type;
-+UI_method_get_closer;
-+UI_method_get_flusher;
-+UI_method_get_opener;
-+UI_method_get_reader;
-+UI_method_get_writer;
-+UI_method_set_closer;
-+UI_method_set_flusher;
-+UI_method_set_opener;
-+UI_method_set_reader;
-+UI_method_set_writer;
-+UI_new;
-+UI_new_method;
-+UI_process;
-+UI_set_default_method;
-+UI_set_ex_data;
-+UI_set_method;
-+UI_set_result;
-+USERNOTICE_free;
-+USERNOTICE_it;
-+USERNOTICE_new;
-+UTF8_getc;
-+UTF8_putc;
-+X509V3_EXT_CRL_add_conf;
-+X509V3_EXT_CRL_add_nconf;
-+X509V3_EXT_REQ_add_conf;
-+X509V3_EXT_REQ_add_nconf;
-+X509V3_EXT_add;
-+X509V3_EXT_add_alias;
-+X509V3_EXT_add_conf;
-+X509V3_EXT_add_list;
-+X509V3_EXT_add_nconf;
-+X509V3_EXT_add_nconf_sk;
-+X509V3_EXT_cleanup;
-+X509V3_EXT_conf;
-+X509V3_EXT_conf_nid;
-+X509V3_EXT_d2i;
-+X509V3_EXT_get;
-+X509V3_EXT_get_nid;
-+X509V3_EXT_i2d;
-+X509V3_EXT_nconf;
-+X509V3_EXT_nconf_nid;
-+X509V3_EXT_print;
-+X509V3_EXT_print_fp;
-+X509V3_EXT_val_prn;
-+X509V3_NAME_from_section;
-+X509V3_add1_i2d;
-+X509V3_add_standard_extensions;
-+X509V3_add_value;
-+X509V3_add_value_bool;
-+X509V3_add_value_bool_nf;
-+X509V3_add_value_int;
-+X509V3_add_value_uchar;
-+X509V3_conf_free;
-+X509V3_extensions_print;
-+X509V3_get_d2i;
-+X509V3_get_section;
-+X509V3_get_string;
-+X509V3_get_value_bool;
-+X509V3_get_value_int;
-+X509V3_parse_list;
-+X509V3_section_free;
-+X509V3_set_conf_lhash;
-+X509V3_set_ctx;
-+X509V3_set_nconf;
-+X509V3_string_free;
-+X509_ALGOR_dup;
-+X509_ALGOR_free;
-+X509_ALGOR_it;
-+X509_ALGOR_new;
-+X509_ATTRIBUTE_SET_it;
-+X509_ATTRIBUTE_count;
-+X509_ATTRIBUTE_create;
-+X509_ATTRIBUTE_create_by_NID;
-+X509_ATTRIBUTE_create_by_OBJ;
-+X509_ATTRIBUTE_create_by_txt;
-+X509_ATTRIBUTE_dup;
-+X509_ATTRIBUTE_free;
-+X509_ATTRIBUTE_get0_data;
-+X509_ATTRIBUTE_get0_object;
-+X509_ATTRIBUTE_get0_type;
-+X509_ATTRIBUTE_it;
-+X509_ATTRIBUTE_new;
-+X509_ATTRIBUTE_set1_data;
-+X509_ATTRIBUTE_set1_object;
-+X509_CERT_AUX_free;
-+X509_CERT_AUX_it;
-+X509_CERT_AUX_new;
-+X509_CERT_AUX_print;
-+X509_CERT_PAIR_free;
-+X509_CERT_PAIR_it;
-+X509_CERT_PAIR_new;
-+X509_CINF_free;
-+X509_CINF_it;
-+X509_CINF_new;
-+X509_CRL_INFO_free;
-+X509_CRL_INFO_it;
-+X509_CRL_INFO_new;
-+X509_CRL_add0_revoked;
-+X509_CRL_add1_ext_i2d;
-+X509_CRL_add_ext;
-+X509_CRL_cmp;
-+X509_CRL_delete_ext;
-+X509_CRL_digest;
-+X509_CRL_dup;
-+X509_CRL_free;
-+X509_CRL_get_ext;
-+X509_CRL_get_ext_by_NID;
-+X509_CRL_get_ext_by_OBJ;
-+X509_CRL_get_ext_by_critical;
-+X509_CRL_get_ext_count;
-+X509_CRL_get_ext_d2i;
-+X509_CRL_it;
-+X509_CRL_new;
-+X509_CRL_print;
-+X509_CRL_print_fp;
-+X509_CRL_set_issuer_name;
-+X509_CRL_set_lastUpdate;
-+X509_CRL_set_nextUpdate;
-+X509_CRL_set_version;
-+X509_CRL_sign;
-+X509_CRL_sort;
-+X509_CRL_verify;
-+X509_EXTENSION_create_by_NID;
-+X509_EXTENSION_create_by_OBJ;
-+X509_EXTENSION_dup;
-+X509_EXTENSION_free;
-+X509_EXTENSION_get_critical;
-+X509_EXTENSION_get_data;
-+X509_EXTENSION_get_object;
-+X509_EXTENSION_it;
-+X509_EXTENSION_new;
-+X509_EXTENSION_set_critical;
-+X509_EXTENSION_set_data;
-+X509_EXTENSION_set_object;
-+X509_INFO_free;
-+X509_INFO_new;
-+X509_LOOKUP_by_alias;
-+X509_LOOKUP_by_fingerprint;
-+X509_LOOKUP_by_issuer_serial;
-+X509_LOOKUP_by_subject;
-+X509_LOOKUP_ctrl;
-+X509_LOOKUP_file;
-+X509_LOOKUP_free;
-+X509_LOOKUP_hash_dir;
-+X509_LOOKUP_init;
-+X509_LOOKUP_new;
-+X509_LOOKUP_shutdown;
-+X509_NAME_ENTRIES_it;
-+X509_NAME_ENTRY_create_by_NID;
-+X509_NAME_ENTRY_create_by_OBJ;
-+X509_NAME_ENTRY_create_by_txt;
-+X509_NAME_ENTRY_dup;
-+X509_NAME_ENTRY_free;
-+X509_NAME_ENTRY_get_data;
-+X509_NAME_ENTRY_get_object;
-+X509_NAME_ENTRY_it;
-+X509_NAME_ENTRY_new;
-+X509_NAME_ENTRY_set_data;
-+X509_NAME_ENTRY_set_object;
-+X509_NAME_INTERNAL_it;
-+X509_NAME_add_entry;
-+X509_NAME_add_entry_by_NID;
-+X509_NAME_add_entry_by_OBJ;
-+X509_NAME_add_entry_by_txt;
-+X509_NAME_cmp;
-+X509_NAME_delete_entry;
-+X509_NAME_digest;
-+X509_NAME_dup;
-+X509_NAME_entry_count;
-+X509_NAME_free;
-+X509_NAME_get_entry;
-+X509_NAME_get_index_by_NID;
-+X509_NAME_get_index_by_OBJ;
-+X509_NAME_get_text_by_NID;
-+X509_NAME_get_text_by_OBJ;
-+X509_NAME_hash;
-+X509_NAME_it;
-+X509_NAME_new;
-+X509_NAME_oneline;
-+X509_NAME_print;
-+X509_NAME_print_ex;
-+X509_NAME_print_ex_fp;
-+X509_NAME_set;
-+X509_OBJECT_free_contents;
-+X509_OBJECT_idx_by_subject;
-+X509_OBJECT_retrieve_by_subject;
-+X509_OBJECT_retrieve_match;
-+X509_OBJECT_up_ref_count;
-+X509_PKEY_free;
-+X509_PKEY_new;
-+X509_POLICY_NODE_print;
-+X509_PUBKEY_free;
-+X509_PUBKEY_get;
-+X509_PUBKEY_it;
-+X509_PUBKEY_new;
-+X509_PUBKEY_set;
-+X509_PURPOSE_add;
-+X509_PURPOSE_cleanup;
-+X509_PURPOSE_get0;
-+X509_PURPOSE_get0_name;
-+X509_PURPOSE_get0_sname;
-+X509_PURPOSE_get_by_id;
-+X509_PURPOSE_get_by_sname;
-+X509_PURPOSE_get_count;
-+X509_PURPOSE_get_id;
-+X509_PURPOSE_get_trust;
-+X509_PURPOSE_set;
-+X509_REQ_INFO_free;
-+X509_REQ_INFO_it;
-+X509_REQ_INFO_new;
-+X509_REQ_add1_attr;
-+X509_REQ_add1_attr_by_NID;
-+X509_REQ_add1_attr_by_OBJ;
-+X509_REQ_add1_attr_by_txt;
-+X509_REQ_add_extensions;
-+X509_REQ_add_extensions_nid;
-+X509_REQ_check_private_key;
-+X509_REQ_delete_attr;
-+X509_REQ_digest;
-+X509_REQ_dup;
-+X509_REQ_extension_nid;
-+X509_REQ_free;
-+X509_REQ_get1_email;
-+X509_REQ_get_attr;
-+X509_REQ_get_attr_by_NID;
-+X509_REQ_get_attr_by_OBJ;
-+X509_REQ_get_attr_count;
-+X509_REQ_get_extension_nids;
-+X509_REQ_get_extensions;
-+X509_REQ_get_pubkey;
-+X509_REQ_it;
-+X509_REQ_new;
-+X509_REQ_print;
-+X509_REQ_print_ex;
-+X509_REQ_print_fp;
-+X509_REQ_set_extension_nids;
-+X509_REQ_set_pubkey;
-+X509_REQ_set_subject_name;
-+X509_REQ_set_version;
-+X509_REQ_sign;
-+X509_REQ_to_X509;
-+X509_REQ_verify;
-+X509_REVOKED_add1_ext_i2d;
-+X509_REVOKED_add_ext;
-+X509_REVOKED_delete_ext;
-+X509_REVOKED_free;
-+X509_REVOKED_get_ext;
-+X509_REVOKED_get_ext_by_NID;
-+X509_REVOKED_get_ext_by_OBJ;
-+X509_REVOKED_get_ext_by_critical;
-+X509_REVOKED_get_ext_count;
-+X509_REVOKED_get_ext_d2i;
-+X509_REVOKED_it;
-+X509_REVOKED_new;
-+X509_REVOKED_set_revocationDate;
-+X509_REVOKED_set_serialNumber;
-+X509_SIG_free;
-+X509_SIG_it;
-+X509_SIG_new;
-+X509_STORE_CTX_cleanup;
-+X509_STORE_CTX_free;
-+X509_STORE_CTX_get0_param;
-+X509_STORE_CTX_get0_policy_tree;
-+X509_STORE_CTX_get1_chain;
-+X509_STORE_CTX_get1_issuer;
-+X509_STORE_CTX_get_chain;
-+X509_STORE_CTX_get_current_cert;
-+X509_STORE_CTX_get_error;
-+X509_STORE_CTX_get_error_depth;
-+X509_STORE_CTX_get_ex_data;
-+X509_STORE_CTX_get_ex_new_index;
-+X509_STORE_CTX_get_explicit_policy;
-+X509_STORE_CTX_init;
-+X509_STORE_CTX_new;
-+X509_STORE_CTX_purpose_inherit;
-+X509_STORE_CTX_set0_crls;
-+X509_STORE_CTX_set0_param;
-+X509_STORE_CTX_set_cert;
-+X509_STORE_CTX_set_chain;
-+X509_STORE_CTX_set_default;
-+X509_STORE_CTX_set_depth;
-+X509_STORE_CTX_set_error;
-+X509_STORE_CTX_set_ex_data;
-+X509_STORE_CTX_set_flags;
-+X509_STORE_CTX_set_purpose;
-+X509_STORE_CTX_set_time;
-+X509_STORE_CTX_set_trust;
-+X509_STORE_CTX_set_verify_cb;
-+X509_STORE_CTX_trusted_stack;
-+X509_STORE_add_cert;
-+X509_STORE_add_crl;
-+X509_STORE_add_lookup;
-+X509_STORE_free;
-+X509_STORE_get_by_subject;
-+X509_STORE_load_locations;
-+X509_STORE_new;
-+X509_STORE_set1_param;
-+X509_STORE_set_default_paths;
-+X509_STORE_set_depth;
-+X509_STORE_set_flags;
-+X509_STORE_set_purpose;
-+X509_STORE_set_trust;
-+X509_TRUST_add;
-+X509_TRUST_cleanup;
-+X509_TRUST_get0;
-+X509_TRUST_get0_name;
-+X509_TRUST_get_by_id;
-+X509_TRUST_get_count;
-+X509_TRUST_get_flags;
-+X509_TRUST_get_trust;
-+X509_TRUST_set;
-+X509_TRUST_set_default;
-+X509_VAL_free;
-+X509_VAL_it;
-+X509_VAL_new;
-+X509_VERIFY_PARAM_add0_policy;
-+X509_VERIFY_PARAM_add0_table;
-+X509_VERIFY_PARAM_clear_flags;
-+X509_VERIFY_PARAM_free;
-+X509_VERIFY_PARAM_get_depth;
-+X509_VERIFY_PARAM_get_flags;
-+X509_VERIFY_PARAM_inherit;
-+X509_VERIFY_PARAM_lookup;
-+X509_VERIFY_PARAM_new;
-+X509_VERIFY_PARAM_set1;
-+X509_VERIFY_PARAM_set1_name;
-+X509_VERIFY_PARAM_set1_policies;
-+X509_VERIFY_PARAM_set_depth;
-+X509_VERIFY_PARAM_set_flags;
-+X509_VERIFY_PARAM_set_purpose;
-+X509_VERIFY_PARAM_set_time;
-+X509_VERIFY_PARAM_set_trust;
-+X509_VERIFY_PARAM_table_cleanup;
-+X509_add1_ext_i2d;
-+X509_add1_reject_object;
-+X509_add1_trust_object;
-+X509_add_ext;
-+X509_alias_get0;
-+X509_alias_set1;
-+X509_asn1_meth;
-+X509_certificate_type;
-+X509_check_ca;
-+X509_check_issued;
-+X509_check_private_key;
-+X509_check_purpose;
-+X509_check_trust;
-+X509_cmp;
-+X509_cmp_current_time;
-+X509_cmp_time;
-+X509_delete_ext;
-+X509_digest;
-+X509_dup;
-+X509_email_free;
-+X509_find_by_issuer_and_serial;
-+X509_find_by_subject;
-+X509_free;
-+X509_get0_pubkey_bitstr;
-+X509_get1_email;
-+X509_get_default_cert_area;
-+X509_get_default_cert_dir;
-+X509_get_default_cert_dir_env;
-+X509_get_default_cert_file;
-+X509_get_default_cert_file_env;
-+X509_get_default_private_dir;
-+X509_get_ex_data;
-+X509_get_ex_new_index;
-+X509_get_ext;
-+X509_get_ext_by_NID;
-+X509_get_ext_by_OBJ;
-+X509_get_ext_by_critical;
-+X509_get_ext_count;
-+X509_get_ext_d2i;
-+X509_get_issuer_name;
-+X509_get_pubkey;
-+X509_get_pubkey_parameters;
-+X509_get_serialNumber;
-+X509_get_subject_name;
-+X509_gmtime_adj;
-+X509_issuer_and_serial_cmp;
-+X509_issuer_and_serial_hash;
-+X509_issuer_name_cmp;
-+X509_issuer_name_hash;
-+X509_it;
-+X509_keyid_get0;
-+X509_keyid_set1;
-+X509_load_cert_crl_file;
-+X509_load_cert_file;
-+X509_load_crl_file;
-+X509_new;
-+X509_ocspid_print;
-+X509_policy_check;
-+X509_policy_level_get0_node;
-+X509_policy_level_node_count;
-+X509_policy_node_get0_parent;
-+X509_policy_node_get0_policy;
-+X509_policy_node_get0_qualifiers;
-+X509_policy_tree_free;
-+X509_policy_tree_get0_level;
-+X509_policy_tree_get0_policies;
-+X509_policy_tree_get0_user_policies;
-+X509_policy_tree_level_count;
-+X509_print;
-+X509_print_ex;
-+X509_print_ex_fp;
-+X509_print_fp;
-+X509_pubkey_digest;
-+X509_reject_clear;
-+X509_set_ex_data;
-+X509_set_issuer_name;
-+X509_set_notAfter;
-+X509_set_notBefore;
-+X509_set_pubkey;
-+X509_set_serialNumber;
-+X509_set_subject_name;
-+X509_set_version;
-+X509_sign;
-+X509_signature_print;
-+X509_subject_name_cmp;
-+X509_subject_name_hash;
-+X509_supported_extension;
-+X509_time_adj;
-+X509_to_X509_REQ;
-+X509_trust_clear;
-+X509_verify;
-+X509_verify_cert;
-+X509_verify_cert_error_string;
-+X509_version;
-+X509at_add1_attr;
-+X509at_add1_attr_by_NID;
-+X509at_add1_attr_by_OBJ;
-+X509at_add1_attr_by_txt;
-+X509at_delete_attr;
-+X509at_get_attr;
-+X509at_get_attr_by_NID;
-+X509at_get_attr_by_OBJ;
-+X509at_get_attr_count;
-+X509v3_add_ext;
-+X509v3_delete_ext;
-+X509v3_get_ext;
-+X509v3_get_ext_by_NID;
-+X509v3_get_ext_by_OBJ;
-+X509v3_get_ext_by_critical;
-+X509v3_get_ext_count;
-+X9_62_CHARACTERISTIC_TWO_free;
-+X9_62_CHARACTERISTIC_TWO_it;
-+X9_62_CHARACTERISTIC_TWO_new;
-+X9_62_CURVE_it;
-+X9_62_FIELDID_it;
-+X9_62_PENTANOMIAL_free;
-+X9_62_PENTANOMIAL_it;
-+X9_62_PENTANOMIAL_new;
-+ZLONG_it;
-+_CONF_add_string;
-+_CONF_free_data;
-+_CONF_get_section;
-+_CONF_get_section_values;
-+_CONF_get_string;
-+_CONF_new_data;
-+_CONF_new_section;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+__bss_start;
-+_des_crypt;
-+_edata;
-+_end;
-+_fini;
-+_init;
-+_ossl_096_des_random_seed;
-+_ossl_old_crypt;
-+_ossl_old_des_cbc_cksum;
-+_ossl_old_des_cbc_encrypt;
-+_ossl_old_des_cfb64_encrypt;
-+_ossl_old_des_cfb_encrypt;
-+_ossl_old_des_crypt;
-+_ossl_old_des_decrypt3;
-+_ossl_old_des_ecb3_encrypt;
-+_ossl_old_des_ecb_encrypt;
-+_ossl_old_des_ede3_cbc_encrypt;
-+_ossl_old_des_ede3_cfb64_encrypt;
-+_ossl_old_des_ede3_ofb64_encrypt;
-+_ossl_old_des_enc_read;
-+_ossl_old_des_enc_write;
-+_ossl_old_des_encrypt;
-+_ossl_old_des_encrypt2;
-+_ossl_old_des_encrypt3;
-+_ossl_old_des_fcrypt;
-+_ossl_old_des_is_weak_key;
-+_ossl_old_des_key_sched;
-+_ossl_old_des_ncbc_encrypt;
-+_ossl_old_des_ofb64_encrypt;
-+_ossl_old_des_ofb_encrypt;
-+_ossl_old_des_options;
-+_ossl_old_des_pcbc_encrypt;
-+_ossl_old_des_quad_cksum;
-+_ossl_old_des_random_key;
-+_ossl_old_des_random_seed;
-+_ossl_old_des_read_2passwords;
-+_ossl_old_des_read_password;
-+_ossl_old_des_read_pw;
-+_ossl_old_des_read_pw_string;
-+_ossl_old_des_set_key;
-+_ossl_old_des_set_odd_parity;
-+_ossl_old_des_string_to_2keys;
-+_ossl_old_des_string_to_key;
-+_ossl_old_des_xcbc_encrypt;
-+_ossl_old_des_xwhite_in2out;
-+_shadow_DES_check_key;
-+_shadow_DES_rw_mode;
-+_x86_AES_decrypt;
-+_x86_AES_encrypt;
-+a2d_ASN1_OBJECT;
-+a2i_ASN1_ENUMERATED;
-+a2i_ASN1_INTEGER;
-+a2i_ASN1_STRING;
-+a2i_IPADDRESS;
-+a2i_IPADDRESS_NC;
-+a2i_ipadd;
-+asc2uni;
-+asn1_Finish;
-+asn1_GetSequence;
-+asn1_add_error;
-+asn1_const_Finish;
-+asn1_do_adb;
-+asn1_do_lock;
-+asn1_enc_free;
-+asn1_enc_init;
-+asn1_enc_restore;
-+asn1_enc_save;
-+asn1_ex_c2i;
-+asn1_ex_i2c;
-+asn1_get_choice_selector;
-+asn1_get_field_ptr;
-+asn1_primitive_clear;
-+asn1_set_choice_selector;
-+bind_engine;
-+bn_add_part_words;
-+bn_add_words;
-+bn_cmp_part_words;
-+bn_cmp_words;
-+bn_div_words;
-+bn_dup_expand;
-+bn_expand2;
-+bn_mul_add_words;
-+bn_mul_comba4;
-+bn_mul_comba8;
-+bn_mul_high;
-+bn_mul_low_normal;
-+bn_mul_low_recursive;
-+bn_mul_normal;
-+bn_mul_part_recursive;
-+bn_mul_recursive;
-+bn_mul_words;
-+bn_sqr_comba4;
-+bn_sqr_comba8;
-+bn_sqr_normal;
-+bn_sqr_recursive;
-+bn_sqr_words;
-+bn_sub_part_words;
-+bn_sub_words;
-+c2i_ASN1_BIT_STRING;
-+c2i_ASN1_INTEGER;
-+c2i_ASN1_OBJECT;
-+cleanse_ctr;
-+d2i_ACCESS_DESCRIPTION;
-+d2i_ASN1_BIT_STRING;
-+d2i_ASN1_BMPSTRING;
-+d2i_ASN1_BOOLEAN;
-+d2i_ASN1_ENUMERATED;
-+d2i_ASN1_GENERALIZEDTIME;
-+d2i_ASN1_GENERALSTRING;
-+d2i_ASN1_HEADER;
-+d2i_ASN1_IA5STRING;
-+d2i_ASN1_INTEGER;
-+d2i_ASN1_NULL;
-+d2i_ASN1_OBJECT;
-+d2i_ASN1_OCTET_STRING;
-+d2i_ASN1_PRINTABLE;
-+d2i_ASN1_PRINTABLESTRING;
-+d2i_ASN1_SET;
-+d2i_ASN1_T61STRING;
-+d2i_ASN1_TIME;
-+d2i_ASN1_TYPE;
-+d2i_ASN1_UINTEGER;
-+d2i_ASN1_UNIVERSALSTRING;
-+d2i_ASN1_UTCTIME;
-+d2i_ASN1_UTF8STRING;
-+d2i_ASN1_VISIBLESTRING;
-+d2i_ASN1_bytes;
-+d2i_ASN1_type_bytes;
-+d2i_AUTHORITY_INFO_ACCESS;
-+d2i_AUTHORITY_KEYID;
-+d2i_AutoPrivateKey;
-+d2i_BASIC_CONSTRAINTS;
-+d2i_CERTIFICATEPOLICIES;
-+d2i_CRL_DIST_POINTS;
-+d2i_DHparams;
-+d2i_DIRECTORYSTRING;
-+d2i_DISPLAYTEXT;
-+d2i_DIST_POINT;
-+d2i_DIST_POINT_NAME;
-+d2i_DSAPrivateKey;
-+d2i_DSAPrivateKey_bio;
-+d2i_DSAPrivateKey_fp;
-+d2i_DSAPublicKey;
-+d2i_DSA_PUBKEY;
-+d2i_DSA_PUBKEY_bio;
-+d2i_DSA_PUBKEY_fp;
-+d2i_DSA_SIG;
-+d2i_DSAparams;
-+d2i_ECDSA_SIG;
-+d2i_ECPKPARAMETERS;
-+d2i_ECPKParameters;
-+d2i_ECParameters;
-+d2i_ECPrivateKey;
-+d2i_ECPrivateKey_bio;
-+d2i_ECPrivateKey_fp;
-+d2i_EC_PRIVATEKEY;
-+d2i_EC_PUBKEY;
-+d2i_EC_PUBKEY_bio;
-+d2i_EC_PUBKEY_fp;
-+d2i_EDIPARTYNAME;
-+d2i_EXTENDED_KEY_USAGE;
-+d2i_GENERAL_NAME;
-+d2i_GENERAL_NAMES;
-+d2i_KRB5_APREQ;
-+d2i_KRB5_APREQBODY;
-+d2i_KRB5_AUTHDATA;
-+d2i_KRB5_AUTHENT;
-+d2i_KRB5_AUTHENTBODY;
-+d2i_KRB5_CHECKSUM;
-+d2i_KRB5_ENCDATA;
-+d2i_KRB5_ENCKEY;
-+d2i_KRB5_PRINCNAME;
-+d2i_KRB5_TICKET;
-+d2i_KRB5_TKTBODY;
-+d2i_NETSCAPE_CERT_SEQUENCE;
-+d2i_NETSCAPE_ENCRYPTED_PKEY;
-+d2i_NETSCAPE_PKEY;
-+d2i_NETSCAPE_SPKAC;
-+d2i_NETSCAPE_SPKI;
-+d2i_NOTICEREF;
-+d2i_Netscape_RSA;
-+d2i_OCSP_BASICRESP;
-+d2i_OCSP_CERTID;
-+d2i_OCSP_CERTSTATUS;
-+d2i_OCSP_CRLID;
-+d2i_OCSP_ONEREQ;
-+d2i_OCSP_REQINFO;
-+d2i_OCSP_REQUEST;
-+d2i_OCSP_RESPBYTES;
-+d2i_OCSP_RESPDATA;
-+d2i_OCSP_RESPID;
-+d2i_OCSP_RESPONSE;
-+d2i_OCSP_REVOKEDINFO;
-+d2i_OCSP_SERVICELOC;
-+d2i_OCSP_SIGNATURE;
-+d2i_OCSP_SINGLERESP;
-+d2i_OTHERNAME;
-+d2i_PBE2PARAM;
-+d2i_PBEPARAM;
-+d2i_PBKDF2PARAM;
-+d2i_PKCS12;
-+d2i_PKCS12_BAGS;
-+d2i_PKCS12_MAC_DATA;
-+d2i_PKCS12_SAFEBAG;
-+d2i_PKCS12_bio;
-+d2i_PKCS12_fp;
-+d2i_PKCS7;
-+d2i_PKCS7_DIGEST;
-+d2i_PKCS7_ENCRYPT;
-+d2i_PKCS7_ENC_CONTENT;
-+d2i_PKCS7_ENVELOPE;
-+d2i_PKCS7_ISSUER_AND_SERIAL;
-+d2i_PKCS7_RECIP_INFO;
-+d2i_PKCS7_SIGNED;
-+d2i_PKCS7_SIGNER_INFO;
-+d2i_PKCS7_SIGN_ENVELOPE;
-+d2i_PKCS7_bio;
-+d2i_PKCS7_fp;
-+d2i_PKCS8PrivateKey_bio;
-+d2i_PKCS8PrivateKey_fp;
-+d2i_PKCS8_PRIV_KEY_INFO;
-+d2i_PKCS8_PRIV_KEY_INFO_bio;
-+d2i_PKCS8_PRIV_KEY_INFO_fp;
-+d2i_PKCS8_bio;
-+d2i_PKCS8_fp;
-+d2i_PKEY_USAGE_PERIOD;
-+d2i_POLICYINFO;
-+d2i_POLICYQUALINFO;
-+d2i_PROXY_CERT_INFO_EXTENSION;
-+d2i_PROXY_POLICY;
-+d2i_PUBKEY;
-+d2i_PUBKEY_bio;
-+d2i_PUBKEY_fp;
-+d2i_PrivateKey;
-+d2i_PrivateKey_bio;
-+d2i_PrivateKey_fp;
-+d2i_PublicKey;
-+d2i_RSAPrivateKey;
-+d2i_RSAPrivateKey_bio;
-+d2i_RSAPrivateKey_fp;
-+d2i_RSAPublicKey;
-+d2i_RSAPublicKey_bio;
-+d2i_RSAPublicKey_fp;
-+d2i_RSA_NET;
-+d2i_RSA_PUBKEY;
-+d2i_RSA_PUBKEY_bio;
-+d2i_RSA_PUBKEY_fp;
-+d2i_SXNET;
-+d2i_SXNETID;
-+d2i_USERNOTICE;
-+d2i_X509;
-+d2i_X509_ALGOR;
-+d2i_X509_ATTRIBUTE;
-+d2i_X509_AUX;
-+d2i_X509_CERT_AUX;
-+d2i_X509_CERT_PAIR;
-+d2i_X509_CINF;
-+d2i_X509_CRL;
-+d2i_X509_CRL_INFO;
-+d2i_X509_CRL_bio;
-+d2i_X509_CRL_fp;
-+d2i_X509_EXTENSION;
-+d2i_X509_NAME;
-+d2i_X509_NAME_ENTRY;
-+d2i_X509_PKEY;
-+d2i_X509_PUBKEY;
-+d2i_X509_REQ;
-+d2i_X509_REQ_INFO;
-+d2i_X509_REQ_bio;
-+d2i_X509_REQ_fp;
-+d2i_X509_REVOKED;
-+d2i_X509_SIG;
-+d2i_X509_VAL;
-+d2i_X509_bio;
-+d2i_X509_fp;
-+dsa_pub_internal_it;
-+ec_GF2m_have_precompute_mult;
-+ec_GF2m_precompute_mult;
-+ec_GF2m_simple_add;
-+ec_GF2m_simple_cmp;
-+ec_GF2m_simple_dbl;
-+ec_GF2m_simple_field_div;
-+ec_GF2m_simple_field_mul;
-+ec_GF2m_simple_field_sqr;
-+ec_GF2m_simple_group_check_discriminant;
-+ec_GF2m_simple_group_clear_finish;
-+ec_GF2m_simple_group_copy;
-+ec_GF2m_simple_group_finish;
-+ec_GF2m_simple_group_get_curve;
-+ec_GF2m_simple_group_get_degree;
-+ec_GF2m_simple_group_init;
-+ec_GF2m_simple_group_set_curve;
-+ec_GF2m_simple_invert;
-+ec_GF2m_simple_is_at_infinity;
-+ec_GF2m_simple_is_on_curve;
-+ec_GF2m_simple_make_affine;
-+ec_GF2m_simple_mul;
-+ec_GF2m_simple_oct2point;
-+ec_GF2m_simple_point2oct;
-+ec_GF2m_simple_point_clear_finish;
-+ec_GF2m_simple_point_copy;
-+ec_GF2m_simple_point_finish;
-+ec_GF2m_simple_point_get_affine_coordinates;
-+ec_GF2m_simple_point_init;
-+ec_GF2m_simple_point_set_affine_coordinates;
-+ec_GF2m_simple_point_set_to_infinity;
-+ec_GF2m_simple_points_make_affine;
-+ec_GF2m_simple_set_compressed_coordinates;
-+ec_GFp_mont_field_decode;
-+ec_GFp_mont_field_encode;
-+ec_GFp_mont_field_mul;
-+ec_GFp_mont_field_set_to_one;
-+ec_GFp_mont_field_sqr;
-+ec_GFp_mont_group_clear_finish;
-+ec_GFp_mont_group_copy;
-+ec_GFp_mont_group_finish;
-+ec_GFp_mont_group_init;
-+ec_GFp_mont_group_set_curve;
-+ec_GFp_nist_field_mul;
-+ec_GFp_nist_field_sqr;
-+ec_GFp_nist_group_copy;
-+ec_GFp_nist_group_set_curve;
-+ec_GFp_simple_add;
-+ec_GFp_simple_cmp;
-+ec_GFp_simple_dbl;
-+ec_GFp_simple_field_mul;
-+ec_GFp_simple_field_sqr;
-+ec_GFp_simple_get_Jprojective_coordinates_GFp;
-+ec_GFp_simple_group_check_discriminant;
-+ec_GFp_simple_group_clear_finish;
-+ec_GFp_simple_group_copy;
-+ec_GFp_simple_group_finish;
-+ec_GFp_simple_group_get_curve;
-+ec_GFp_simple_group_get_degree;
-+ec_GFp_simple_group_init;
-+ec_GFp_simple_group_set_curve;
-+ec_GFp_simple_invert;
-+ec_GFp_simple_is_at_infinity;
-+ec_GFp_simple_is_on_curve;
-+ec_GFp_simple_make_affine;
-+ec_GFp_simple_oct2point;
-+ec_GFp_simple_point2oct;
-+ec_GFp_simple_point_clear_finish;
-+ec_GFp_simple_point_copy;
-+ec_GFp_simple_point_finish;
-+ec_GFp_simple_point_get_affine_coordinates;
-+ec_GFp_simple_point_init;
-+ec_GFp_simple_point_set_affine_coordinates;
-+ec_GFp_simple_point_set_to_infinity;
-+ec_GFp_simple_points_make_affine;
-+ec_GFp_simple_set_Jprojective_coordinates_GFp;
-+ec_GFp_simple_set_compressed_coordinates;
-+ec_wNAF_have_precompute_mult;
-+ec_wNAF_mul;
-+ec_wNAF_precompute_mult;
-+ecdh_check;
-+ecdsa_check;
-+engine_cleanup_add_first;
-+engine_cleanup_add_last;
-+engine_free_util;
-+engine_set_all_null;
-+engine_table_cleanup;
-+engine_table_register;
-+engine_table_select;
-+engine_table_unregister;
-+engine_unlocked_finish;
-+engine_unlocked_init;
-+fcrypt_body;
-+get_rfc2409_prime_1024;
-+get_rfc2409_prime_768;
-+get_rfc3526_prime_1536;
-+get_rfc3526_prime_2048;
-+get_rfc3526_prime_3072;
-+get_rfc3526_prime_4096;
-+get_rfc3526_prime_6144;
-+get_rfc3526_prime_8192;
-+hex_to_string;
-+i2a_ACCESS_DESCRIPTION;
-+i2a_ASN1_ENUMERATED;
-+i2a_ASN1_INTEGER;
-+i2a_ASN1_OBJECT;
-+i2a_ASN1_STRING;
-+i2c_ASN1_BIT_STRING;
-+i2c_ASN1_INTEGER;
-+i2d_ACCESS_DESCRIPTION;
-+i2d_ASN1_BIT_STRING;
-+i2d_ASN1_BMPSTRING;
-+i2d_ASN1_BOOLEAN;
-+i2d_ASN1_ENUMERATED;
-+i2d_ASN1_GENERALIZEDTIME;
-+i2d_ASN1_GENERALSTRING;
-+i2d_ASN1_HEADER;
-+i2d_ASN1_IA5STRING;
-+i2d_ASN1_INTEGER;
-+i2d_ASN1_NULL;
-+i2d_ASN1_OBJECT;
-+i2d_ASN1_OCTET_STRING;
-+i2d_ASN1_PRINTABLE;
-+i2d_ASN1_PRINTABLESTRING;
-+i2d_ASN1_SET;
-+i2d_ASN1_T61STRING;
-+i2d_ASN1_TIME;
-+i2d_ASN1_TYPE;
-+i2d_ASN1_UNIVERSALSTRING;
-+i2d_ASN1_UTCTIME;
-+i2d_ASN1_UTF8STRING;
-+i2d_ASN1_VISIBLESTRING;
-+i2d_ASN1_bytes;
-+i2d_AUTHORITY_INFO_ACCESS;
-+i2d_AUTHORITY_KEYID;
-+i2d_BASIC_CONSTRAINTS;
-+i2d_CERTIFICATEPOLICIES;
-+i2d_CRL_DIST_POINTS;
-+i2d_DHparams;
-+i2d_DIRECTORYSTRING;
-+i2d_DISPLAYTEXT;
-+i2d_DIST_POINT;
-+i2d_DIST_POINT_NAME;
-+i2d_DSAPrivateKey;
-+i2d_DSAPrivateKey_bio;
-+i2d_DSAPrivateKey_fp;
-+i2d_DSAPublicKey;
-+i2d_DSA_PUBKEY;
-+i2d_DSA_PUBKEY_bio;
-+i2d_DSA_PUBKEY_fp;
-+i2d_DSA_SIG;
-+i2d_DSAparams;
-+i2d_ECDSA_SIG;
-+i2d_ECPKPARAMETERS;
-+i2d_ECPKParameters;
-+i2d_ECParameters;
-+i2d_ECPrivateKey;
-+i2d_ECPrivateKey_bio;
-+i2d_ECPrivateKey_fp;
-+i2d_EC_PRIVATEKEY;
-+i2d_EC_PUBKEY;
-+i2d_EC_PUBKEY_bio;
-+i2d_EC_PUBKEY_fp;
-+i2d_EDIPARTYNAME;
-+i2d_EXTENDED_KEY_USAGE;
-+i2d_GENERAL_NAME;
-+i2d_GENERAL_NAMES;
-+i2d_KRB5_APREQ;
-+i2d_KRB5_APREQBODY;
-+i2d_KRB5_AUTHDATA;
-+i2d_KRB5_AUTHENT;
-+i2d_KRB5_AUTHENTBODY;
-+i2d_KRB5_CHECKSUM;
-+i2d_KRB5_ENCDATA;
-+i2d_KRB5_ENCKEY;
-+i2d_KRB5_PRINCNAME;
-+i2d_KRB5_TICKET;
-+i2d_KRB5_TKTBODY;
-+i2d_NETSCAPE_CERT_SEQUENCE;
-+i2d_NETSCAPE_ENCRYPTED_PKEY;
-+i2d_NETSCAPE_PKEY;
-+i2d_NETSCAPE_SPKAC;
-+i2d_NETSCAPE_SPKI;
-+i2d_NOTICEREF;
-+i2d_Netscape_RSA;
-+i2d_OCSP_BASICRESP;
-+i2d_OCSP_CERTID;
-+i2d_OCSP_CERTSTATUS;
-+i2d_OCSP_CRLID;
-+i2d_OCSP_ONEREQ;
-+i2d_OCSP_REQINFO;
-+i2d_OCSP_REQUEST;
-+i2d_OCSP_RESPBYTES;
-+i2d_OCSP_RESPDATA;
-+i2d_OCSP_RESPID;
-+i2d_OCSP_RESPONSE;
-+i2d_OCSP_REVOKEDINFO;
-+i2d_OCSP_SERVICELOC;
-+i2d_OCSP_SIGNATURE;
-+i2d_OCSP_SINGLERESP;
-+i2d_OTHERNAME;
-+i2d_PBE2PARAM;
-+i2d_PBEPARAM;
-+i2d_PBKDF2PARAM;
-+i2d_PKCS12;
-+i2d_PKCS12_BAGS;
-+i2d_PKCS12_MAC_DATA;
-+i2d_PKCS12_SAFEBAG;
-+i2d_PKCS12_bio;
-+i2d_PKCS12_fp;
-+i2d_PKCS7;
-+i2d_PKCS7_DIGEST;
-+i2d_PKCS7_ENCRYPT;
-+i2d_PKCS7_ENC_CONTENT;
-+i2d_PKCS7_ENVELOPE;
-+i2d_PKCS7_ISSUER_AND_SERIAL;
-+i2d_PKCS7_NDEF;
-+i2d_PKCS7_RECIP_INFO;
-+i2d_PKCS7_SIGNED;
-+i2d_PKCS7_SIGNER_INFO;
-+i2d_PKCS7_SIGN_ENVELOPE;
-+i2d_PKCS7_bio;
-+i2d_PKCS7_fp;
-+i2d_PKCS8PrivateKeyInfo_bio;
-+i2d_PKCS8PrivateKeyInfo_fp;
-+i2d_PKCS8PrivateKey_bio;
-+i2d_PKCS8PrivateKey_fp;
-+i2d_PKCS8PrivateKey_nid_bio;
-+i2d_PKCS8PrivateKey_nid_fp;
-+i2d_PKCS8_PRIV_KEY_INFO;
-+i2d_PKCS8_PRIV_KEY_INFO_bio;
-+i2d_PKCS8_PRIV_KEY_INFO_fp;
-+i2d_PKCS8_bio;
-+i2d_PKCS8_fp;
-+i2d_PKEY_USAGE_PERIOD;
-+i2d_POLICYINFO;
-+i2d_POLICYQUALINFO;
-+i2d_PROXY_CERT_INFO_EXTENSION;
-+i2d_PROXY_POLICY;
-+i2d_PUBKEY;
-+i2d_PUBKEY_bio;
-+i2d_PUBKEY_fp;
-+i2d_PrivateKey;
-+i2d_PrivateKey_bio;
-+i2d_PrivateKey_fp;
-+i2d_PublicKey;
-+i2d_RSAPrivateKey;
-+i2d_RSAPrivateKey_bio;
-+i2d_RSAPrivateKey_fp;
-+i2d_RSAPublicKey;
-+i2d_RSAPublicKey_bio;
-+i2d_RSAPublicKey_fp;
-+i2d_RSA_NET;
-+i2d_RSA_PUBKEY;
-+i2d_RSA_PUBKEY_bio;
-+i2d_RSA_PUBKEY_fp;
-+i2d_SXNET;
-+i2d_SXNETID;
-+i2d_USERNOTICE;
-+i2d_X509;
-+i2d_X509_ALGOR;
-+i2d_X509_ATTRIBUTE;
-+i2d_X509_AUX;
-+i2d_X509_CERT_AUX;
-+i2d_X509_CERT_PAIR;
-+i2d_X509_CINF;
-+i2d_X509_CRL;
-+i2d_X509_CRL_INFO;
-+i2d_X509_CRL_bio;
-+i2d_X509_CRL_fp;
-+i2d_X509_EXTENSION;
-+i2d_X509_NAME;
-+i2d_X509_NAME_ENTRY;
-+i2d_X509_PKEY;
-+i2d_X509_PUBKEY;
-+i2d_X509_REQ;
-+i2d_X509_REQ_INFO;
-+i2d_X509_REQ_bio;
-+i2d_X509_REQ_fp;
-+i2d_X509_REVOKED;
-+i2d_X509_SIG;
-+i2d_X509_VAL;
-+i2d_X509_bio;
-+i2d_X509_fp;
-+i2o_ECPublicKey;
-+i2s_ASN1_ENUMERATED;
-+i2s_ASN1_ENUMERATED_TABLE;
-+i2s_ASN1_INTEGER;
-+i2s_ASN1_OCTET_STRING;
-+i2t_ASN1_OBJECT;
-+i2v_ASN1_BIT_STRING;
-+i2v_GENERAL_NAME;
-+i2v_GENERAL_NAMES;
-+idea_cbc_encrypt;
-+idea_cfb64_encrypt;
-+idea_ecb_encrypt;
-+idea_encrypt;
-+idea_ofb64_encrypt;
-+idea_options;
-+idea_set_decrypt_key;
-+idea_set_encrypt_key;
-+level_add_node;
-+level_find_node;
-+lh_delete;
-+lh_doall;
-+lh_doall_arg;
-+lh_free;
-+lh_insert;
-+lh_new;
-+lh_node_stats;
-+lh_node_stats_bio;
-+lh_node_usage_stats;
-+lh_node_usage_stats_bio;
-+lh_num_items;
-+lh_retrieve;
-+lh_stats;
-+lh_stats_bio;
-+lh_strhash;
-+lh_version;
-+md4_block_host_order;
-+md5_block_asm_host_order;
-+ms_time_cmp;
-+ms_time_diff;
-+ms_time_free;
-+ms_time_get;
-+ms_time_new;
-+name_cmp;
-+o2i_ECPublicKey;
-+pitem_free;
-+pitem_new;
-+policy_cache_find_data;
-+policy_cache_free;
-+policy_cache_set;
-+policy_cache_set_mapping;
-+policy_data_free;
-+policy_data_new;
-+policy_node_cmp_new;
-+policy_node_free;
-+pqueue_find;
-+pqueue_free;
-+pqueue_insert;
-+pqueue_iterator;
-+pqueue_new;
-+pqueue_next;
-+pqueue_peek;
-+pqueue_pop;
-+pqueue_print;
-+rand_ssleay_meth;
-+ripemd160_block_asm_host_order;
-+s2i_ASN1_INTEGER;
-+s2i_ASN1_OCTET_STRING;
-+sha1_block_asm_data_order;
-+sha1_block_asm_host_order;
-+sha256_block_data_order;
-+sha256_block_host_order;
-+sha512_block_sse2;
-+sha_block_data_order;
-+sha_block_host_order;
-+sk_delete;
-+sk_delete_ptr;
-+sk_dup;
-+sk_find;
-+sk_find_ex;
-+sk_free;
-+sk_insert;
-+sk_is_sorted;
-+sk_new;
-+sk_new_null;
-+sk_num;
-+sk_pop;
-+sk_pop_free;
-+sk_push;
-+sk_set;
-+sk_set_cmp_func;
-+sk_shift;
-+sk_sort;
-+sk_unshift;
-+sk_value;
-+sk_zero;
-+string_to_hex;
-+tree_find_sk;
-+uni2asc;
-+v2i_ASN1_BIT_STRING;
-+v2i_GENERAL_NAME;
-+v2i_GENERAL_NAMES;
-+v2i_GENERAL_NAME_ex;
-+v3_akey_id;
-+v3_alt;
-+v3_bcons;
-+v3_cpols;
-+v3_crl_hold;
-+v3_crl_invdate;
-+v3_crl_num;
-+v3_crl_reason;
-+v3_crld;
-+v3_delta_crl;
-+v3_ext_ku;
-+v3_info;
-+v3_inhibit_anyp;
-+v3_key_usage;
-+v3_name_constraints;
-+v3_ns_ia5_list;
-+v3_nscert;
-+v3_ocsp_accresp;
-+v3_ocsp_acutoff;
-+v3_ocsp_crlid;
-+v3_ocsp_nocheck;
-+v3_ocsp_nonce;
-+v3_ocsp_serviceloc;
-+v3_pci;
-+v3_pkey_usage_period;
-+v3_policy_constraints;
-+v3_policy_mappings;
-+v3_sinfo;
-+v3_skey_id;
-+v3_sxnet;
-+v_check;
-+x509_dir_lookup;
-+x509_file_lookup;
-+x509_name_ff;
-+	local:
-+		*;
-+};
---- misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	2007-10-16 15:44:13.000000000 +0200
-@@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8o{
-+	global:
-+BIO_f_ssl;
-+BIO_new_buffer_ssl_connect;
-+BIO_new_ssl;
-+BIO_new_ssl_connect;
-+BIO_ssl_copy_session_id;
-+BIO_ssl_shutdown;
-+DTLSv1_client_method;
-+DTLSv1_enc_data;
-+DTLSv1_method;
-+DTLSv1_server_method;
-+ERR_load_SSL_strings;
-+SSL_CIPHER_description;
-+SSL_CIPHER_get_bits;
-+SSL_CIPHER_get_name;
-+SSL_CIPHER_get_version;
-+SSL_COMP_add_compression_method;
-+SSL_COMP_get_compression_methods;
-+SSL_COMP_get_name;
-+SSL_CTX_add_client_CA;
-+SSL_CTX_add_session;
-+SSL_CTX_callback_ctrl;
-+SSL_CTX_check_private_key;
-+SSL_CTX_ctrl;
-+SSL_CTX_flush_sessions;
-+SSL_CTX_free;
-+SSL_CTX_get_cert_store;
-+SSL_CTX_get_client_CA_list;
-+SSL_CTX_get_client_cert_cb;
-+SSL_CTX_get_ex_data;
-+SSL_CTX_get_ex_new_index;
-+SSL_CTX_get_info_callback;
-+SSL_CTX_get_quiet_shutdown;
-+SSL_CTX_get_timeout;
-+SSL_CTX_get_verify_callback;
-+SSL_CTX_get_verify_depth;
-+SSL_CTX_get_verify_mode;
-+SSL_CTX_load_verify_locations;
-+SSL_CTX_new;
-+SSL_CTX_remove_session;
-+SSL_CTX_sess_get_get_cb;
-+SSL_CTX_sess_get_new_cb;
-+SSL_CTX_sess_get_remove_cb;
-+SSL_CTX_sess_set_get_cb;
-+SSL_CTX_sess_set_new_cb;
-+SSL_CTX_sess_set_remove_cb;
-+SSL_CTX_sessions;
-+SSL_CTX_set_cert_store;
-+SSL_CTX_set_cert_verify_callback;
-+SSL_CTX_set_cipher_list;
-+SSL_CTX_set_client_CA_list;
-+SSL_CTX_set_client_cert_cb;
-+SSL_CTX_set_cookie_generate_cb;
-+SSL_CTX_set_cookie_verify_cb;
-+SSL_CTX_set_default_passwd_cb;
-+SSL_CTX_set_default_passwd_cb_userdata;
-+SSL_CTX_set_default_verify_paths;
-+SSL_CTX_set_ex_data;
-+SSL_CTX_set_generate_session_id;
-+SSL_CTX_set_info_callback;
-+SSL_CTX_set_msg_callback;
-+SSL_CTX_set_purpose;
-+SSL_CTX_set_quiet_shutdown;
-+SSL_CTX_set_session_id_context;
-+SSL_CTX_set_ssl_version;
-+SSL_CTX_set_timeout;
-+SSL_CTX_set_tmp_dh_callback;
-+SSL_CTX_set_tmp_ecdh_callback;
-+SSL_CTX_set_tmp_rsa_callback;
-+SSL_CTX_set_trust;
-+SSL_CTX_set_verify;
-+SSL_CTX_set_verify_depth;
-+SSL_CTX_use_PrivateKey;
-+SSL_CTX_use_PrivateKey_ASN1;
-+SSL_CTX_use_PrivateKey_file;
-+SSL_CTX_use_RSAPrivateKey;
-+SSL_CTX_use_RSAPrivateKey_ASN1;
-+SSL_CTX_use_RSAPrivateKey_file;
-+SSL_CTX_use_certificate;
-+SSL_CTX_use_certificate_ASN1;
-+SSL_CTX_use_certificate_chain_file;
-+SSL_CTX_use_certificate_file;
-+SSL_SESSION_cmp;
-+SSL_SESSION_free;
-+SSL_SESSION_get_ex_data;
-+SSL_SESSION_get_ex_new_index;
-+SSL_SESSION_get_id;
-+SSL_SESSION_get_time;
-+SSL_SESSION_get_timeout;
-+SSL_SESSION_hash;
-+SSL_SESSION_new;
-+SSL_SESSION_print;
-+SSL_SESSION_print_fp;
-+SSL_SESSION_set_ex_data;
-+SSL_SESSION_set_time;
-+SSL_SESSION_set_timeout;
-+SSL_accept;
-+SSL_add_client_CA;
-+SSL_add_dir_cert_subjects_to_stack;
-+SSL_add_file_cert_subjects_to_stack;
-+SSL_alert_desc_string;
-+SSL_alert_desc_string_long;
-+SSL_alert_type_string;
-+SSL_alert_type_string_long;
-+SSL_callback_ctrl;
-+SSL_check_private_key;
-+SSL_clear;
-+SSL_connect;
-+SSL_copy_session_id;
-+SSL_ctrl;
-+SSL_do_handshake;
-+SSL_dup;
-+SSL_dup_CA_list;
-+SSL_free;
-+SSL_get1_session;
-+SSL_get_SSL_CTX;
-+SSL_get_certificate;
-+SSL_get_cipher_list;
-+SSL_get_ciphers;
-+SSL_get_client_CA_list;
-+SSL_get_current_cipher;
-+SSL_get_current_compression;
-+SSL_get_current_expansion;
-+SSL_get_default_timeout;
-+SSL_get_error;
-+SSL_get_ex_data;
-+SSL_get_ex_data_X509_STORE_CTX_idx;
-+SSL_get_ex_new_index;
-+SSL_get_fd;
-+SSL_get_finished;
-+SSL_get_info_callback;
-+SSL_get_peer_cert_chain;
-+SSL_get_peer_certificate;
-+SSL_get_peer_finished;
-+SSL_get_privatekey;
-+SSL_get_quiet_shutdown;
-+SSL_get_rbio;
-+SSL_get_read_ahead;
-+SSL_get_rfd;
-+SSL_get_session;
-+SSL_get_shared_ciphers;
-+SSL_get_shutdown;
-+SSL_get_ssl_method;
-+SSL_get_verify_callback;
-+SSL_get_verify_depth;
-+SSL_get_verify_mode;
-+SSL_get_verify_result;
-+SSL_get_version;
-+SSL_get_wbio;
-+SSL_get_wfd;
-+SSL_has_matching_session_id;
-+SSL_library_init;
-+SSL_load_client_CA_file;
-+SSL_load_error_strings;
-+SSL_new;
-+SSL_peek;
-+SSL_pending;
-+SSL_read;
-+SSL_renegotiate;
-+SSL_renegotiate_pending;
-+SSL_rstate_string;
-+SSL_rstate_string_long;
-+SSL_set_accept_state;
-+SSL_set_bio;
-+SSL_set_cipher_list;
-+SSL_set_client_CA_list;
-+SSL_set_connect_state;
-+SSL_set_ex_data;
-+SSL_set_fd;
-+SSL_set_generate_session_id;
-+SSL_set_info_callback;
-+SSL_set_msg_callback;
-+SSL_set_purpose;
-+SSL_set_quiet_shutdown;
-+SSL_set_read_ahead;
-+SSL_set_rfd;
-+SSL_set_session;
-+SSL_set_session_id_context;
-+SSL_set_shutdown;
-+SSL_set_ssl_method;
-+SSL_set_tmp_dh_callback;
-+SSL_set_tmp_ecdh_callback;
-+SSL_set_tmp_rsa_callback;
-+SSL_set_trust;
-+SSL_set_verify;
-+SSL_set_verify_depth;
-+SSL_set_verify_result;
-+SSL_set_wfd;
-+SSL_shutdown;
-+SSL_state;
-+SSL_state_string;
-+SSL_state_string_long;
-+SSL_use_PrivateKey;
-+SSL_use_PrivateKey_ASN1;
-+SSL_use_PrivateKey_file;
-+SSL_use_RSAPrivateKey;
-+SSL_use_RSAPrivateKey_ASN1;
-+SSL_use_RSAPrivateKey_file;
-+SSL_use_certificate;
-+SSL_use_certificate_ASN1;
-+SSL_use_certificate_file;
-+SSL_version;
-+SSL_version_str;
-+SSL_want;
-+SSL_write;
-+SSLv23_client_method;
-+SSLv23_method;
-+SSLv23_server_method;
-+SSLv2_client_method;
-+SSLv2_method;
-+SSLv2_server_method;
-+SSLv3_client_method;
-+SSLv3_enc_data;
-+SSLv3_method;
-+SSLv3_server_method;
-+TLSv1_client_method;
-+TLSv1_enc_data;
-+TLSv1_method;
-+TLSv1_server_method;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+__bss_start;
-+_edata;
-+_end;
-+_fini;
-+_init;
-+check_srvr_ecc_cert_and_alg;
-+d2i_SSL_SESSION;
-+do_dtls1_write;
-+dtls1_accept;
-+dtls1_buffer_message;
-+dtls1_clear;
-+dtls1_clear_record_buffer;
-+dtls1_client_hello;
-+dtls1_connect;
-+dtls1_default_timeout;
-+dtls1_dispatch_alert;
-+dtls1_do_write;
-+dtls1_enc;
-+dtls1_free;
-+dtls1_get_ccs_header;
-+dtls1_get_message;
-+dtls1_get_message_header;
-+dtls1_get_record;
-+dtls1_new;
-+dtls1_output_cert_chain;
-+dtls1_read_bytes;
-+dtls1_read_failed;
-+dtls1_reset_seq_numbers;
-+dtls1_retransmit_message;
-+dtls1_send_certificate_request;
-+dtls1_send_change_cipher_spec;
-+dtls1_send_client_certificate;
-+dtls1_send_client_key_exchange;
-+dtls1_send_client_verify;
-+dtls1_send_finished;
-+dtls1_send_hello_request;
-+dtls1_send_server_certificate;
-+dtls1_send_server_done;
-+dtls1_send_server_hello;
-+dtls1_send_server_key_exchange;
-+dtls1_set_message_header;
-+dtls1_version_str;
-+dtls1_write_app_data_bytes;
-+dtls1_write_bytes;
-+dtlsv1_base_method;
-+i2d_SSL_SESSION;
-+ssl23_accept;
-+ssl23_connect;
-+ssl23_default_timeout;
-+ssl23_get_cipher;
-+ssl23_get_cipher_by_char;
-+ssl23_get_client_hello;
-+ssl23_num_ciphers;
-+ssl23_peek;
-+ssl23_put_cipher_by_char;
-+ssl23_read;
-+ssl23_read_bytes;
-+ssl23_write;
-+ssl23_write_bytes;
-+ssl2_accept;
-+ssl2_callback_ctrl;
-+ssl2_ciphers;
-+ssl2_clear;
-+ssl2_connect;
-+ssl2_ctrl;
-+ssl2_ctx_callback_ctrl;
-+ssl2_ctx_ctrl;
-+ssl2_default_timeout;
-+ssl2_do_write;
-+ssl2_enc;
-+ssl2_enc_init;
-+ssl2_free;
-+ssl2_generate_key_material;
-+ssl2_get_cipher;
-+ssl2_get_cipher_by_char;
-+ssl2_mac;
-+ssl2_new;
-+ssl2_num_ciphers;
-+ssl2_part_read;
-+ssl2_peek;
-+ssl2_pending;
-+ssl2_put_cipher_by_char;
-+ssl2_read;
-+ssl2_return_error;
-+ssl2_set_certificate;
-+ssl2_shutdown;
-+ssl2_version_str;
-+ssl2_write;
-+ssl2_write_error;
-+ssl3_accept;
-+ssl3_alert_code;
-+ssl3_callback_ctrl;
-+ssl3_cert_verify_mac;
-+ssl3_change_cipher_state;
-+ssl3_check_cert_and_algorithm;
-+ssl3_check_client_hello;
-+ssl3_choose_cipher;
-+ssl3_ciphers;
-+ssl3_cleanup_key_block;
-+ssl3_clear;
-+ssl3_client_hello;
-+ssl3_comp_find;
-+ssl3_connect;
-+ssl3_ctrl;
-+ssl3_ctx_callback_ctrl;
-+ssl3_ctx_ctrl;
-+ssl3_default_timeout;
-+ssl3_dispatch_alert;
-+ssl3_do_change_cipher_spec;
-+ssl3_do_compress;
-+ssl3_do_uncompress;
-+ssl3_do_write;
-+ssl3_enc;
-+ssl3_final_finish_mac;
-+ssl3_finish_mac;
-+ssl3_free;
-+ssl3_generate_master_secret;
-+ssl3_get_cert_verify;
-+ssl3_get_certificate_request;
-+ssl3_get_cipher;
-+ssl3_get_cipher_by_char;
-+ssl3_get_client_certificate;
-+ssl3_get_client_hello;
-+ssl3_get_client_key_exchange;
-+ssl3_get_finished;
-+ssl3_get_key_exchange;
-+ssl3_get_message;
-+ssl3_get_req_cert_type;
-+ssl3_get_server_certificate;
-+ssl3_get_server_done;
-+ssl3_get_server_hello;
-+ssl3_init_finished_mac;
-+ssl3_mac;
-+ssl3_new;
-+ssl3_num_ciphers;
-+ssl3_output_cert_chain;
-+ssl3_peek;
-+ssl3_pending;
-+ssl3_put_cipher_by_char;
-+ssl3_read;
-+ssl3_read_bytes;
-+ssl3_read_n;
-+ssl3_record_sequence_update;
-+ssl3_renegotiate;
-+ssl3_renegotiate_check;
-+ssl3_send_alert;
-+ssl3_send_certificate_request;
-+ssl3_send_change_cipher_spec;
-+ssl3_send_client_certificate;
-+ssl3_send_client_key_exchange;
-+ssl3_send_client_verify;
-+ssl3_send_finished;
-+ssl3_send_hello_request;
-+ssl3_send_server_certificate;
-+ssl3_send_server_done;
-+ssl3_send_server_hello;
-+ssl3_send_server_key_exchange;
-+ssl3_setup_buffers;
-+ssl3_setup_key_block;
-+ssl3_shutdown;
-+ssl3_undef_enc_method;
-+ssl3_version_str;
-+ssl3_write;
-+ssl3_write_bytes;
-+ssl3_write_pending;
-+ssl_bad_method;
-+ssl_bytes_to_cipher_list;
-+ssl_cert_dup;
-+ssl_cert_free;
-+ssl_cert_inst;
-+ssl_cert_new;
-+ssl_cert_type;
-+ssl_cipher_get_disabled;
-+ssl_cipher_get_evp;
-+ssl_cipher_id_cmp;
-+ssl_cipher_list_to_bytes;
-+ssl_cipher_ptr_id_cmp;
-+ssl_clear_bad_session;
-+ssl_clear_cipher_ctx;
-+ssl_create_cipher_list;
-+ssl_free_wbio_buffer;
-+ssl_get_ciphers_by_id;
-+ssl_get_new_session;
-+ssl_get_prev_session;
-+ssl_get_server_send_cert;
-+ssl_get_sign_pkey;
-+ssl_init_wbio_buffer;
-+ssl_load_ciphers;
-+ssl_ok;
-+ssl_sess_cert_free;
-+ssl_sess_cert_new;
-+ssl_set_cert_masks;
-+ssl_set_peer_cert_type;
-+ssl_undefined_const_function;
-+ssl_undefined_function;
-+ssl_undefined_void_function;
-+ssl_update_cache;
-+ssl_verify_alarm_type;
-+ssl_verify_cert_chain;
-+sslv23_base_method;
-+sslv2_base_method;
-+sslv3_base_method;
-+tls1_alert_code;
-+tls1_cert_verify_mac;
-+tls1_change_cipher_state;
-+tls1_clear;
-+tls1_default_timeout;
-+tls1_enc;
-+tls1_final_finish_mac;
-+tls1_free;
-+tls1_generate_master_secret;
-+tls1_mac;
-+tls1_new;
-+tls1_setup_key_block;
-+tls1_version_str;
-+tlsv1_base_method;
-+	local:
-+		*;
-+};
-+
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
deleted file mode 100755
index 0ea8287..0000000
--- a/openssl/opensslmingw.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- misc/openssl-0.9.8o/Makefile.shared	2008-09-17 17:56:40.000000000 +0200
-+++ misc/build/openssl-0.9.8o/Makefile.shared	2009-03-30 11:52:53.684538000 +0200
-@@ -254,13 +254,17 @@
- 	base=-Wl,--enable-auto-image-base; \
- 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
- 		SHLIB=$(LIBNAME)eay32; \
--		base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
-+		base=;  \
-+                if test $(LIBNAME) = "crypto"; then \
-+                        SHLIB=libeay32; \
-+                        base=-Wl,--image-base,0x63000000; \
-+                fi; \
- 	fi; \
- 	SHLIB_SUFFIX=.dll; \
--	SHLIB_SOVER=-$(LIBVERSION); \
-+	SHLIB_SOVER=; \
- 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
-+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
- 	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
- 	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
- 	$(LINK_SO_A) || exit 1; \
---- misc/openssl-0.9.8o/e_os2.h	2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8o/e_os2.h	2009-04-04 23:07:15.324250000 +0900
-@@ -264,7 +264,7 @@
- # define OPENSSL_IMPLEMENT_GLOBAL(type,name)			     \
- 	extern type _hide_##name;				     \
- 	type *_shadow_##name(void) { return &_hide_##name; }	     \
--	static type _hide_##name
-+	type _hide_##name
- # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
- # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
- #else
---- misc/openssl-0.9.8o/ms/mingw32.bat	2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8o/ms/mingw32.bat	2009-03-30 11:54:10.000000000 +0200
-@@ -79,15 +79,41 @@
- rem copy ms\tlhelp32.h outinc
- 
- echo Building the libraries
--mingw32-make -f ms/mingw32a.mak
-+make -f ms/mingw32a.mak
- if errorlevel 1 goto end
- 
- echo Generating the DLLs and input libraries
--dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lwsock32 -lgdi32
-+mv out/libcrypto.a out/libcrypto_static.a
-+mv out/libssl.a out/libssl_static.a
-+dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def
- if errorlevel 1 goto end
--dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
-+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
- if errorlevel 1 goto end
-+dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def
-+if errorlevel 1 goto end
-+if "%MINGW_SHARED_GXXLIB%"=="YES" goto shared_gxxlib
-+if "%MINGW_SHARED_GCCLIB%"=="YES" goto shared_gcclib
-+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 
-+if errorlevel 1 goto end
-+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto 
-+if errorlevel 1 goto end
-+goto finished
-+
-+:shared_gcclib
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 
-+if errorlevel 1 goto end
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto 
-+if errorlevel 1 goto end
-+goto finished
-+
-+:shared_gxxlib
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP%
-+if errorlevel 1 goto end
-+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP%
-+if errorlevel 1 goto end
-+goto finished
- 
-+:finished
- echo Done compiling OpenSSL
- 
- :end
---- misc/openssl-0.9.8o/util/pl/Mingw32.pl	2006-05-05 15:19:34.000000000 +0200
-+++ misc/build/openssl-0.9.8o/util/pl/Mingw32.pl	2009-03-30 11:55:04.000000000 +0200
-@@ -6,11 +6,11 @@
- $o='/';
- $cp='cp';
- $rm='rm -f';
--$mkdir='gmkdir';
-+#$mkdir='gmkdir';
- 
--$o='\\';
--$cp='copy';
--$rm='del';
-+#$o='\\';
-+#$cp='copy';
-+#$rm='del';
- $mkdir='mkdir';
- 
- # C compiler stuff
-@@ -87,7 +87,8 @@
- 	($Name=$name) =~ tr/a-z/A-Z/;
- 
- 	$ret.="$target: \$(${Name}OBJ)\n";
--	$ret.="\tif exist $target \$(RM) $target\n";
-+    $ret.="\t\$(RM) $target\n";
-+#	$ret.="\tif exist $target \$(RM) $target\n";
- 	$ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
- 	$ret.="\t\$(RANLIB) $target\n\n";
- 	}
diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch
deleted file mode 100644
index cd2d93a..0000000
--- a/openssl/opensslsol.patch
+++ /dev/null
@@ -1,3831 +0,0 @@
---- misc/openssl-0.9.8o/Configure	Mon Nov  9 15:14:26 2009
-+++ misc/build/openssl-0.9.8o/Configure	Fri Mar 26 16:01:32 2010
-@@ -212,8 +212,8 @@
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-  
- #### Solaris x86 with Sun C setups
--"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris-x86-cc","cc:-O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris64-x86_64-cc","cc:-xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- #### SPARC Solaris with GNU C setups
- "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
---- misc/openssl-0.9.8o/Makefile.shared	Wed Sep 17 17:56:40 2008
-+++ misc/build/openssl-0.9.8o/Makefile.shared	Fri Mar 26 16:04:41 2010
-@@ -93,7 +93,7 @@
-     LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
--    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-+    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
-     $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
- 
- LINK_SO=	\
-@@ -103,7 +103,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
--    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-+    LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
- 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
- 	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
---- misc/openssl-0.9.8o/config	Tue Mar  9 18:08:24 2010
-+++ misc/build/openssl-0.9.8o/config	Fri Mar 26 16:07:55 2010
-@@ -399,28 +399,25 @@
- # this is where the translation occurs into SSLeay terms
- # ---------------------------------------------------------------------------
- 
--GCCVER=`(gcc -dumpversion) 2>/dev/null`
--if [ "$GCCVER" != "" ]; then
--  # then strip off whatever prefix egcs prepends the number with...
--  # Hopefully, this will work for any future prefixes as well.
--  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
--  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
--  # does give us what we want though, so we use that.  We just just the
--  # major and minor version numbers.
--  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
--  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-+if [ -z "$CC" ];then
-+  GCCVER=`(gcc -dumpversion) 2>/dev/null`
-+ if [ "$GCCVER" != "" ]; then
-+   CC=gcc
-+    # then strip off whatever prefix egcs prepends the number with...
-+    # Hopefully, this will work for any future prefixes as well.
-+    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
-+    # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-+    # does give us what we want though, so we use that.  We just just the
-+    # major and minor version numbers.
-+    # peak single digit before and after first dot, e.g. 2.95.1 gives 29
-+    GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-+ else
-+   CC=cc
-+ fi
-+else
-+    CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'`
- fi
- 
--# Only set CC if not supplied already
--if [ -z "$CC" ]; then
--# figure out if gcc is available and if so we use it otherwise
--# we fallback to whatever cc does on the system
--  if [ "$GCCVER" != "" ]; then
--    CC=gcc
--  else
--    CC=cc
--  fi
--fi
- GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
-   # By default gcc is a ILP32 compiler (with long long == 64).
---- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	Fri Mar 26 16:13:54 2010
-+++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map	Fri Mar 26 16:10:09 2010
-@@ -1,1 +1,3296 @@
--dummy
-+LIBCRYPTO_OOO_0_9_8o {
-+	global:
-+ACCESS_DESCRIPTION_free;
-+ACCESS_DESCRIPTION_it;
-+ACCESS_DESCRIPTION_new;
-+AES_bi_ige_encrypt;
-+AES_cbc_encrypt;
-+AES_cfb128_encrypt;
-+AES_cfb1_encrypt;
-+AES_cfb8_encrypt;
-+AES_cfbr_encrypt_block;
-+AES_ctr128_encrypt;
-+AES_decrypt;
-+AES_ecb_encrypt;
-+AES_encrypt;
-+AES_ige_encrypt;
-+AES_ofb128_encrypt;
-+AES_options;
-+AES_set_decrypt_key;
-+AES_set_encrypt_key;
-+AES_version;
-+ASN1_ANY_it;
-+ASN1_BIT_STRING_asn1_meth;
-+ASN1_BIT_STRING_free;
-+ASN1_BIT_STRING_get_bit;
-+ASN1_BIT_STRING_it;
-+ASN1_BIT_STRING_name_print;
-+ASN1_BIT_STRING_new;
-+ASN1_BIT_STRING_num_asc;
-+ASN1_BIT_STRING_set;
-+ASN1_BIT_STRING_set_asc;
-+ASN1_BIT_STRING_set_bit;
-+ASN1_BMPSTRING_free;
-+ASN1_BMPSTRING_it;
-+ASN1_BMPSTRING_new;
-+ASN1_BOOLEAN_it;
-+ASN1_ENUMERATED_free;
-+ASN1_ENUMERATED_get;
-+ASN1_ENUMERATED_it;
-+ASN1_ENUMERATED_new;
-+ASN1_ENUMERATED_set;
-+ASN1_ENUMERATED_to_BN;
-+ASN1_FBOOLEAN_it;
-+ASN1_GENERALIZEDTIME_check;
-+ASN1_GENERALIZEDTIME_free;
-+ASN1_GENERALIZEDTIME_it;
-+ASN1_GENERALIZEDTIME_new;
-+ASN1_GENERALIZEDTIME_print;
-+ASN1_GENERALIZEDTIME_set;
-+ASN1_GENERALIZEDTIME_set_string;
-+ASN1_GENERALSTRING_free;
-+ASN1_GENERALSTRING_it;
-+ASN1_GENERALSTRING_new;
-+ASN1_HEADER_free;
-+ASN1_HEADER_new;
-+ASN1_IA5STRING_asn1_meth;
-+ASN1_IA5STRING_free;
-+ASN1_IA5STRING_it;
-+ASN1_IA5STRING_new;
-+ASN1_INTEGER_cmp;
-+ASN1_INTEGER_dup;
-+ASN1_INTEGER_free;
-+ASN1_INTEGER_get;
-+ASN1_INTEGER_it;
-+ASN1_INTEGER_new;
-+ASN1_INTEGER_set;
-+ASN1_INTEGER_to_BN;
-+ASN1_NULL_free;
-+ASN1_NULL_it;
-+ASN1_NULL_new;
-+ASN1_OBJECT_create;
-+ASN1_OBJECT_free;
-+ASN1_OBJECT_it;
-+ASN1_OBJECT_new;
-+ASN1_OCTET_STRING_NDEF_it;
-+ASN1_OCTET_STRING_cmp;
-+ASN1_OCTET_STRING_dup;
-+ASN1_OCTET_STRING_free;
-+ASN1_OCTET_STRING_it;
-+ASN1_OCTET_STRING_new;
-+ASN1_OCTET_STRING_set;
-+ASN1_PRINTABLESTRING_free;
-+ASN1_PRINTABLESTRING_it;
-+ASN1_PRINTABLESTRING_new;
-+ASN1_PRINTABLE_free;
-+ASN1_PRINTABLE_it;
-+ASN1_PRINTABLE_new;
-+ASN1_PRINTABLE_type;
-+ASN1_SEQUENCE_it;
-+ASN1_STRING_TABLE_add;
-+ASN1_STRING_TABLE_cleanup;
-+ASN1_STRING_TABLE_get;
-+ASN1_STRING_cmp;
-+ASN1_STRING_data;
-+ASN1_STRING_dup;
-+ASN1_STRING_encode;
-+ASN1_STRING_free;
-+ASN1_STRING_get_default_mask;
-+ASN1_STRING_length;
-+ASN1_STRING_length_set;
-+ASN1_STRING_new;
-+ASN1_STRING_print;
-+ASN1_STRING_print_ex;
-+ASN1_STRING_print_ex_fp;
-+ASN1_STRING_set;
-+ASN1_STRING_set_by_NID;
-+ASN1_STRING_set_default_mask;
-+ASN1_STRING_set_default_mask_asc;
-+ASN1_STRING_to_UTF8;
-+ASN1_STRING_type;
-+ASN1_STRING_type_new;
-+ASN1_T61STRING_free;
-+ASN1_T61STRING_it;
-+ASN1_T61STRING_new;
-+ASN1_TBOOLEAN_it;
-+ASN1_TIME_check;
-+ASN1_TIME_free;
-+ASN1_TIME_it;
-+ASN1_TIME_new;
-+ASN1_TIME_print;
-+ASN1_TIME_set;
-+ASN1_TIME_to_generalizedtime;
-+ASN1_TYPE_free;
-+ASN1_TYPE_get;
-+ASN1_TYPE_get_int_octetstring;
-+ASN1_TYPE_get_octetstring;
-+ASN1_TYPE_new;
-+ASN1_TYPE_set;
-+ASN1_TYPE_set_int_octetstring;
-+ASN1_TYPE_set_octetstring;
-+ASN1_UNIVERSALSTRING_free;
-+ASN1_UNIVERSALSTRING_it;
-+ASN1_UNIVERSALSTRING_new;
-+ASN1_UNIVERSALSTRING_to_string;
-+ASN1_UTCTIME_check;
-+ASN1_UTCTIME_cmp_time_t;
-+ASN1_UTCTIME_free;
-+ASN1_UTCTIME_it;
-+ASN1_UTCTIME_new;
-+ASN1_UTCTIME_print;
-+ASN1_UTCTIME_set;
-+ASN1_UTCTIME_set_string;
-+ASN1_UTF8STRING_free;
-+ASN1_UTF8STRING_it;
-+ASN1_UTF8STRING_new;
-+ASN1_VISIBLESTRING_free;
-+ASN1_VISIBLESTRING_it;
-+ASN1_VISIBLESTRING_new;
-+ASN1_add_oid_module;
-+ASN1_check_infinite_end;
-+ASN1_const_check_infinite_end;
-+ASN1_d2i_bio;
-+ASN1_d2i_fp;
-+ASN1_digest;
-+ASN1_dup;
-+ASN1_generate_nconf;
-+ASN1_generate_v3;
-+ASN1_get_object;
-+ASN1_i2d_bio;
-+ASN1_i2d_fp;
-+ASN1_item_d2i;
-+ASN1_item_d2i_bio;
-+ASN1_item_d2i_fp;
-+ASN1_item_digest;
-+ASN1_item_dup;
-+ASN1_item_ex_d2i;
-+ASN1_item_ex_free;
-+ASN1_item_ex_i2d;
-+ASN1_item_ex_new;
-+ASN1_item_free;
-+ASN1_item_i2d;
-+ASN1_item_i2d_bio;
-+ASN1_item_i2d_fp;
-+ASN1_item_ndef_i2d;
-+ASN1_item_new;
-+ASN1_item_pack;
-+ASN1_item_sign;
-+ASN1_item_unpack;
-+ASN1_item_verify;
-+ASN1_mbstring_copy;
-+ASN1_mbstring_ncopy;
-+ASN1_object_size;
-+ASN1_pack_string;
-+ASN1_parse;
-+ASN1_parse_dump;
-+ASN1_primitive_free;
-+ASN1_primitive_new;
-+ASN1_put_eoc;
-+ASN1_put_object;
-+ASN1_seq_pack;
-+ASN1_seq_unpack;
-+ASN1_sign;
-+ASN1_tag2bit;
-+ASN1_tag2str;
-+ASN1_template_d2i;
-+ASN1_template_free;
-+ASN1_template_i2d;
-+ASN1_template_new;
-+ASN1_unpack_string;
-+ASN1_verify;
-+ASN1_version;
-+AUTHORITY_INFO_ACCESS_free;
-+AUTHORITY_INFO_ACCESS_it;
-+AUTHORITY_INFO_ACCESS_new;
-+AUTHORITY_KEYID_free;
-+AUTHORITY_KEYID_it;
-+AUTHORITY_KEYID_new;
-+BASIC_CONSTRAINTS_free;
-+BASIC_CONSTRAINTS_it;
-+BASIC_CONSTRAINTS_new;
-+BF_cbc_encrypt;
-+BF_cfb64_encrypt;
-+BF_decrypt;
-+BF_ecb_encrypt;
-+BF_encrypt;
-+BF_ofb64_encrypt;
-+BF_options;
-+BF_set_key;
-+BF_version;
-+BIGNUM_it;
-+BIO_ACCEPT_free;
-+BIO_ACCEPT_new;
-+BIO_CONNECT_free;
-+BIO_CONNECT_new;
-+BIO_accept;
-+BIO_callback_ctrl;
-+BIO_clear_flags;
-+BIO_copy_next_retry;
-+BIO_ctrl;
-+BIO_ctrl_get_read_request;
-+BIO_ctrl_get_write_guarantee;
-+BIO_ctrl_pending;
-+BIO_ctrl_reset_read_request;
-+BIO_ctrl_wpending;
-+BIO_debug_callback;
-+BIO_dgram_non_fatal_error;
-+BIO_dgram_should_retry;
-+BIO_dump;
-+BIO_dump_cb;
-+BIO_dump_fp;
-+BIO_dump_indent;
-+BIO_dump_indent_cb;
-+BIO_dump_indent_fp;
-+BIO_dup_chain;
-+BIO_f_base64;
-+BIO_f_buffer;
-+BIO_f_cipher;
-+BIO_f_md;
-+BIO_f_nbio_test;
-+BIO_f_null;
-+BIO_f_reliable;
-+BIO_fd_non_fatal_error;
-+BIO_fd_should_retry;
-+BIO_find_type;
-+BIO_free;
-+BIO_free_all;
-+BIO_get_accept_socket;
-+BIO_get_callback;
-+BIO_get_callback_arg;
-+BIO_get_ex_data;
-+BIO_get_ex_new_index;
-+BIO_get_host_ip;
-+BIO_get_port;
-+BIO_get_retry_BIO;
-+BIO_get_retry_reason;
-+BIO_gethostbyname;
-+BIO_gets;
-+BIO_indent;
-+BIO_int_ctrl;
-+BIO_method_name;
-+BIO_method_type;
-+BIO_new;
-+BIO_new_accept;
-+BIO_new_bio_pair;
-+BIO_new_connect;
-+BIO_new_dgram;
-+BIO_new_fd;
-+BIO_new_file;
-+BIO_new_fp;
-+BIO_new_mem_buf;
-+BIO_new_socket;
-+BIO_next;
-+BIO_nread;
-+BIO_nread0;
-+BIO_number_read;
-+BIO_number_written;
-+BIO_nwrite;
-+BIO_nwrite0;
-+BIO_pop;
-+BIO_printf;
-+BIO_ptr_ctrl;
-+BIO_push;
-+BIO_puts;
-+BIO_read;
-+BIO_s_accept;
-+BIO_s_bio;
-+BIO_s_connect;
-+BIO_s_datagram;
-+BIO_s_fd;
-+BIO_s_file;
-+BIO_s_log;
-+BIO_s_mem;
-+BIO_s_null;
-+BIO_s_socket;
-+BIO_set;
-+BIO_set_callback;
-+BIO_set_callback_arg;
-+BIO_set_cipher;
-+BIO_set_ex_data;
-+BIO_set_flags;
-+BIO_set_tcp_ndelay;
-+BIO_snprintf;
-+BIO_sock_cleanup;
-+BIO_sock_error;
-+BIO_sock_init;
-+BIO_sock_non_fatal_error;
-+BIO_sock_should_retry;
-+BIO_socket_ioctl;
-+BIO_socket_nbio;
-+BIO_test_flags;
-+BIO_vfree;
-+BIO_vprintf;
-+BIO_vsnprintf;
-+BIO_write;
-+BN_BLINDING_convert;
-+BN_BLINDING_convert_ex;
-+BN_BLINDING_create_param;
-+BN_BLINDING_free;
-+BN_BLINDING_get_flags;
-+BN_BLINDING_get_thread_id;
-+BN_BLINDING_invert;
-+BN_BLINDING_invert_ex;
-+BN_BLINDING_new;
-+BN_BLINDING_set_flags;
-+BN_BLINDING_set_thread_id;
-+BN_BLINDING_update;
-+BN_CTX_end;
-+BN_CTX_free;
-+BN_CTX_get;
-+BN_CTX_init;
-+BN_CTX_new;
-+BN_CTX_start;
-+BN_GENCB_call;
-+BN_GF2m_add;
-+BN_GF2m_arr2poly;
-+BN_GF2m_mod;
-+BN_GF2m_mod_arr;
-+BN_GF2m_mod_div;
-+BN_GF2m_mod_div_arr;
-+BN_GF2m_mod_exp;
-+BN_GF2m_mod_exp_arr;
-+BN_GF2m_mod_inv;
-+BN_GF2m_mod_inv_arr;
-+BN_GF2m_mod_mul;
-+BN_GF2m_mod_mul_arr;
-+BN_GF2m_mod_solve_quad;
-+BN_GF2m_mod_solve_quad_arr;
-+BN_GF2m_mod_sqr;
-+BN_GF2m_mod_sqr_arr;
-+BN_GF2m_mod_sqrt;
-+BN_GF2m_mod_sqrt_arr;
-+BN_GF2m_poly2arr;
-+BN_MONT_CTX_copy;
-+BN_MONT_CTX_free;
-+BN_MONT_CTX_init;
-+BN_MONT_CTX_new;
-+BN_MONT_CTX_set;
-+BN_MONT_CTX_set_locked;
-+BN_RECP_CTX_free;
-+BN_RECP_CTX_init;
-+BN_RECP_CTX_new;
-+BN_RECP_CTX_set;
-+BN_add;
-+BN_add_word;
-+BN_bin2bn;
-+BN_bn2bin;
-+BN_bn2dec;
-+BN_bn2hex;
-+BN_bn2mpi;
-+BN_bntest_rand;
-+BN_clear;
-+BN_clear_bit;
-+BN_clear_free;
-+BN_cmp;
-+BN_copy;
-+BN_dec2bn;
-+BN_div;
-+BN_div_recp;
-+BN_div_word;
-+BN_dup;
-+BN_exp;
-+BN_free;
-+BN_from_montgomery;
-+BN_gcd;
-+BN_generate_prime;
-+BN_generate_prime_ex;
-+BN_get0_nist_prime_192;
-+BN_get0_nist_prime_224;
-+BN_get0_nist_prime_256;
-+BN_get0_nist_prime_384;
-+BN_get0_nist_prime_521;
-+BN_get_params;
-+BN_get_word;
-+BN_hex2bn;
-+BN_init;
-+BN_is_bit_set;
-+BN_is_prime;
-+BN_is_prime_ex;
-+BN_is_prime_fasttest;
-+BN_is_prime_fasttest_ex;
-+BN_kronecker;
-+BN_lshift;
-+BN_lshift1;
-+BN_mask_bits;
-+BN_mod_add;
-+BN_mod_add_quick;
-+BN_mod_exp;
-+BN_mod_exp2_mont;
-+BN_mod_exp_mont;
-+BN_mod_exp_mont_consttime;
-+BN_mod_exp_mont_word;
-+BN_mod_exp_recp;
-+BN_mod_exp_simple;
-+BN_mod_inverse;
-+BN_mod_lshift;
-+BN_mod_lshift1;
-+BN_mod_lshift1_quick;
-+BN_mod_lshift_quick;
-+BN_mod_mul;
-+BN_mod_mul_montgomery;
-+BN_mod_mul_reciprocal;
-+BN_mod_sqr;
-+BN_mod_sqrt;
-+BN_mod_sub;
-+BN_mod_sub_quick;
-+BN_mod_word;
-+BN_mpi2bn;
-+BN_mul;
-+BN_mul_word;
-+BN_new;
-+BN_nist_mod_192;
-+BN_nist_mod_224;
-+BN_nist_mod_256;
-+BN_nist_mod_384;
-+BN_nist_mod_521;
-+BN_nnmod;
-+BN_num_bits;
-+BN_num_bits_word;
-+BN_options;
-+BN_print;
-+BN_print_fp;
-+BN_pseudo_rand;
-+BN_pseudo_rand_range;
-+BN_rand;
-+BN_rand_range;
-+BN_reciprocal;
-+BN_rshift;
-+BN_rshift1;
-+BN_set_bit;
-+BN_set_negative;
-+BN_set_params;
-+BN_set_word;
-+BN_sqr;
-+BN_sub;
-+BN_sub_word;
-+BN_swap;
-+BN_to_ASN1_ENUMERATED;
-+BN_to_ASN1_INTEGER;
-+BN_uadd;
-+BN_ucmp;
-+BN_usub;
-+BN_value_one;
-+BN_version;
-+BUF_MEM_free;
-+BUF_MEM_grow;
-+BUF_MEM_grow_clean;
-+BUF_MEM_new;
-+BUF_memdup;
-+BUF_strdup;
-+BUF_strlcat;
-+BUF_strlcpy;
-+BUF_strndup;
-+CAST_S_table0;
-+CAST_S_table1;
-+CAST_S_table2;
-+CAST_S_table3;
-+CAST_S_table4;
-+CAST_S_table5;
-+CAST_S_table6;
-+CAST_S_table7;
-+CAST_cbc_encrypt;
-+CAST_cfb64_encrypt;
-+CAST_decrypt;
-+CAST_ecb_encrypt;
-+CAST_encrypt;
-+CAST_ofb64_encrypt;
-+CAST_set_key;
-+CAST_version;
-+CBIGNUM_it;
-+CERTIFICATEPOLICIES_free;
-+CERTIFICATEPOLICIES_it;
-+CERTIFICATEPOLICIES_new;
-+COMP_CTX_free;
-+COMP_CTX_new;
-+COMP_compress_block;
-+COMP_expand_block;
-+COMP_rle;
-+COMP_zlib;
-+CONF_def_version;
-+CONF_dump_bio;
-+CONF_dump_fp;
-+CONF_free;
-+CONF_get1_default_config_file;
-+CONF_get_number;
-+CONF_get_section;
-+CONF_get_string;
-+CONF_imodule_get_flags;
-+CONF_imodule_get_module;
-+CONF_imodule_get_name;
-+CONF_imodule_get_usr_data;
-+CONF_imodule_get_value;
-+CONF_imodule_set_flags;
-+CONF_imodule_set_usr_data;
-+CONF_load;
-+CONF_load_bio;
-+CONF_load_fp;
-+CONF_module_add;
-+CONF_module_get_usr_data;
-+CONF_module_set_usr_data;
-+CONF_modules_finish;
-+CONF_modules_free;
-+CONF_modules_load;
-+CONF_modules_load_file;
-+CONF_modules_unload;
-+CONF_parse_list;
-+CONF_set_default_method;
-+CONF_set_nconf;
-+CONF_version;
-+CRL_DIST_POINTS_free;
-+CRL_DIST_POINTS_it;
-+CRL_DIST_POINTS_new;
-+CRYPTO_add_lock;
-+CRYPTO_cleanup_all_ex_data;
-+CRYPTO_dbg_free;
-+CRYPTO_dbg_get_options;
-+CRYPTO_dbg_malloc;
-+CRYPTO_dbg_realloc;
-+CRYPTO_dbg_set_options;
-+CRYPTO_destroy_dynlockid;
-+CRYPTO_dup_ex_data;
-+CRYPTO_ex_data_new_class;
-+CRYPTO_free;
-+CRYPTO_free_ex_data;
-+CRYPTO_free_locked;
-+CRYPTO_get_add_lock_callback;
-+CRYPTO_get_dynlock_create_callback;
-+CRYPTO_get_dynlock_destroy_callback;
-+CRYPTO_get_dynlock_lock_callback;
-+CRYPTO_get_dynlock_value;
-+CRYPTO_get_ex_data;
-+CRYPTO_get_ex_data_implementation;
-+CRYPTO_get_ex_new_index;
-+CRYPTO_get_id_callback;
-+CRYPTO_get_lock_name;
-+CRYPTO_get_locked_mem_ex_functions;
-+CRYPTO_get_locked_mem_functions;
-+CRYPTO_get_locking_callback;
-+CRYPTO_get_mem_debug_functions;
-+CRYPTO_get_mem_debug_options;
-+CRYPTO_get_mem_ex_functions;
-+CRYPTO_get_mem_functions;
-+CRYPTO_get_new_dynlockid;
-+CRYPTO_get_new_lockid;
-+CRYPTO_is_mem_check_on;
-+CRYPTO_lock;
-+CRYPTO_malloc;
-+CRYPTO_malloc_locked;
-+CRYPTO_mem_ctrl;
-+CRYPTO_mem_leaks;
-+CRYPTO_mem_leaks_cb;
-+CRYPTO_mem_leaks_fp;
-+CRYPTO_new_ex_data;
-+CRYPTO_num_locks;
-+CRYPTO_pop_info;
-+CRYPTO_push_info_;
-+CRYPTO_realloc;
-+CRYPTO_realloc_clean;
-+CRYPTO_remalloc;
-+CRYPTO_remove_all_info;
-+CRYPTO_set_add_lock_callback;
-+CRYPTO_set_dynlock_create_callback;
-+CRYPTO_set_dynlock_destroy_callback;
-+CRYPTO_set_dynlock_lock_callback;
-+CRYPTO_set_ex_data;
-+CRYPTO_set_ex_data_implementation;
-+CRYPTO_set_id_callback;
-+CRYPTO_set_locked_mem_ex_functions;
-+CRYPTO_set_locked_mem_functions;
-+CRYPTO_set_locking_callback;
-+CRYPTO_set_mem_debug_functions;
-+CRYPTO_set_mem_debug_options;
-+CRYPTO_set_mem_ex_functions;
-+CRYPTO_set_mem_functions;
-+CRYPTO_thread_id;
-+DES_SPtrans;
-+DES_cbc_cksum;
-+DES_cbc_encrypt;
-+DES_cfb64_encrypt;
-+DES_cfb_encrypt;
-+DES_check_key_parity;
-+DES_crypt;
-+DES_decrypt3;
-+DES_ecb3_encrypt;
-+DES_ecb_encrypt;
-+DES_ede3_cbc_encrypt;
-+DES_ede3_cbcm_encrypt;
-+DES_ede3_cfb64_encrypt;
-+DES_ede3_cfb_encrypt;
-+DES_ede3_ofb64_encrypt;
-+DES_enc_read;
-+DES_enc_write;
-+DES_encrypt1;
-+DES_encrypt2;
-+DES_encrypt3;
-+DES_fcrypt;
-+DES_is_weak_key;
-+DES_key_sched;
-+DES_ncbc_encrypt;
-+DES_ofb64_encrypt;
-+DES_ofb_encrypt;
-+DES_options;
-+DES_pcbc_encrypt;
-+DES_quad_cksum;
-+DES_random_key;
-+DES_read_2passwords;
-+DES_read_password;
-+DES_set_key;
-+DES_set_key_checked;
-+DES_set_key_unchecked;
-+DES_set_odd_parity;
-+DES_string_to_2keys;
-+DES_string_to_key;
-+DES_xcbc_encrypt;
-+DES_xwhite_in2out;
-+DH_OpenSSL;
-+DH_check;
-+DH_check_pub_key;
-+DH_compute_key;
-+DH_free;
-+DH_generate_key;
-+DH_generate_parameters;
-+DH_generate_parameters_ex;
-+DH_get_default_method;
-+DH_get_ex_data;
-+DH_get_ex_new_index;
-+DH_new;
-+DH_new_method;
-+DH_set_default_method;
-+DH_set_ex_data;
-+DH_set_method;
-+DH_size;
-+DH_up_ref;
-+DH_version;
-+DHparams_it;
-+DHparams_print;
-+DHparams_print_fp;
-+DIRECTORYSTRING_free;
-+DIRECTORYSTRING_it;
-+DIRECTORYSTRING_new;
-+DISPLAYTEXT_free;
-+DISPLAYTEXT_it;
-+DISPLAYTEXT_new;
-+DIST_POINT_NAME_free;
-+DIST_POINT_NAME_it;
-+DIST_POINT_NAME_new;
-+DIST_POINT_free;
-+DIST_POINT_it;
-+DIST_POINT_new;
-+DSAPrivateKey_it;
-+DSAPublicKey_it;
-+DSA_OpenSSL;
-+DSA_SIG_free;
-+DSA_SIG_it;
-+DSA_SIG_new;
-+DSA_do_sign;
-+DSA_do_verify;
-+DSA_dup_DH;
-+DSA_free;
-+DSA_generate_key;
-+DSA_generate_parameters;
-+DSA_generate_parameters_ex;
-+DSA_get_default_method;
-+DSA_get_ex_data;
-+DSA_get_ex_new_index;
-+DSA_new;
-+DSA_new_method;
-+DSA_print;
-+DSA_print_fp;
-+DSA_set_default_method;
-+DSA_set_ex_data;
-+DSA_set_method;
-+DSA_sign;
-+DSA_sign_setup;
-+DSA_size;
-+DSA_up_ref;
-+DSA_verify;
-+DSA_version;
-+DSAparams_it;
-+DSAparams_print;
-+DSAparams_print_fp;
-+DSO_METHOD_dl;
-+DSO_METHOD_dlfcn;
-+DSO_METHOD_null;
-+DSO_METHOD_openssl;
-+DSO_METHOD_vms;
-+DSO_METHOD_win32;
-+DSO_bind_func;
-+DSO_bind_var;
-+DSO_convert_filename;
-+DSO_ctrl;
-+DSO_flags;
-+DSO_free;
-+DSO_get_default_method;
-+DSO_get_filename;
-+DSO_get_loaded_filename;
-+DSO_get_method;
-+DSO_load;
-+DSO_merge;
-+DSO_new;
-+DSO_new_method;
-+DSO_set_default_method;
-+DSO_set_filename;
-+DSO_set_method;
-+DSO_set_name_converter;
-+DSO_up_ref;
-+ECDH_OpenSSL;
-+ECDH_compute_key;
-+ECDH_get_default_method;
-+ECDH_get_ex_data;
-+ECDH_get_ex_new_index;
-+ECDH_set_default_method;
-+ECDH_set_ex_data;
-+ECDH_set_method;
-+ECDH_version;
-+ECDSA_OpenSSL;
-+ECDSA_SIG_free;
-+ECDSA_SIG_it;
-+ECDSA_SIG_new;
-+ECDSA_do_sign;
-+ECDSA_do_sign_ex;
-+ECDSA_do_verify;
-+ECDSA_get_default_method;
-+ECDSA_get_ex_data;
-+ECDSA_get_ex_new_index;
-+ECDSA_set_default_method;
-+ECDSA_set_ex_data;
-+ECDSA_set_method;
-+ECDSA_sign;
-+ECDSA_sign_ex;
-+ECDSA_sign_setup;
-+ECDSA_size;
-+ECDSA_verify;
-+ECDSA_version;
-+ECPARAMETERS_free;
-+ECPARAMETERS_it;
-+ECPARAMETERS_new;
-+ECPKPARAMETERS_free;
-+ECPKPARAMETERS_it;
-+ECPKPARAMETERS_new;
-+ECPKParameters_print;
-+ECPKParameters_print_fp;
-+ECParameters_print;
-+ECParameters_print_fp;
-+EC_EX_DATA_clear_free_all_data;
-+EC_EX_DATA_clear_free_data;
-+EC_EX_DATA_free_all_data;
-+EC_EX_DATA_free_data;
-+EC_EX_DATA_get_data;
-+EC_EX_DATA_set_data;
-+EC_GF2m_simple_method;
-+EC_GFp_mont_method;
-+EC_GFp_nist_method;
-+EC_GFp_simple_method;
-+EC_GROUP_check;
-+EC_GROUP_check_discriminant;
-+EC_GROUP_clear_free;
-+EC_GROUP_cmp;
-+EC_GROUP_copy;
-+EC_GROUP_dup;
-+EC_GROUP_free;
-+EC_GROUP_get0_generator;
-+EC_GROUP_get0_seed;
-+EC_GROUP_get_asn1_flag;
-+EC_GROUP_get_basis_type;
-+EC_GROUP_get_cofactor;
-+EC_GROUP_get_curve_GF2m;
-+EC_GROUP_get_curve_GFp;
-+EC_GROUP_get_curve_name;
-+EC_GROUP_get_degree;
-+EC_GROUP_get_order;
-+EC_GROUP_get_pentanomial_basis;
-+EC_GROUP_get_point_conversion_form;
-+EC_GROUP_get_seed_len;
-+EC_GROUP_get_trinomial_basis;
-+EC_GROUP_have_precompute_mult;
-+EC_GROUP_method_of;
-+EC_GROUP_new;
-+EC_GROUP_new_by_curve_name;
-+EC_GROUP_new_curve_GF2m;
-+EC_GROUP_new_curve_GFp;
-+EC_GROUP_precompute_mult;
-+EC_GROUP_set_asn1_flag;
-+EC_GROUP_set_curve_GF2m;
-+EC_GROUP_set_curve_GFp;
-+EC_GROUP_set_curve_name;
-+EC_GROUP_set_generator;
-+EC_GROUP_set_point_conversion_form;
-+EC_GROUP_set_seed;
-+EC_KEY_check_key;
-+EC_KEY_copy;
-+EC_KEY_dup;
-+EC_KEY_free;
-+EC_KEY_generate_key;
-+EC_KEY_get0_group;
-+EC_KEY_get0_private_key;
-+EC_KEY_get0_public_key;
-+EC_KEY_get_conv_form;
-+EC_KEY_get_enc_flags;
-+EC_KEY_get_key_method_data;
-+EC_KEY_insert_key_method_data;
-+EC_KEY_new;
-+EC_KEY_new_by_curve_name;
-+EC_KEY_precompute_mult;
-+EC_KEY_print;
-+EC_KEY_print_fp;
-+EC_KEY_set_asn1_flag;
-+EC_KEY_set_conv_form;
-+EC_KEY_set_enc_flags;
-+EC_KEY_set_group;
-+EC_KEY_set_private_key;
-+EC_KEY_set_public_key;
-+EC_KEY_up_ref;
-+EC_METHOD_get_field_type;
-+EC_POINT_add;
-+EC_POINT_bn2point;
-+EC_POINT_clear_free;
-+EC_POINT_cmp;
-+EC_POINT_copy;
-+EC_POINT_dbl;
-+EC_POINT_dup;
-+EC_POINT_free;
-+EC_POINT_get_Jprojective_coordinates_GFp;
-+EC_POINT_get_affine_coordinates_GF2m;
-+EC_POINT_get_affine_coordinates_GFp;
-+EC_POINT_hex2point;
-+EC_POINT_invert;
-+EC_POINT_is_at_infinity;
-+EC_POINT_is_on_curve;
-+EC_POINT_make_affine;
-+EC_POINT_method_of;
-+EC_POINT_mul;
-+EC_POINT_new;
-+EC_POINT_oct2point;
-+EC_POINT_point2bn;
-+EC_POINT_point2hex;
-+EC_POINT_point2oct;
-+EC_POINT_set_Jprojective_coordinates_GFp;
-+EC_POINT_set_affine_coordinates_GF2m;
-+EC_POINT_set_affine_coordinates_GFp;
-+EC_POINT_set_compressed_coordinates_GF2m;
-+EC_POINT_set_compressed_coordinates_GFp;
-+EC_POINT_set_to_infinity;
-+EC_POINTs_make_affine;
-+EC_POINTs_mul;
-+EC_PRIVATEKEY_free;
-+EC_PRIVATEKEY_it;
-+EC_PRIVATEKEY_new;
-+EC_get_builtin_curves;
-+EDIPARTYNAME_free;
-+EDIPARTYNAME_it;
-+EDIPARTYNAME_new;
-+ENGINE_add;
-+ENGINE_add_conf_module;
-+ENGINE_by_id;
-+ENGINE_cleanup;
-+ENGINE_cmd_is_executable;
-+ENGINE_ctrl;
-+ENGINE_ctrl_cmd;
-+ENGINE_ctrl_cmd_string;
-+ENGINE_finish;
-+ENGINE_free;
-+ENGINE_get_DH;
-+ENGINE_get_DSA;
-+ENGINE_get_ECDH;
-+ENGINE_get_ECDSA;
-+ENGINE_get_RAND;
-+ENGINE_get_RSA;
-+ENGINE_get_STORE;
-+ENGINE_get_cipher;
-+ENGINE_get_cipher_engine;
-+ENGINE_get_ciphers;
-+ENGINE_get_cmd_defns;
-+ENGINE_get_ctrl_function;
-+ENGINE_get_default_DH;
-+ENGINE_get_default_DSA;
-+ENGINE_get_default_ECDH;
-+ENGINE_get_default_ECDSA;
-+ENGINE_get_default_RAND;
-+ENGINE_get_default_RSA;
-+ENGINE_get_destroy_function;
-+ENGINE_get_digest;
-+ENGINE_get_digest_engine;
-+ENGINE_get_digests;
-+ENGINE_get_ex_data;
-+ENGINE_get_ex_new_index;
-+ENGINE_get_finish_function;
-+ENGINE_get_first;
-+ENGINE_get_flags;
-+ENGINE_get_id;
-+ENGINE_get_init_function;
-+ENGINE_get_last;
-+ENGINE_get_load_privkey_function;
-+ENGINE_get_load_pubkey_function;
-+ENGINE_get_name;
-+ENGINE_get_next;
-+ENGINE_get_prev;
-+ENGINE_get_static_state;
-+ENGINE_get_table_flags;
-+ENGINE_init;
-+ENGINE_load_builtin_engines;
-+ENGINE_load_cryptodev;
-+ENGINE_load_dynamic;
-+ENGINE_load_openssl;
-+ENGINE_load_padlock;
-+ENGINE_load_private_key;
-+ENGINE_load_public_key;
-+ENGINE_new;
-+ENGINE_register_DH;
-+ENGINE_register_DSA;
-+ENGINE_register_ECDH;
-+ENGINE_register_ECDSA;
-+ENGINE_register_RAND;
-+ENGINE_register_RSA;
-+ENGINE_register_STORE;
-+ENGINE_register_all_DH;
-+ENGINE_register_all_DSA;
-+ENGINE_register_all_ECDH;
-+ENGINE_register_all_ECDSA;
-+ENGINE_register_all_RAND;
-+ENGINE_register_all_RSA;
-+ENGINE_register_all_STORE;
-+ENGINE_register_all_ciphers;
-+ENGINE_register_all_complete;
-+ENGINE_register_all_digests;
-+ENGINE_register_ciphers;
-+ENGINE_register_complete;
-+ENGINE_register_digests;
-+ENGINE_remove;
-+ENGINE_set_DH;
-+ENGINE_set_DSA;
-+ENGINE_set_ECDH;
-+ENGINE_set_ECDSA;
-+ENGINE_set_RAND;
-+ENGINE_set_RSA;
-+ENGINE_set_STORE;
-+ENGINE_set_ciphers;
-+ENGINE_set_cmd_defns;
-+ENGINE_set_ctrl_function;
-+ENGINE_set_default;
-+ENGINE_set_default_DH;
-+ENGINE_set_default_DSA;
-+ENGINE_set_default_ECDH;
-+ENGINE_set_default_ECDSA;
-+ENGINE_set_default_RAND;
-+ENGINE_set_default_RSA;
-+ENGINE_set_default_ciphers;
-+ENGINE_set_default_digests;
-+ENGINE_set_default_string;
-+ENGINE_set_destroy_function;
-+ENGINE_set_digests;
-+ENGINE_set_ex_data;
-+ENGINE_set_finish_function;
-+ENGINE_set_flags;
-+ENGINE_set_id;
-+ENGINE_set_init_function;
-+ENGINE_set_load_privkey_function;
-+ENGINE_set_load_pubkey_function;
-+ENGINE_set_name;
-+ENGINE_set_table_flags;
-+ENGINE_unregister_DH;
-+ENGINE_unregister_DSA;
-+ENGINE_unregister_ECDH;
-+ENGINE_unregister_ECDSA;
-+ENGINE_unregister_RAND;
-+ENGINE_unregister_RSA;
-+ENGINE_unregister_STORE;
-+ENGINE_unregister_ciphers;
-+ENGINE_unregister_digests;
-+ENGINE_up_ref;
-+ERR_add_error_data;
-+ERR_clear_error;
-+ERR_error_string;
-+ERR_error_string_n;
-+ERR_free_strings;
-+ERR_func_error_string;
-+ERR_get_err_state_table;
-+ERR_get_error;
-+ERR_get_error_line;
-+ERR_get_error_line_data;
-+ERR_get_implementation;
-+ERR_get_next_error_library;
-+ERR_get_state;
-+ERR_get_string_table;
-+ERR_lib_error_string;
-+ERR_load_ASN1_strings;
-+ERR_load_BIO_strings;
-+ERR_load_BN_strings;
-+ERR_load_BUF_strings;
-+ERR_load_COMP_strings;
-+ERR_load_CONF_strings;
-+ERR_load_CRYPTO_strings;
-+ERR_load_DH_strings;
-+ERR_load_DSA_strings;
-+ERR_load_DSO_strings;
-+ERR_load_ECDH_strings;
-+ERR_load_ECDSA_strings;
-+ERR_load_EC_strings;
-+ERR_load_ENGINE_strings;
-+ERR_load_ERR_strings;
-+ERR_load_EVP_strings;
-+ERR_load_OBJ_strings;
-+ERR_load_OCSP_strings;
-+ERR_load_PEM_strings;
-+ERR_load_PKCS12_strings;
-+ERR_load_PKCS7_strings;
-+ERR_load_RAND_strings;
-+ERR_load_RSA_strings;
-+ERR_load_STORE_strings;
-+ERR_load_UI_strings;
-+ERR_load_X509V3_strings;
-+ERR_load_X509_strings;
-+ERR_load_crypto_strings;
-+ERR_load_strings;
-+ERR_peek_error;
-+ERR_peek_error_line;
-+ERR_peek_error_line_data;
-+ERR_peek_last_error;
-+ERR_peek_last_error_line;
-+ERR_peek_last_error_line_data;
-+ERR_pop_to_mark;
-+ERR_print_errors;
-+ERR_print_errors_cb;
-+ERR_print_errors_fp;
-+ERR_put_error;
-+ERR_reason_error_string;
-+ERR_release_err_state_table;
-+ERR_remove_state;
-+ERR_set_error_data;
-+ERR_set_implementation;
-+ERR_set_mark;
-+ERR_unload_strings;
-+EVP_BytesToKey;
-+EVP_CIPHER_CTX_block_size;
-+EVP_CIPHER_CTX_cipher;
-+EVP_CIPHER_CTX_cleanup;
-+EVP_CIPHER_CTX_ctrl;
-+EVP_CIPHER_CTX_flags;
-+EVP_CIPHER_CTX_free;
-+EVP_CIPHER_CTX_get_app_data;
-+EVP_CIPHER_CTX_init;
-+EVP_CIPHER_CTX_iv_length;
-+EVP_CIPHER_CTX_key_length;
-+EVP_CIPHER_CTX_new;
-+EVP_CIPHER_CTX_nid;
-+EVP_CIPHER_CTX_rand_key;
-+EVP_CIPHER_CTX_set_app_data;
-+EVP_CIPHER_CTX_set_key_length;
-+EVP_CIPHER_CTX_set_padding;
-+EVP_CIPHER_asn1_to_param;
-+EVP_CIPHER_block_size;
-+EVP_CIPHER_flags;
-+EVP_CIPHER_get_asn1_iv;
-+EVP_CIPHER_iv_length;
-+EVP_CIPHER_key_length;
-+EVP_CIPHER_nid;
-+EVP_CIPHER_param_to_asn1;
-+EVP_CIPHER_set_asn1_iv;
-+EVP_CIPHER_type;
-+EVP_Cipher;
-+EVP_CipherFinal;
-+EVP_CipherFinal_ex;
-+EVP_CipherInit;
-+EVP_CipherInit_ex;
-+EVP_CipherUpdate;
-+EVP_DecodeBlock;
-+EVP_DecodeFinal;
-+EVP_DecodeInit;
-+EVP_DecodeUpdate;
-+EVP_DecryptFinal;
-+EVP_DecryptFinal_ex;
-+EVP_DecryptInit;
-+EVP_DecryptInit_ex;
-+EVP_DecryptUpdate;
-+EVP_Digest;
-+EVP_DigestFinal;
-+EVP_DigestFinal_ex;
-+EVP_DigestInit;
-+EVP_DigestInit_ex;
-+EVP_DigestUpdate;
-+EVP_EncodeBlock;
-+EVP_EncodeFinal;
-+EVP_EncodeInit;
-+EVP_EncodeUpdate;
-+EVP_EncryptFinal;
-+EVP_EncryptFinal_ex;
-+EVP_EncryptInit;
-+EVP_EncryptInit_ex;
-+EVP_EncryptUpdate;
-+EVP_MD_CTX_cleanup;
-+EVP_MD_CTX_clear_flags;
-+EVP_MD_CTX_copy;
-+EVP_MD_CTX_copy_ex;
-+EVP_MD_CTX_create;
-+EVP_MD_CTX_destroy;
-+EVP_MD_CTX_init;
-+EVP_MD_CTX_md;
-+EVP_MD_CTX_set_flags;
-+EVP_MD_CTX_test_flags;
-+EVP_MD_block_size;
-+EVP_MD_pkey_type;
-+EVP_MD_size;
-+EVP_MD_type;
-+EVP_OpenFinal;
-+EVP_OpenInit;
-+EVP_PBE_CipherInit;
-+EVP_PBE_alg_add;
-+EVP_PBE_cleanup;
-+EVP_PKCS82PKEY;
-+EVP_PKEY2PKCS8;
-+EVP_PKEY2PKCS8_broken;
-+EVP_PKEY_add1_attr;
-+EVP_PKEY_add1_attr_by_NID;
-+EVP_PKEY_add1_attr_by_OBJ;
-+EVP_PKEY_add1_attr_by_txt;
-+EVP_PKEY_assign;
-+EVP_PKEY_bits;
-+EVP_PKEY_cmp;
-+EVP_PKEY_cmp_parameters;
-+EVP_PKEY_copy_parameters;
-+EVP_PKEY_decrypt;
-+EVP_PKEY_delete_attr;
-+EVP_PKEY_encrypt;
-+EVP_PKEY_free;
-+EVP_PKEY_get1_DH;
-+EVP_PKEY_get1_DSA;
-+EVP_PKEY_get1_EC_KEY;
-+EVP_PKEY_get1_RSA;
-+EVP_PKEY_get_attr;
-+EVP_PKEY_get_attr_by_NID;
-+EVP_PKEY_get_attr_by_OBJ;
-+EVP_PKEY_get_attr_count;
-+EVP_PKEY_missing_parameters;
-+EVP_PKEY_new;
-+EVP_PKEY_save_parameters;
-+EVP_PKEY_set1_DH;
-+EVP_PKEY_set1_DSA;
-+EVP_PKEY_set1_EC_KEY;
-+EVP_PKEY_set1_RSA;
-+EVP_PKEY_size;
-+EVP_PKEY_type;
-+EVP_SealFinal;
-+EVP_SealInit;
-+EVP_SignFinal;
-+EVP_VerifyFinal;
-+EVP_add_cipher;
-+EVP_add_digest;
-+EVP_aes_128_cbc;
-+EVP_aes_128_cfb;
-+EVP_aes_128_cfb1;
-+EVP_aes_128_cfb128;
-+EVP_aes_128_cfb8;
-+EVP_aes_128_ecb;
-+EVP_aes_128_ofb;
-+EVP_aes_192_cbc;
-+EVP_aes_192_cfb;
-+EVP_aes_192_cfb1;
-+EVP_aes_192_cfb128;
-+EVP_aes_192_cfb8;
-+EVP_aes_192_ecb;
-+EVP_aes_192_ofb;
-+EVP_aes_256_cbc;
-+EVP_aes_256_cfb;
-+EVP_aes_256_cfb1;
-+EVP_aes_256_cfb128;
-+EVP_aes_256_cfb8;
-+EVP_aes_256_ecb;
-+EVP_aes_256_ofb;
-+EVP_bf_cbc;
-+EVP_bf_cfb;
-+EVP_bf_cfb64;
-+EVP_bf_ecb;
-+EVP_bf_ofb;
-+EVP_cast5_cbc;
-+EVP_cast5_cfb;
-+EVP_cast5_cfb64;
-+EVP_cast5_ecb;
-+EVP_cast5_ofb;
-+EVP_cleanup;
-+EVP_des_cbc;
-+EVP_des_cfb;
-+EVP_des_cfb1;
-+EVP_des_cfb64;
-+EVP_des_cfb8;
-+EVP_des_ecb;
-+EVP_des_ede;
-+EVP_des_ede3;
-+EVP_des_ede3_cbc;
-+EVP_des_ede3_cfb;
-+EVP_des_ede3_cfb1;
-+EVP_des_ede3_cfb64;
-+EVP_des_ede3_cfb8;
-+EVP_des_ede3_ecb;
-+EVP_des_ede3_ofb;
-+EVP_des_ede_cbc;
-+EVP_des_ede_cfb;
-+EVP_des_ede_cfb64;
-+EVP_des_ede_ecb;
-+EVP_des_ede_ofb;
-+EVP_des_ofb;
-+EVP_desx_cbc;
-+EVP_dss;
-+EVP_dss1;
-+EVP_ecdsa;
-+EVP_enc_null;
-+EVP_get_cipherbyname;
-+EVP_get_digestbyname;
-+EVP_get_pw_prompt;
-+EVP_idea_cbc;
-+EVP_idea_cfb;
-+EVP_idea_cfb64;
-+EVP_idea_ecb;
-+EVP_idea_ofb;
-+EVP_md2;
-+EVP_md4;
-+EVP_md5;
-+EVP_md_null;
-+EVP_rc2_40_cbc;
-+EVP_rc2_64_cbc;
-+EVP_rc2_cbc;
-+EVP_rc2_cfb;
-+EVP_rc2_cfb64;
-+EVP_rc2_ecb;
-+EVP_rc2_ofb;
-+EVP_rc4;
-+EVP_rc4_40;
-+EVP_read_pw_string;
-+EVP_ripemd160;
-+EVP_set_pw_prompt;
-+EVP_sha;
-+EVP_sha1;
-+EVP_sha224;
-+EVP_sha256;
-+EVP_sha384;
-+EVP_sha512;
-+EVP_version;
-+EXTENDED_KEY_USAGE_free;
-+EXTENDED_KEY_USAGE_it;
-+EXTENDED_KEY_USAGE_new;
-+GENERAL_NAMES_free;
-+GENERAL_NAMES_it;
-+GENERAL_NAMES_new;
-+GENERAL_NAME_free;
-+GENERAL_NAME_it;
-+GENERAL_NAME_new;
-+GENERAL_NAME_print;
-+GENERAL_SUBTREE_free;
-+GENERAL_SUBTREE_it;
-+GENERAL_SUBTREE_new;
-+HMAC;
-+HMAC_CTX_cleanup;
-+HMAC_CTX_init;
-+HMAC_Final;
-+HMAC_Init;
-+HMAC_Init_ex;
-+HMAC_Update;
-+IDEA_version;
-+KRB5_APREQBODY_free;
-+KRB5_APREQBODY_it;
-+KRB5_APREQBODY_new;
-+KRB5_APREQ_free;
-+KRB5_APREQ_it;
-+KRB5_APREQ_new;
-+KRB5_AUTHDATA_free;
-+KRB5_AUTHDATA_it;
-+KRB5_AUTHDATA_new;
-+KRB5_AUTHENTBODY_free;
-+KRB5_AUTHENTBODY_it;
-+KRB5_AUTHENTBODY_new;
-+KRB5_AUTHENT_free;
-+KRB5_AUTHENT_it;
-+KRB5_AUTHENT_new;
-+KRB5_CHECKSUM_free;
-+KRB5_CHECKSUM_it;
-+KRB5_CHECKSUM_new;
-+KRB5_ENCDATA_free;
-+KRB5_ENCDATA_it;
-+KRB5_ENCDATA_new;
-+KRB5_ENCKEY_free;
-+KRB5_ENCKEY_it;
-+KRB5_ENCKEY_new;
-+KRB5_PRINCNAME_free;
-+KRB5_PRINCNAME_it;
-+KRB5_PRINCNAME_new;
-+KRB5_TICKET_free;
-+KRB5_TICKET_it;
-+KRB5_TICKET_new;
-+KRB5_TKTBODY_free;
-+KRB5_TKTBODY_it;
-+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8o;
-+LONG_it;
-+MD2;
-+MD2_Final;
-+MD2_Init;
-+MD2_Update;
-+MD2_options;
-+MD2_version;
-+MD4;
-+MD4_Final;
-+MD4_Init;
-+MD4_Transform;
-+MD4_Update;
-+MD4_version;
-+MD5;
-+MD5_Final;
-+MD5_Init;
-+MD5_Transform;
-+MD5_Update;
-+MD5_version;
-+MGF1;
-+NAME_CONSTRAINTS_free;
-+NAME_CONSTRAINTS_it;
-+NAME_CONSTRAINTS_new;
-+NCONF_WIN32;
-+NCONF_default;
-+NCONF_dump_bio;
-+NCONF_dump_fp;
-+NCONF_free;
-+NCONF_free_data;
-+NCONF_get_number_e;
-+NCONF_get_section;
-+NCONF_get_string;
-+NCONF_load;
-+NCONF_load_bio;
-+NCONF_load_fp;
-+NCONF_new;
-+NETSCAPE_CERT_SEQUENCE_free;
-+NETSCAPE_CERT_SEQUENCE_it;
-+NETSCAPE_CERT_SEQUENCE_new;
-+NETSCAPE_ENCRYPTED_PKEY_free;
-+NETSCAPE_ENCRYPTED_PKEY_it;
-+NETSCAPE_ENCRYPTED_PKEY_new;
-+NETSCAPE_PKEY_free;
-+NETSCAPE_PKEY_it;
-+NETSCAPE_PKEY_new;
-+NETSCAPE_SPKAC_free;
-+NETSCAPE_SPKAC_it;
-+NETSCAPE_SPKAC_new;
-+NETSCAPE_SPKI_b64_decode;
-+NETSCAPE_SPKI_b64_encode;
-+NETSCAPE_SPKI_free;
-+NETSCAPE_SPKI_get_pubkey;
-+NETSCAPE_SPKI_it;
-+NETSCAPE_SPKI_new;
-+NETSCAPE_SPKI_print;
-+NETSCAPE_SPKI_set_pubkey;
-+NETSCAPE_SPKI_sign;
-+NETSCAPE_SPKI_verify;
-+NOTICEREF_free;
-+NOTICEREF_it;
-+NOTICEREF_new;
-+OBJ_NAME_add;
-+OBJ_NAME_cleanup;
-+OBJ_NAME_do_all;
-+OBJ_NAME_do_all_sorted;
-+OBJ_NAME_get;
-+OBJ_NAME_init;
-+OBJ_NAME_new_index;
-+OBJ_NAME_remove;
-+OBJ_add_object;
-+OBJ_bsearch;
-+OBJ_bsearch_ex;
-+OBJ_cleanup;
-+OBJ_cmp;
-+OBJ_create;
-+OBJ_create_objects;
-+OBJ_dup;
-+OBJ_ln2nid;
-+OBJ_new_nid;
-+OBJ_nid2ln;
-+OBJ_nid2obj;
-+OBJ_nid2sn;
-+OBJ_obj2nid;
-+OBJ_obj2txt;
-+OBJ_sn2nid;
-+OBJ_txt2nid;
-+OBJ_txt2obj;
-+OCSP_BASICRESP_add1_ext_i2d;
-+OCSP_BASICRESP_add_ext;
-+OCSP_BASICRESP_delete_ext;
-+OCSP_BASICRESP_free;
-+OCSP_BASICRESP_get1_ext_d2i;
-+OCSP_BASICRESP_get_ext;
-+OCSP_BASICRESP_get_ext_by_NID;
-+OCSP_BASICRESP_get_ext_by_OBJ;
-+OCSP_BASICRESP_get_ext_by_critical;
-+OCSP_BASICRESP_get_ext_count;
-+OCSP_BASICRESP_it;
-+OCSP_BASICRESP_new;
-+OCSP_CERTID_free;
-+OCSP_CERTID_it;
-+OCSP_CERTID_new;
-+OCSP_CERTSTATUS_free;
-+OCSP_CERTSTATUS_it;
-+OCSP_CERTSTATUS_new;
-+OCSP_CRLID_free;
-+OCSP_CRLID_it;
-+OCSP_CRLID_new;
-+OCSP_ONEREQ_add1_ext_i2d;
-+OCSP_ONEREQ_add_ext;
-+OCSP_ONEREQ_delete_ext;
-+OCSP_ONEREQ_free;
-+OCSP_ONEREQ_get1_ext_d2i;
-+OCSP_ONEREQ_get_ext;
-+OCSP_ONEREQ_get_ext_by_NID;
-+OCSP_ONEREQ_get_ext_by_OBJ;
-+OCSP_ONEREQ_get_ext_by_critical;
-+OCSP_ONEREQ_get_ext_count;
-+OCSP_ONEREQ_it;
-+OCSP_ONEREQ_new;
-+OCSP_REQINFO_free;
-+OCSP_REQINFO_it;
-+OCSP_REQINFO_new;
-+OCSP_REQUEST_add1_ext_i2d;
-+OCSP_REQUEST_add_ext;
-+OCSP_REQUEST_delete_ext;
-+OCSP_REQUEST_free;
-+OCSP_REQUEST_get1_ext_d2i;
-+OCSP_REQUEST_get_ext;
-+OCSP_REQUEST_get_ext_by_NID;
-+OCSP_REQUEST_get_ext_by_OBJ;
-+OCSP_REQUEST_get_ext_by_critical;
-+OCSP_REQUEST_get_ext_count;
-+OCSP_REQUEST_it;
-+OCSP_REQUEST_new;
-+OCSP_REQUEST_print;
-+OCSP_RESPBYTES_free;
-+OCSP_RESPBYTES_it;
-+OCSP_RESPBYTES_new;
-+OCSP_RESPDATA_free;
-+OCSP_RESPDATA_it;
-+OCSP_RESPDATA_new;
-+OCSP_RESPID_free;
-+OCSP_RESPID_it;
-+OCSP_RESPID_new;
-+OCSP_RESPONSE_free;
-+OCSP_RESPONSE_it;
-+OCSP_RESPONSE_new;
-+OCSP_RESPONSE_print;
-+OCSP_REVOKEDINFO_free;
-+OCSP_REVOKEDINFO_it;
-+OCSP_REVOKEDINFO_new;
-+OCSP_SERVICELOC_free;
-+OCSP_SERVICELOC_it;
-+OCSP_SERVICELOC_new;
-+OCSP_SIGNATURE_free;
-+OCSP_SIGNATURE_it;
-+OCSP_SIGNATURE_new;
-+OCSP_SINGLERESP_add1_ext_i2d;
-+OCSP_SINGLERESP_add_ext;
-+OCSP_SINGLERESP_delete_ext;
-+OCSP_SINGLERESP_free;
-+OCSP_SINGLERESP_get1_ext_d2i;
-+OCSP_SINGLERESP_get_ext;
-+OCSP_SINGLERESP_get_ext_by_NID;
-+OCSP_SINGLERESP_get_ext_by_OBJ;
-+OCSP_SINGLERESP_get_ext_by_critical;
-+OCSP_SINGLERESP_get_ext_count;
-+OCSP_SINGLERESP_it;
-+OCSP_SINGLERESP_new;
-+OCSP_accept_responses_new;
-+OCSP_archive_cutoff_new;
-+OCSP_basic_add1_cert;
-+OCSP_basic_add1_nonce;
-+OCSP_basic_add1_status;
-+OCSP_basic_sign;
-+OCSP_basic_verify;
-+OCSP_cert_id_new;
-+OCSP_cert_status_str;
-+OCSP_cert_to_id;
-+OCSP_check_nonce;
-+OCSP_check_validity;
-+OCSP_copy_nonce;
-+OCSP_crlID_new;
-+OCSP_crl_reason_str;
-+OCSP_id_cmp;
-+OCSP_id_get0_info;
-+OCSP_id_issuer_cmp;
-+OCSP_onereq_get0_id;
-+OCSP_parse_url;
-+OCSP_request_add0_id;
-+OCSP_request_add1_cert;
-+OCSP_request_add1_nonce;
-+OCSP_request_is_signed;
-+OCSP_request_onereq_count;
-+OCSP_request_onereq_get0;
-+OCSP_request_set1_name;
-+OCSP_request_sign;
-+OCSP_request_verify;
-+OCSP_resp_count;
-+OCSP_resp_find;
-+OCSP_resp_find_status;
-+OCSP_resp_get0;
-+OCSP_response_create;
-+OCSP_response_get1_basic;
-+OCSP_response_status;
-+OCSP_response_status_str;
-+OCSP_sendreq_bio;
-+OCSP_single_get0_status;
-+OCSP_url_svcloc_new;
-+OPENSSL_DIR_end;
-+OPENSSL_DIR_read;
-+OPENSSL_NONPIC_relocated;
-+OPENSSL_add_all_algorithms_conf;
-+OPENSSL_add_all_algorithms_noconf;
-+OPENSSL_cleanse;
-+OPENSSL_config;
-+OPENSSL_cpuid_setup;
-+OPENSSL_gmtime;
-+OPENSSL_ia32cap_loc;
-+OPENSSL_isservice;
-+OPENSSL_issetugid;
-+OPENSSL_load_builtin_modules;
-+OPENSSL_memcmp;
-+OPENSSL_no_config;
-+OPENSSL_showfatal;
-+OPENSSL_stderr;
-+OPENSSL_strcasecmp;
-+OPENSSL_strncasecmp;
-+OSSL_DES_version;
-+OSSL_libdes_version;
-+OTHERNAME_free;
-+OTHERNAME_it;
-+OTHERNAME_new;
-+OpenSSLDie;
-+OpenSSL_add_all_ciphers;
-+OpenSSL_add_all_digests;
-+PBE2PARAM_free;
-+PBE2PARAM_it;
-+PBE2PARAM_new;
-+PBEPARAM_free;
-+PBEPARAM_it;
-+PBEPARAM_new;
-+PBKDF2PARAM_free;
-+PBKDF2PARAM_it;
-+PBKDF2PARAM_new;
-+PEM_ASN1_read;
-+PEM_ASN1_read_bio;
-+PEM_ASN1_write;
-+PEM_ASN1_write_bio;
-+PEM_SealFinal;
-+PEM_SealInit;
-+PEM_SealUpdate;
-+PEM_SignFinal;
-+PEM_SignInit;
-+PEM_SignUpdate;
-+PEM_X509_INFO_read;
-+PEM_X509_INFO_read_bio;
-+PEM_X509_INFO_write_bio;
-+PEM_bytes_read_bio;
-+PEM_def_callback;
-+PEM_dek_info;
-+PEM_do_header;
-+PEM_get_EVP_CIPHER_INFO;
-+PEM_proc_type;
-+PEM_read;
-+PEM_read_DHparams;
-+PEM_read_DSAPrivateKey;
-+PEM_read_DSA_PUBKEY;
-+PEM_read_DSAparams;
-+PEM_read_ECPKParameters;
-+PEM_read_ECPrivateKey;
-+PEM_read_EC_PUBKEY;
-+PEM_read_NETSCAPE_CERT_SEQUENCE;
-+PEM_read_PKCS7;
-+PEM_read_PKCS8;
-+PEM_read_PKCS8_PRIV_KEY_INFO;
-+PEM_read_PUBKEY;
-+PEM_read_PrivateKey;
-+PEM_read_RSAPrivateKey;
-+PEM_read_RSAPublicKey;
-+PEM_read_RSA_PUBKEY;
-+PEM_read_X509;
-+PEM_read_X509_AUX;
-+PEM_read_X509_CERT_PAIR;
-+PEM_read_X509_CRL;
-+PEM_read_X509_REQ;
-+PEM_read_bio;
-+PEM_read_bio_DHparams;
-+PEM_read_bio_DSAPrivateKey;
-+PEM_read_bio_DSA_PUBKEY;
-+PEM_read_bio_DSAparams;
-+PEM_read_bio_ECPKParameters;
-+PEM_read_bio_ECPrivateKey;
-+PEM_read_bio_EC_PUBKEY;
-+PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+PEM_read_bio_PKCS7;
-+PEM_read_bio_PKCS8;
-+PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+PEM_read_bio_PUBKEY;
-+PEM_read_bio_PrivateKey;
-+PEM_read_bio_RSAPrivateKey;
-+PEM_read_bio_RSAPublicKey;
-+PEM_read_bio_RSA_PUBKEY;
-+PEM_read_bio_X509;
-+PEM_read_bio_X509_AUX;
-+PEM_read_bio_X509_CERT_PAIR;
-+PEM_read_bio_X509_CRL;
-+PEM_read_bio_X509_REQ;
-+PEM_version;
-+PEM_write;
-+PEM_write_DHparams;
-+PEM_write_DSAPrivateKey;
-+PEM_write_DSA_PUBKEY;
-+PEM_write_DSAparams;
-+PEM_write_ECPKParameters;
-+PEM_write_ECPrivateKey;
-+PEM_write_EC_PUBKEY;
-+PEM_write_NETSCAPE_CERT_SEQUENCE;
-+PEM_write_PKCS7;
-+PEM_write_PKCS8;
-+PEM_write_PKCS8PrivateKey;
-+PEM_write_PKCS8PrivateKey_nid;
-+PEM_write_PKCS8_PRIV_KEY_INFO;
-+PEM_write_PUBKEY;
-+PEM_write_PrivateKey;
-+PEM_write_RSAPrivateKey;
-+PEM_write_RSAPublicKey;
-+PEM_write_RSA_PUBKEY;
-+PEM_write_X509;
-+PEM_write_X509_AUX;
-+PEM_write_X509_CERT_PAIR;
-+PEM_write_X509_CRL;
-+PEM_write_X509_REQ;
-+PEM_write_X509_REQ_NEW;
-+PEM_write_bio;
-+PEM_write_bio_DHparams;
-+PEM_write_bio_DSAPrivateKey;
-+PEM_write_bio_DSA_PUBKEY;
-+PEM_write_bio_DSAparams;
-+PEM_write_bio_ECPKParameters;
-+PEM_write_bio_ECPrivateKey;
-+PEM_write_bio_EC_PUBKEY;
-+PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+PEM_write_bio_PKCS7;
-+PEM_write_bio_PKCS8;
-+PEM_write_bio_PKCS8PrivateKey;
-+PEM_write_bio_PKCS8PrivateKey_nid;
-+PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+PEM_write_bio_PUBKEY;
-+PEM_write_bio_PrivateKey;
-+PEM_write_bio_RSAPrivateKey;
-+PEM_write_bio_RSAPublicKey;
-+PEM_write_bio_RSA_PUBKEY;
-+PEM_write_bio_X509;
-+PEM_write_bio_X509_AUX;
-+PEM_write_bio_X509_CERT_PAIR;
-+PEM_write_bio_X509_CRL;
-+PEM_write_bio_X509_REQ;
-+PEM_write_bio_X509_REQ_NEW;
-+PKCS12_AUTHSAFES_it;
-+PKCS12_BAGS_free;
-+PKCS12_BAGS_it;
-+PKCS12_BAGS_new;
-+PKCS12_MAC_DATA_free;
-+PKCS12_MAC_DATA_it;
-+PKCS12_MAC_DATA_new;
-+PKCS12_MAKE_KEYBAG;
-+PKCS12_MAKE_SHKEYBAG;
-+PKCS12_PBE_add;
-+PKCS12_PBE_keyivgen;
-+PKCS12_SAFEBAGS_it;
-+PKCS12_SAFEBAG_free;
-+PKCS12_SAFEBAG_it;
-+PKCS12_SAFEBAG_new;
-+PKCS12_add_CSPName_asc;
-+PKCS12_add_cert;
-+PKCS12_add_friendlyname_asc;
-+PKCS12_add_friendlyname_uni;
-+PKCS12_add_key;
-+PKCS12_add_localkeyid;
-+PKCS12_add_safe;
-+PKCS12_add_safes;
-+PKCS12_certbag2x509;
-+PKCS12_certbag2x509crl;
-+PKCS12_create;
-+PKCS12_decrypt_skey;
-+PKCS12_free;
-+PKCS12_gen_mac;
-+PKCS12_get_attr_gen;
-+PKCS12_get_friendlyname;
-+PKCS12_init;
-+PKCS12_it;
-+PKCS12_item_decrypt_d2i;
-+PKCS12_item_i2d_encrypt;
-+PKCS12_item_pack_safebag;
-+PKCS12_key_gen_asc;
-+PKCS12_key_gen_uni;
-+PKCS12_new;
-+PKCS12_newpass;
-+PKCS12_pack_authsafes;
-+PKCS12_pack_p7data;
-+PKCS12_pack_p7encdata;
-+PKCS12_parse;
-+PKCS12_pbe_crypt;
-+PKCS12_set_mac;
-+PKCS12_setup_mac;
-+PKCS12_unpack_authsafes;
-+PKCS12_unpack_p7data;
-+PKCS12_unpack_p7encdata;
-+PKCS12_verify_mac;
-+PKCS12_x5092certbag;
-+PKCS12_x509crl2certbag;
-+PKCS1_MGF1;
-+PKCS5_PBE_add;
-+PKCS5_PBE_keyivgen;
-+PKCS5_PBKDF2_HMAC_SHA1;
-+PKCS5_pbe2_set;
-+PKCS5_pbe_set;
-+PKCS5_v2_PBE_keyivgen;
-+PKCS7_ATTR_SIGN_it;
-+PKCS7_ATTR_VERIFY_it;
-+PKCS7_DIGEST_free;
-+PKCS7_DIGEST_it;
-+PKCS7_DIGEST_new;
-+PKCS7_ENCRYPT_free;
-+PKCS7_ENCRYPT_it;
-+PKCS7_ENCRYPT_new;
-+PKCS7_ENC_CONTENT_free;
-+PKCS7_ENC_CONTENT_it;
-+PKCS7_ENC_CONTENT_new;
-+PKCS7_ENVELOPE_free;
-+PKCS7_ENVELOPE_it;
-+PKCS7_ENVELOPE_new;
-+PKCS7_ISSUER_AND_SERIAL_digest;
-+PKCS7_ISSUER_AND_SERIAL_free;
-+PKCS7_ISSUER_AND_SERIAL_it;
-+PKCS7_ISSUER_AND_SERIAL_new;
-+PKCS7_RECIP_INFO_free;
-+PKCS7_RECIP_INFO_it;
-+PKCS7_RECIP_INFO_new;
-+PKCS7_RECIP_INFO_set;
-+PKCS7_SIGNED_free;
-+PKCS7_SIGNED_it;
-+PKCS7_SIGNED_new;
-+PKCS7_SIGNER_INFO_free;
-+PKCS7_SIGNER_INFO_it;
-+PKCS7_SIGNER_INFO_new;
-+PKCS7_SIGNER_INFO_set;
-+PKCS7_SIGN_ENVELOPE_free;
-+PKCS7_SIGN_ENVELOPE_it;
-+PKCS7_SIGN_ENVELOPE_new;
-+PKCS7_add_attrib_smimecap;
-+PKCS7_add_attribute;
-+PKCS7_add_certificate;
-+PKCS7_add_crl;
-+PKCS7_add_recipient;
-+PKCS7_add_recipient_info;
-+PKCS7_add_signature;
-+PKCS7_add_signed_attribute;
-+PKCS7_add_signer;
-+PKCS7_cert_from_signer_info;
-+PKCS7_content_new;
-+PKCS7_ctrl;
-+PKCS7_dataDecode;
-+PKCS7_dataFinal;
-+PKCS7_dataInit;
-+PKCS7_dataVerify;
-+PKCS7_decrypt;
-+PKCS7_digest_from_attributes;
-+PKCS7_dup;
-+PKCS7_encrypt;
-+PKCS7_free;
-+PKCS7_get0_signers;
-+PKCS7_get_attribute;
-+PKCS7_get_issuer_and_serial;
-+PKCS7_get_signed_attribute;
-+PKCS7_get_signer_info;
-+PKCS7_get_smimecap;
-+PKCS7_it;
-+PKCS7_new;
-+PKCS7_set0_type_other;
-+PKCS7_set_attributes;
-+PKCS7_set_cipher;
-+PKCS7_set_content;
-+PKCS7_set_digest;
-+PKCS7_set_signed_attributes;
-+PKCS7_set_type;
-+PKCS7_sign;
-+PKCS7_signatureVerify;
-+PKCS7_simple_smimecap;
-+PKCS7_verify;
-+PKCS8_PRIV_KEY_INFO_free;
-+PKCS8_PRIV_KEY_INFO_it;
-+PKCS8_PRIV_KEY_INFO_new;
-+PKCS8_add_keyusage;
-+PKCS8_decrypt;
-+PKCS8_encrypt;
-+PKCS8_set_broken;
-+PKEY_USAGE_PERIOD_free;
-+PKEY_USAGE_PERIOD_it;
-+PKEY_USAGE_PERIOD_new;
-+POLICYINFO_free;
-+POLICYINFO_it;
-+POLICYINFO_new;
-+POLICYQUALINFO_free;
-+POLICYQUALINFO_it;
-+POLICYQUALINFO_new;
-+POLICY_CONSTRAINTS_free;
-+POLICY_CONSTRAINTS_it;
-+POLICY_CONSTRAINTS_new;
-+POLICY_MAPPINGS_it;
-+POLICY_MAPPING_free;
-+POLICY_MAPPING_it;
-+POLICY_MAPPING_new;
-+PROXY_CERT_INFO_EXTENSION_free;
-+PROXY_CERT_INFO_EXTENSION_it;
-+PROXY_CERT_INFO_EXTENSION_new;
-+PROXY_POLICY_free;
-+PROXY_POLICY_it;
-+PROXY_POLICY_new;
-+RAND_SSLeay;
-+RAND_add;
-+RAND_bytes;
-+RAND_cleanup;
-+RAND_egd;
-+RAND_egd_bytes;
-+RAND_file_name;
-+RAND_get_rand_method;
-+RAND_load_file;
-+RAND_poll;
-+RAND_pseudo_bytes;
-+RAND_query_egd_bytes;
-+RAND_seed;
-+RAND_set_rand_engine;
-+RAND_set_rand_method;
-+RAND_status;
-+RAND_version;
-+RAND_write_file;
-+RC2_cbc_encrypt;
-+RC2_cfb64_encrypt;
-+RC2_decrypt;
-+RC2_ecb_encrypt;
-+RC2_encrypt;
-+RC2_ofb64_encrypt;
-+RC2_set_key;
-+RC2_version;
-+RC4;
-+RC4_options;
-+RC4_set_key;
-+RC4_version;
-+RIPEMD160;
-+RIPEMD160_Final;
-+RIPEMD160_Init;
-+RIPEMD160_Transform;
-+RIPEMD160_Update;
-+RMD160_version;
-+RSAPrivateKey_asn1_meth;
-+RSAPrivateKey_dup;
-+RSAPrivateKey_it;
-+RSAPublicKey_dup;
-+RSAPublicKey_it;
-+RSA_PKCS1_SSLeay;
-+RSA_X931_hash_id;
-+RSA_blinding_off;
-+RSA_blinding_on;
-+RSA_check_key;
-+RSA_flags;
-+RSA_free;
-+RSA_generate_key;
-+RSA_generate_key_ex;
-+RSA_get_default_method;
-+RSA_get_ex_data;
-+RSA_get_ex_new_index;
-+RSA_get_method;
-+RSA_memory_lock;
-+RSA_new;
-+RSA_new_method;
-+RSA_null_method;
-+RSA_padding_add_PKCS1_OAEP;
-+RSA_padding_add_PKCS1_PSS;
-+RSA_padding_add_PKCS1_type_1;
-+RSA_padding_add_PKCS1_type_2;
-+RSA_padding_add_SSLv23;
-+RSA_padding_add_X931;
-+RSA_padding_add_none;
-+RSA_padding_check_PKCS1_OAEP;
-+RSA_padding_check_PKCS1_type_1;
-+RSA_padding_check_PKCS1_type_2;
-+RSA_padding_check_SSLv23;
-+RSA_padding_check_X931;
-+RSA_padding_check_none;
-+RSA_print;
-+RSA_print_fp;
-+RSA_private_decrypt;
-+RSA_private_encrypt;
-+RSA_public_decrypt;
-+RSA_public_encrypt;
-+RSA_set_default_method;
-+RSA_set_ex_data;
-+RSA_set_method;
-+RSA_setup_blinding;
-+RSA_sign;
-+RSA_sign_ASN1_OCTET_STRING;
-+RSA_size;
-+RSA_up_ref;
-+RSA_verify;
-+RSA_verify_ASN1_OCTET_STRING;
-+RSA_verify_PKCS1_PSS;
-+RSA_version;
-+SHA;
-+SHA1;
-+SHA1_Final;
-+SHA1_Init;
-+SHA1_Transform;
-+SHA1_Update;
-+SHA1_version;
-+SHA224;
-+SHA224_Final;
-+SHA224_Init;
-+SHA224_Update;
-+SHA256;
-+SHA256_Final;
-+SHA256_Init;
-+SHA256_Transform;
-+SHA256_Update;
-+SHA256_version;
-+SHA384;
-+SHA384_Final;
-+SHA384_Init;
-+SHA384_Update;
-+SHA512;
-+SHA512_Final;
-+SHA512_Init;
-+SHA512_Transform;
-+SHA512_Update;
-+SHA512_version;
-+SHA_Final;
-+SHA_Init;
-+SHA_Transform;
-+SHA_Update;
-+SHA_version;
-+SMIME_crlf_copy;
-+SMIME_read_PKCS7;
-+SMIME_text;
-+SMIME_write_PKCS7;
-+SSLeay;
-+SSLeay_version;
-+STACK_version;
-+STORE_ATTR_INFO_compare;
-+STORE_ATTR_INFO_free;
-+STORE_ATTR_INFO_get0_cstr;
-+STORE_ATTR_INFO_get0_dn;
-+STORE_ATTR_INFO_get0_number;
-+STORE_ATTR_INFO_get0_sha1str;
-+STORE_ATTR_INFO_in;
-+STORE_ATTR_INFO_in_ex;
-+STORE_ATTR_INFO_in_range;
-+STORE_ATTR_INFO_modify_cstr;
-+STORE_ATTR_INFO_modify_dn;
-+STORE_ATTR_INFO_modify_number;
-+STORE_ATTR_INFO_modify_sha1str;
-+STORE_ATTR_INFO_new;
-+STORE_ATTR_INFO_set_cstr;
-+STORE_ATTR_INFO_set_dn;
-+STORE_ATTR_INFO_set_number;
-+STORE_ATTR_INFO_set_sha1str;
-+STORE_Memory;
-+STORE_OBJECT_free;
-+STORE_OBJECT_new;
-+STORE_attr_sizes;
-+STORE_create_method;
-+STORE_ctrl;
-+STORE_delete_arbitrary;
-+STORE_delete_certificate;
-+STORE_delete_crl;
-+STORE_delete_number;
-+STORE_delete_private_key;
-+STORE_delete_public_key;
-+STORE_destroy_method;
-+STORE_free;
-+STORE_generate_crl;
-+STORE_generate_key;
-+STORE_get_arbitrary;
-+STORE_get_certificate;
-+STORE_get_crl;
-+STORE_get_ex_data;
-+STORE_get_ex_new_index;
-+STORE_get_method;
-+STORE_get_number;
-+STORE_get_private_key;
-+STORE_get_public_key;
-+STORE_list_certificate_end;
-+STORE_list_certificate_endp;
-+STORE_list_certificate_next;
-+STORE_list_certificate_start;
-+STORE_list_crl_end;
-+STORE_list_crl_endp;
-+STORE_list_crl_next;
-+STORE_list_crl_start;
-+STORE_list_private_key_end;
-+STORE_list_private_key_endp;
-+STORE_list_private_key_next;
-+STORE_list_private_key_start;
-+STORE_list_public_key_end;
-+STORE_list_public_key_endp;
-+STORE_list_public_key_next;
-+STORE_list_public_key_start;
-+STORE_method_get_cleanup_function;
-+STORE_method_get_ctrl_function;
-+STORE_method_get_delete_function;
-+STORE_method_get_generate_function;
-+STORE_method_get_get_function;
-+STORE_method_get_initialise_function;
-+STORE_method_get_list_end_function;
-+STORE_method_get_list_next_function;
-+STORE_method_get_list_start_function;
-+STORE_method_get_lock_store_function;
-+STORE_method_get_modify_function;
-+STORE_method_get_revoke_function;
-+STORE_method_get_store_function;
-+STORE_method_get_unlock_store_function;
-+STORE_method_get_update_store_function;
-+STORE_method_set_cleanup_function;
-+STORE_method_set_ctrl_function;
-+STORE_method_set_delete_function;
-+STORE_method_set_generate_function;
-+STORE_method_set_get_function;
-+STORE_method_set_initialise_function;
-+STORE_method_set_list_end_function;
-+STORE_method_set_list_next_function;
-+STORE_method_set_list_start_function;
-+STORE_method_set_lock_store_function;
-+STORE_method_set_modify_function;
-+STORE_method_set_revoke_function;
-+STORE_method_set_store_function;
-+STORE_method_set_unlock_store_function;
-+STORE_method_set_update_store_function;
-+STORE_modify_arbitrary;
-+STORE_modify_certificate;
-+STORE_modify_crl;
-+STORE_modify_number;
-+STORE_modify_private_key;
-+STORE_modify_public_key;
-+STORE_new_engine;
-+STORE_new_method;
-+STORE_object_type_string;
-+STORE_param_sizes;
-+STORE_parse_attrs_end;
-+STORE_parse_attrs_endp;
-+STORE_parse_attrs_next;
-+STORE_parse_attrs_start;
-+STORE_revoke_certificate;
-+STORE_revoke_private_key;
-+STORE_revoke_public_key;
-+STORE_set_ex_data;
-+STORE_set_method;
-+STORE_store_arbitrary;
-+STORE_store_certificate;
-+STORE_store_crl;
-+STORE_store_number;
-+STORE_store_private_key;
-+STORE_store_public_key;
-+SXNETID_free;
-+SXNETID_it;
-+SXNETID_new;
-+SXNET_add_id_INTEGER;
-+SXNET_add_id_asc;
-+SXNET_add_id_ulong;
-+SXNET_free;
-+SXNET_get_id_INTEGER;
-+SXNET_get_id_asc;
-+SXNET_get_id_ulong;
-+SXNET_it;
-+SXNET_new;
-+TXT_DB_create_index;
-+TXT_DB_free;
-+TXT_DB_get_by_index;
-+TXT_DB_insert;
-+TXT_DB_read;
-+TXT_DB_version;
-+TXT_DB_write;
-+UI_OpenSSL;
-+UI_UTIL_read_pw;
-+UI_UTIL_read_pw_string;
-+UI_add_error_string;
-+UI_add_info_string;
-+UI_add_input_boolean;
-+UI_add_input_string;
-+UI_add_user_data;
-+UI_add_verify_string;
-+UI_construct_prompt;
-+UI_create_method;
-+UI_ctrl;
-+UI_destroy_method;
-+UI_dup_error_string;
-+UI_dup_info_string;
-+UI_dup_input_boolean;
-+UI_dup_input_string;
-+UI_dup_verify_string;
-+UI_free;
-+UI_get0_action_string;
-+UI_get0_output_string;
-+UI_get0_result;
-+UI_get0_result_string;
-+UI_get0_test_string;
-+UI_get0_user_data;
-+UI_get_default_method;
-+UI_get_ex_data;
-+UI_get_ex_new_index;
-+UI_get_input_flags;
-+UI_get_method;
-+UI_get_result_maxsize;
-+UI_get_result_minsize;
-+UI_get_string_type;
-+UI_method_get_closer;
-+UI_method_get_flusher;
-+UI_method_get_opener;
-+UI_method_get_reader;
-+UI_method_get_writer;
-+UI_method_set_closer;
-+UI_method_set_flusher;
-+UI_method_set_opener;
-+UI_method_set_reader;
-+UI_method_set_writer;
-+UI_new;
-+UI_new_method;
-+UI_process;
-+UI_set_default_method;
-+UI_set_ex_data;
-+UI_set_method;
-+UI_set_result;
-+USERNOTICE_free;
-+USERNOTICE_it;
-+USERNOTICE_new;
-+UTF8_getc;
-+UTF8_putc;
-+X509V3_EXT_CRL_add_conf;
-+X509V3_EXT_CRL_add_nconf;
-+X509V3_EXT_REQ_add_conf;
-+X509V3_EXT_REQ_add_nconf;
-+X509V3_EXT_add;
-+X509V3_EXT_add_alias;
-+X509V3_EXT_add_conf;
-+X509V3_EXT_add_list;
-+X509V3_EXT_add_nconf;
-+X509V3_EXT_add_nconf_sk;
-+X509V3_EXT_cleanup;
-+X509V3_EXT_conf;
-+X509V3_EXT_conf_nid;
-+X509V3_EXT_d2i;
-+X509V3_EXT_get;
-+X509V3_EXT_get_nid;
-+X509V3_EXT_i2d;
-+X509V3_EXT_nconf;
-+X509V3_EXT_nconf_nid;
-+X509V3_EXT_print;
-+X509V3_EXT_print_fp;
-+X509V3_EXT_val_prn;
-+X509V3_NAME_from_section;
-+X509V3_add1_i2d;
-+X509V3_add_standard_extensions;
-+X509V3_add_value;
-+X509V3_add_value_bool;
-+X509V3_add_value_bool_nf;
-+X509V3_add_value_int;
-+X509V3_add_value_uchar;
-+X509V3_conf_free;
-+X509V3_extensions_print;
-+X509V3_get_d2i;
-+X509V3_get_section;
-+X509V3_get_string;
-+X509V3_get_value_bool;
-+X509V3_get_value_int;
-+X509V3_parse_list;
-+X509V3_section_free;
-+X509V3_set_conf_lhash;
-+X509V3_set_ctx;
-+X509V3_set_nconf;
-+X509V3_string_free;
-+X509_ALGOR_dup;
-+X509_ALGOR_free;
-+X509_ALGOR_it;
-+X509_ALGOR_new;
-+X509_ATTRIBUTE_SET_it;
-+X509_ATTRIBUTE_count;
-+X509_ATTRIBUTE_create;
-+X509_ATTRIBUTE_create_by_NID;
-+X509_ATTRIBUTE_create_by_OBJ;
-+X509_ATTRIBUTE_create_by_txt;
-+X509_ATTRIBUTE_dup;
-+X509_ATTRIBUTE_free;
-+X509_ATTRIBUTE_get0_data;
-+X509_ATTRIBUTE_get0_object;
-+X509_ATTRIBUTE_get0_type;
-+X509_ATTRIBUTE_it;
-+X509_ATTRIBUTE_new;
-+X509_ATTRIBUTE_set1_data;
-+X509_ATTRIBUTE_set1_object;
-+X509_CERT_AUX_free;
-+X509_CERT_AUX_it;
-+X509_CERT_AUX_new;
-+X509_CERT_AUX_print;
-+X509_CERT_PAIR_free;
-+X509_CERT_PAIR_it;
-+X509_CERT_PAIR_new;
-+X509_CINF_free;
-+X509_CINF_it;
-+X509_CINF_new;
-+X509_CRL_INFO_free;
-+X509_CRL_INFO_it;
-+X509_CRL_INFO_new;
-+X509_CRL_add0_revoked;
-+X509_CRL_add1_ext_i2d;
-+X509_CRL_add_ext;
-+X509_CRL_cmp;
-+X509_CRL_delete_ext;
-+X509_CRL_digest;
-+X509_CRL_dup;
-+X509_CRL_free;
-+X509_CRL_get_ext;
-+X509_CRL_get_ext_by_NID;
-+X509_CRL_get_ext_by_OBJ;
-+X509_CRL_get_ext_by_critical;
-+X509_CRL_get_ext_count;
-+X509_CRL_get_ext_d2i;
-+X509_CRL_it;
-+X509_CRL_new;
-+X509_CRL_print;
-+X509_CRL_print_fp;
-+X509_CRL_set_issuer_name;
-+X509_CRL_set_lastUpdate;
-+X509_CRL_set_nextUpdate;
-+X509_CRL_set_version;
-+X509_CRL_sign;
-+X509_CRL_sort;
-+X509_CRL_verify;
-+X509_EXTENSION_create_by_NID;
-+X509_EXTENSION_create_by_OBJ;
-+X509_EXTENSION_dup;
-+X509_EXTENSION_free;
-+X509_EXTENSION_get_critical;
-+X509_EXTENSION_get_data;
-+X509_EXTENSION_get_object;
-+X509_EXTENSION_it;
-+X509_EXTENSION_new;
-+X509_EXTENSION_set_critical;
-+X509_EXTENSION_set_data;
-+X509_EXTENSION_set_object;
-+X509_INFO_free;
-+X509_INFO_new;
-+X509_LOOKUP_by_alias;
-+X509_LOOKUP_by_fingerprint;
-+X509_LOOKUP_by_issuer_serial;
-+X509_LOOKUP_by_subject;
-+X509_LOOKUP_ctrl;
-+X509_LOOKUP_file;
-+X509_LOOKUP_free;
-+X509_LOOKUP_hash_dir;
-+X509_LOOKUP_init;
-+X509_LOOKUP_new;
-+X509_LOOKUP_shutdown;
-+X509_NAME_ENTRIES_it;
-+X509_NAME_ENTRY_create_by_NID;
-+X509_NAME_ENTRY_create_by_OBJ;
-+X509_NAME_ENTRY_create_by_txt;
-+X509_NAME_ENTRY_dup;
-+X509_NAME_ENTRY_free;
-+X509_NAME_ENTRY_get_data;
-+X509_NAME_ENTRY_get_object;
-+X509_NAME_ENTRY_it;
-+X509_NAME_ENTRY_new;
-+X509_NAME_ENTRY_set_data;
-+X509_NAME_ENTRY_set_object;
-+X509_NAME_INTERNAL_it;
-+X509_NAME_add_entry;
-+X509_NAME_add_entry_by_NID;
-+X509_NAME_add_entry_by_OBJ;
-+X509_NAME_add_entry_by_txt;
-+X509_NAME_cmp;
-+X509_NAME_delete_entry;
-+X509_NAME_digest;
-+X509_NAME_dup;
-+X509_NAME_entry_count;
-+X509_NAME_free;
-+X509_NAME_get_entry;
-+X509_NAME_get_index_by_NID;
-+X509_NAME_get_index_by_OBJ;
-+X509_NAME_get_text_by_NID;
-+X509_NAME_get_text_by_OBJ;
-+X509_NAME_hash;
-+X509_NAME_it;
-+X509_NAME_new;
-+X509_NAME_oneline;
-+X509_NAME_print;
-+X509_NAME_print_ex;
-+X509_NAME_print_ex_fp;
-+X509_NAME_set;
-+X509_OBJECT_free_contents;
-+X509_OBJECT_idx_by_subject;
-+X509_OBJECT_retrieve_by_subject;
-+X509_OBJECT_retrieve_match;
-+X509_OBJECT_up_ref_count;
-+X509_PKEY_free;
-+X509_PKEY_new;
-+X509_POLICY_NODE_print;
-+X509_PUBKEY_free;
-+X509_PUBKEY_get;
-+X509_PUBKEY_it;
-+X509_PUBKEY_new;
-+X509_PUBKEY_set;
-+X509_PURPOSE_add;
-+X509_PURPOSE_cleanup;
-+X509_PURPOSE_get0;
-+X509_PURPOSE_get0_name;
-+X509_PURPOSE_get0_sname;
-+X509_PURPOSE_get_by_id;
-+X509_PURPOSE_get_by_sname;
-+X509_PURPOSE_get_count;
-+X509_PURPOSE_get_id;
-+X509_PURPOSE_get_trust;
-+X509_PURPOSE_set;
-+X509_REQ_INFO_free;
-+X509_REQ_INFO_it;
-+X509_REQ_INFO_new;
-+X509_REQ_add1_attr;
-+X509_REQ_add1_attr_by_NID;
-+X509_REQ_add1_attr_by_OBJ;
-+X509_REQ_add1_attr_by_txt;
-+X509_REQ_add_extensions;
-+X509_REQ_add_extensions_nid;
-+X509_REQ_check_private_key;
-+X509_REQ_delete_attr;
-+X509_REQ_digest;
-+X509_REQ_dup;
-+X509_REQ_extension_nid;
-+X509_REQ_free;
-+X509_REQ_get1_email;
-+X509_REQ_get_attr;
-+X509_REQ_get_attr_by_NID;
-+X509_REQ_get_attr_by_OBJ;
-+X509_REQ_get_attr_count;
-+X509_REQ_get_extension_nids;
-+X509_REQ_get_extensions;
-+X509_REQ_get_pubkey;
-+X509_REQ_it;
-+X509_REQ_new;
-+X509_REQ_print;
-+X509_REQ_print_ex;
-+X509_REQ_print_fp;
-+X509_REQ_set_extension_nids;
-+X509_REQ_set_pubkey;
-+X509_REQ_set_subject_name;
-+X509_REQ_set_version;
-+X509_REQ_sign;
-+X509_REQ_to_X509;
-+X509_REQ_verify;
-+X509_REVOKED_add1_ext_i2d;
-+X509_REVOKED_add_ext;
-+X509_REVOKED_delete_ext;
-+X509_REVOKED_free;
-+X509_REVOKED_get_ext;
-+X509_REVOKED_get_ext_by_NID;
-+X509_REVOKED_get_ext_by_OBJ;
-+X509_REVOKED_get_ext_by_critical;
-+X509_REVOKED_get_ext_count;
-+X509_REVOKED_get_ext_d2i;
-+X509_REVOKED_it;
-+X509_REVOKED_new;
-+X509_REVOKED_set_revocationDate;
-+X509_REVOKED_set_serialNumber;
-+X509_SIG_free;
-+X509_SIG_it;
-+X509_SIG_new;
-+X509_STORE_CTX_cleanup;
-+X509_STORE_CTX_free;
-+X509_STORE_CTX_get0_param;
-+X509_STORE_CTX_get0_policy_tree;
-+X509_STORE_CTX_get1_chain;
-+X509_STORE_CTX_get1_issuer;
-+X509_STORE_CTX_get_chain;
-+X509_STORE_CTX_get_current_cert;
-+X509_STORE_CTX_get_error;
-+X509_STORE_CTX_get_error_depth;
-+X509_STORE_CTX_get_ex_data;
-+X509_STORE_CTX_get_ex_new_index;
-+X509_STORE_CTX_get_explicit_policy;
-+X509_STORE_CTX_init;
-+X509_STORE_CTX_new;
-+X509_STORE_CTX_purpose_inherit;
-+X509_STORE_CTX_set0_crls;
-+X509_STORE_CTX_set0_param;
-+X509_STORE_CTX_set_cert;
-+X509_STORE_CTX_set_chain;
-+X509_STORE_CTX_set_default;
-+X509_STORE_CTX_set_depth;
-+X509_STORE_CTX_set_error;
-+X509_STORE_CTX_set_ex_data;
-+X509_STORE_CTX_set_flags;
-+X509_STORE_CTX_set_purpose;
-+X509_STORE_CTX_set_time;
-+X509_STORE_CTX_set_trust;
-+X509_STORE_CTX_set_verify_cb;
-+X509_STORE_CTX_trusted_stack;
-+X509_STORE_add_cert;
-+X509_STORE_add_crl;
-+X509_STORE_add_lookup;
-+X509_STORE_free;
-+X509_STORE_get_by_subject;
-+X509_STORE_load_locations;
-+X509_STORE_new;
-+X509_STORE_set1_param;
-+X509_STORE_set_default_paths;
-+X509_STORE_set_depth;
-+X509_STORE_set_flags;
-+X509_STORE_set_purpose;
-+X509_STORE_set_trust;
-+X509_TRUST_add;
-+X509_TRUST_cleanup;
-+X509_TRUST_get0;
-+X509_TRUST_get0_name;
-+X509_TRUST_get_by_id;
-+X509_TRUST_get_count;
-+X509_TRUST_get_flags;
-+X509_TRUST_get_trust;
-+X509_TRUST_set;
-+X509_TRUST_set_default;
-+X509_VAL_free;
-+X509_VAL_it;
-+X509_VAL_new;
-+X509_VERIFY_PARAM_add0_policy;
-+X509_VERIFY_PARAM_add0_table;
-+X509_VERIFY_PARAM_clear_flags;
-+X509_VERIFY_PARAM_free;
-+X509_VERIFY_PARAM_get_depth;
-+X509_VERIFY_PARAM_get_flags;
-+X509_VERIFY_PARAM_inherit;
-+X509_VERIFY_PARAM_lookup;
-+X509_VERIFY_PARAM_new;
-+X509_VERIFY_PARAM_set1;
-+X509_VERIFY_PARAM_set1_name;
-+X509_VERIFY_PARAM_set1_policies;
-+X509_VERIFY_PARAM_set_depth;
-+X509_VERIFY_PARAM_set_flags;
-+X509_VERIFY_PARAM_set_purpose;
-+X509_VERIFY_PARAM_set_time;
-+X509_VERIFY_PARAM_set_trust;
-+X509_VERIFY_PARAM_table_cleanup;
-+X509_add1_ext_i2d;
-+X509_add1_reject_object;
-+X509_add1_trust_object;
-+X509_add_ext;
-+X509_alias_get0;
-+X509_alias_set1;
-+X509_asn1_meth;
-+X509_certificate_type;
-+X509_check_ca;
-+X509_check_issued;
-+X509_check_private_key;
-+X509_check_purpose;
-+X509_check_trust;
-+X509_cmp;
-+X509_cmp_current_time;
-+X509_cmp_time;
-+X509_delete_ext;
-+X509_digest;
-+X509_dup;
-+X509_email_free;
-+X509_find_by_issuer_and_serial;
-+X509_find_by_subject;
-+X509_free;
-+X509_get0_pubkey_bitstr;
-+X509_get1_email;
-+X509_get_default_cert_area;
-+X509_get_default_cert_dir;
-+X509_get_default_cert_dir_env;
-+X509_get_default_cert_file;
-+X509_get_default_cert_file_env;
-+X509_get_default_private_dir;
-+X509_get_ex_data;
-+X509_get_ex_new_index;
-+X509_get_ext;
-+X509_get_ext_by_NID;
-+X509_get_ext_by_OBJ;
-+X509_get_ext_by_critical;
-+X509_get_ext_count;
-+X509_get_ext_d2i;
-+X509_get_issuer_name;
-+X509_get_pubkey;
-+X509_get_pubkey_parameters;
-+X509_get_serialNumber;
-+X509_get_subject_name;
-+X509_gmtime_adj;
-+X509_issuer_and_serial_cmp;
-+X509_issuer_and_serial_hash;
-+X509_issuer_name_cmp;
-+X509_issuer_name_hash;
-+X509_it;
-+X509_keyid_get0;
-+X509_keyid_set1;
-+X509_load_cert_crl_file;
-+X509_load_cert_file;
-+X509_load_crl_file;
-+X509_new;
-+X509_ocspid_print;
-+X509_policy_check;
-+X509_policy_level_get0_node;
-+X509_policy_level_node_count;
-+X509_policy_node_get0_parent;
-+X509_policy_node_get0_policy;
-+X509_policy_node_get0_qualifiers;
-+X509_policy_tree_free;
-+X509_policy_tree_get0_level;
-+X509_policy_tree_get0_policies;
-+X509_policy_tree_get0_user_policies;
-+X509_policy_tree_level_count;
-+X509_print;
-+X509_print_ex;
-+X509_print_ex_fp;
-+X509_print_fp;
-+X509_pubkey_digest;
-+X509_reject_clear;
-+X509_set_ex_data;
-+X509_set_issuer_name;
-+X509_set_notAfter;
-+X509_set_notBefore;
-+X509_set_pubkey;
-+X509_set_serialNumber;
-+X509_set_subject_name;
-+X509_set_version;
-+X509_sign;
-+X509_signature_print;
-+X509_subject_name_cmp;
-+X509_subject_name_hash;
-+X509_supported_extension;
-+X509_time_adj;
-+X509_to_X509_REQ;
-+X509_trust_clear;
-+X509_verify;
-+X509_verify_cert;
-+X509_verify_cert_error_string;
-+X509_version;
-+X509at_add1_attr;
-+X509at_add1_attr_by_NID;
-+X509at_add1_attr_by_OBJ;
-+X509at_add1_attr_by_txt;
-+X509at_delete_attr;
-+X509at_get_attr;
-+X509at_get_attr_by_NID;
-+X509at_get_attr_by_OBJ;
-+X509at_get_attr_count;
-+X509v3_add_ext;
-+X509v3_delete_ext;
-+X509v3_get_ext;
-+X509v3_get_ext_by_NID;
-+X509v3_get_ext_by_OBJ;
-+X509v3_get_ext_by_critical;
-+X509v3_get_ext_count;
-+X9_62_CHARACTERISTIC_TWO_free;
-+X9_62_CHARACTERISTIC_TWO_it;
-+X9_62_CHARACTERISTIC_TWO_new;
-+X9_62_CURVE_it;
-+X9_62_FIELDID_it;
-+X9_62_PENTANOMIAL_free;
-+X9_62_PENTANOMIAL_it;
-+X9_62_PENTANOMIAL_new;
-+ZLONG_it;
-+_CONF_add_string;
-+_CONF_free_data;
-+_CONF_get_section;
-+_CONF_get_section_values;
-+_CONF_get_string;
-+_CONF_new_data;
-+_CONF_new_section;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+_PROCEDURE_LINKAGE_TABLE_;
-+_des_crypt;
-+_edata;
-+_end;
-+_etext;
-+_fini;
-+_init;
-+_lib_version;
-+_ossl_096_des_random_seed;
-+_ossl_old_crypt;
-+_ossl_old_des_cbc_cksum;
-+_ossl_old_des_cbc_encrypt;
-+_ossl_old_des_cfb64_encrypt;
-+_ossl_old_des_cfb_encrypt;
-+_ossl_old_des_crypt;
-+_ossl_old_des_decrypt3;
-+_ossl_old_des_ecb3_encrypt;
-+_ossl_old_des_ecb_encrypt;
-+_ossl_old_des_ede3_cbc_encrypt;
-+_ossl_old_des_ede3_cfb64_encrypt;
-+_ossl_old_des_ede3_ofb64_encrypt;
-+_ossl_old_des_enc_read;
-+_ossl_old_des_enc_write;
-+_ossl_old_des_encrypt;
-+_ossl_old_des_encrypt2;
-+_ossl_old_des_encrypt3;
-+_ossl_old_des_fcrypt;
-+_ossl_old_des_is_weak_key;
-+_ossl_old_des_key_sched;
-+_ossl_old_des_ncbc_encrypt;
-+_ossl_old_des_ofb64_encrypt;
-+_ossl_old_des_ofb_encrypt;
-+_ossl_old_des_options;
-+_ossl_old_des_pcbc_encrypt;
-+_ossl_old_des_quad_cksum;
-+_ossl_old_des_random_key;
-+_ossl_old_des_random_seed;
-+_ossl_old_des_read_2passwords;
-+_ossl_old_des_read_password;
-+_ossl_old_des_read_pw;
-+_ossl_old_des_read_pw_string;
-+_ossl_old_des_set_key;
-+_ossl_old_des_set_odd_parity;
-+_ossl_old_des_string_to_2keys;
-+_ossl_old_des_string_to_key;
-+_ossl_old_des_xcbc_encrypt;
-+_ossl_old_des_xwhite_in2out;
-+_shadow_DES_check_key;
-+_shadow_DES_rw_mode;
-+a2d_ASN1_OBJECT;
-+a2i_ASN1_ENUMERATED;
-+a2i_ASN1_INTEGER;
-+a2i_ASN1_STRING;
-+a2i_IPADDRESS;
-+a2i_IPADDRESS_NC;
-+a2i_ipadd;
-+asc2uni;
-+asn1_Finish;
-+asn1_GetSequence;
-+asn1_add_error;
-+asn1_const_Finish;
-+asn1_do_adb;
-+asn1_do_lock;
-+asn1_enc_free;
-+asn1_enc_init;
-+asn1_enc_restore;
-+asn1_enc_save;
-+asn1_ex_c2i;
-+asn1_ex_i2c;
-+asn1_get_choice_selector;
-+asn1_get_field_ptr;
-+asn1_primitive_clear;
-+asn1_set_choice_selector;
-+bn_add_part_words;
-+bn_add_words;
-+bn_cmp_part_words;
-+bn_cmp_words;
-+bn_div_words;
-+bn_dup_expand;
-+bn_expand2;
-+bn_mul_add_words;
-+bn_mul_comba4;
-+bn_mul_comba8;
-+bn_mul_high;
-+bn_mul_low_normal;
-+bn_mul_low_recursive;
-+bn_mul_normal;
-+bn_mul_part_recursive;
-+bn_mul_recursive;
-+bn_mul_words;
-+bn_sqr_comba4;
-+bn_sqr_comba8;
-+bn_sqr_normal;
-+bn_sqr_recursive;
-+bn_sqr_words;
-+bn_sub_part_words;
-+bn_sub_words;
-+c2i_ASN1_BIT_STRING;
-+c2i_ASN1_INTEGER;
-+c2i_ASN1_OBJECT;
-+cleanse_ctr;
-+d2i_ACCESS_DESCRIPTION;
-+d2i_ASN1_BIT_STRING;
-+d2i_ASN1_BMPSTRING;
-+d2i_ASN1_BOOLEAN;
-+d2i_ASN1_ENUMERATED;
-+d2i_ASN1_GENERALIZEDTIME;
-+d2i_ASN1_GENERALSTRING;
-+d2i_ASN1_HEADER;
-+d2i_ASN1_IA5STRING;
-+d2i_ASN1_INTEGER;
-+d2i_ASN1_NULL;
-+d2i_ASN1_OBJECT;
-+d2i_ASN1_OCTET_STRING;
-+d2i_ASN1_PRINTABLE;
-+d2i_ASN1_PRINTABLESTRING;
-+d2i_ASN1_SET;
-+d2i_ASN1_T61STRING;
-+d2i_ASN1_TIME;
-+d2i_ASN1_TYPE;
-+d2i_ASN1_UINTEGER;
-+d2i_ASN1_UNIVERSALSTRING;
-+d2i_ASN1_UTCTIME;
-+d2i_ASN1_UTF8STRING;
-+d2i_ASN1_VISIBLESTRING;
-+d2i_ASN1_bytes;
-+d2i_ASN1_type_bytes;
-+d2i_AUTHORITY_INFO_ACCESS;
-+d2i_AUTHORITY_KEYID;
-+d2i_AutoPrivateKey;
-+d2i_BASIC_CONSTRAINTS;
-+d2i_CERTIFICATEPOLICIES;
-+d2i_CRL_DIST_POINTS;
-+d2i_DHparams;
-+d2i_DIRECTORYSTRING;
-+d2i_DISPLAYTEXT;
-+d2i_DIST_POINT;
-+d2i_DIST_POINT_NAME;
-+d2i_DSAPrivateKey;
-+d2i_DSAPrivateKey_bio;
-+d2i_DSAPrivateKey_fp;
-+d2i_DSAPublicKey;
-+d2i_DSA_PUBKEY;
-+d2i_DSA_PUBKEY_bio;
-+d2i_DSA_PUBKEY_fp;
-+d2i_DSA_SIG;
-+d2i_DSAparams;
-+d2i_ECDSA_SIG;
-+d2i_ECPKPARAMETERS;
-+d2i_ECPKParameters;
-+d2i_ECParameters;
-+d2i_ECPrivateKey;
-+d2i_ECPrivateKey_bio;
-+d2i_ECPrivateKey_fp;
-+d2i_EC_PRIVATEKEY;
-+d2i_EC_PUBKEY;
-+d2i_EC_PUBKEY_bio;
-+d2i_EC_PUBKEY_fp;
-+d2i_EDIPARTYNAME;
-+d2i_EXTENDED_KEY_USAGE;
-+d2i_GENERAL_NAME;
-+d2i_GENERAL_NAMES;
-+d2i_KRB5_APREQ;
-+d2i_KRB5_APREQBODY;
-+d2i_KRB5_AUTHDATA;
-+d2i_KRB5_AUTHENT;
-+d2i_KRB5_AUTHENTBODY;
-+d2i_KRB5_CHECKSUM;
-+d2i_KRB5_ENCDATA;
-+d2i_KRB5_ENCKEY;
-+d2i_KRB5_PRINCNAME;
-+d2i_KRB5_TICKET;
-+d2i_KRB5_TKTBODY;
-+d2i_NETSCAPE_CERT_SEQUENCE;
-+d2i_NETSCAPE_ENCRYPTED_PKEY;
-+d2i_NETSCAPE_PKEY;
-+d2i_NETSCAPE_SPKAC;
-+d2i_NETSCAPE_SPKI;
-+d2i_NOTICEREF;
-+d2i_Netscape_RSA;
-+d2i_OCSP_BASICRESP;
-+d2i_OCSP_CERTID;
-+d2i_OCSP_CERTSTATUS;
-+d2i_OCSP_CRLID;
-+d2i_OCSP_ONEREQ;
-+d2i_OCSP_REQINFO;
-+d2i_OCSP_REQUEST;
-+d2i_OCSP_RESPBYTES;
-+d2i_OCSP_RESPDATA;
-+d2i_OCSP_RESPID;
-+d2i_OCSP_RESPONSE;
-+d2i_OCSP_REVOKEDINFO;
-+d2i_OCSP_SERVICELOC;
-+d2i_OCSP_SIGNATURE;
-+d2i_OCSP_SINGLERESP;
-+d2i_OTHERNAME;
-+d2i_PBE2PARAM;
-+d2i_PBEPARAM;
-+d2i_PBKDF2PARAM;
-+d2i_PKCS12;
-+d2i_PKCS12_BAGS;
-+d2i_PKCS12_MAC_DATA;
-+d2i_PKCS12_SAFEBAG;
-+d2i_PKCS12_bio;
-+d2i_PKCS12_fp;
-+d2i_PKCS7;
-+d2i_PKCS7_DIGEST;
-+d2i_PKCS7_ENCRYPT;
-+d2i_PKCS7_ENC_CONTENT;
-+d2i_PKCS7_ENVELOPE;
-+d2i_PKCS7_ISSUER_AND_SERIAL;
-+d2i_PKCS7_RECIP_INFO;
-+d2i_PKCS7_SIGNED;
-+d2i_PKCS7_SIGNER_INFO;
-+d2i_PKCS7_SIGN_ENVELOPE;
-+d2i_PKCS7_bio;
-+d2i_PKCS7_fp;
-+d2i_PKCS8PrivateKey_bio;
-+d2i_PKCS8PrivateKey_fp;
-+d2i_PKCS8_PRIV_KEY_INFO;
-+d2i_PKCS8_PRIV_KEY_INFO_bio;
-+d2i_PKCS8_PRIV_KEY_INFO_fp;
-+d2i_PKCS8_bio;
-+d2i_PKCS8_fp;
-+d2i_PKEY_USAGE_PERIOD;
-+d2i_POLICYINFO;
-+d2i_POLICYQUALINFO;
-+d2i_PROXY_CERT_INFO_EXTENSION;
-+d2i_PROXY_POLICY;
-+d2i_PUBKEY;
-+d2i_PUBKEY_bio;
-+d2i_PUBKEY_fp;
-+d2i_PrivateKey;
-+d2i_PrivateKey_bio;
-+d2i_PrivateKey_fp;
-+d2i_PublicKey;
-+d2i_RSAPrivateKey;
-+d2i_RSAPrivateKey_bio;
-+d2i_RSAPrivateKey_fp;
-+d2i_RSAPublicKey;
-+d2i_RSAPublicKey_bio;
-+d2i_RSAPublicKey_fp;
-+d2i_RSA_NET;
-+d2i_RSA_PUBKEY;
-+d2i_RSA_PUBKEY_bio;
-+d2i_RSA_PUBKEY_fp;
-+d2i_SXNET;
-+d2i_SXNETID;
-+d2i_USERNOTICE;
-+d2i_X509;
-+d2i_X509_ALGOR;
-+d2i_X509_ATTRIBUTE;
-+d2i_X509_AUX;
-+d2i_X509_CERT_AUX;
-+d2i_X509_CERT_PAIR;
-+d2i_X509_CINF;
-+d2i_X509_CRL;
-+d2i_X509_CRL_INFO;
-+d2i_X509_CRL_bio;
-+d2i_X509_CRL_fp;
-+d2i_X509_EXTENSION;
-+d2i_X509_NAME;
-+d2i_X509_NAME_ENTRY;
-+d2i_X509_PKEY;
-+d2i_X509_PUBKEY;
-+d2i_X509_REQ;
-+d2i_X509_REQ_INFO;
-+d2i_X509_REQ_bio;
-+d2i_X509_REQ_fp;
-+d2i_X509_REVOKED;
-+d2i_X509_SIG;
-+d2i_X509_VAL;
-+d2i_X509_bio;
-+d2i_X509_fp;
-+dsa_pub_internal_it;
-+ec_GF2m_have_precompute_mult;
-+ec_GF2m_precompute_mult;
-+ec_GF2m_simple_add;
-+ec_GF2m_simple_cmp;
-+ec_GF2m_simple_dbl;
-+ec_GF2m_simple_field_div;
-+ec_GF2m_simple_field_mul;
-+ec_GF2m_simple_field_sqr;
-+ec_GF2m_simple_group_check_discriminant;
-+ec_GF2m_simple_group_clear_finish;
-+ec_GF2m_simple_group_copy;
-+ec_GF2m_simple_group_finish;
-+ec_GF2m_simple_group_get_curve;
-+ec_GF2m_simple_group_get_degree;
-+ec_GF2m_simple_group_init;
-+ec_GF2m_simple_group_set_curve;
-+ec_GF2m_simple_invert;
-+ec_GF2m_simple_is_at_infinity;
-+ec_GF2m_simple_is_on_curve;
-+ec_GF2m_simple_make_affine;
-+ec_GF2m_simple_mul;
-+ec_GF2m_simple_oct2point;
-+ec_GF2m_simple_point2oct;
-+ec_GF2m_simple_point_clear_finish;
-+ec_GF2m_simple_point_copy;
-+ec_GF2m_simple_point_finish;
-+ec_GF2m_simple_point_get_affine_coordinates;
-+ec_GF2m_simple_point_init;
-+ec_GF2m_simple_point_set_affine_coordinates;
-+ec_GF2m_simple_point_set_to_infinity;
-+ec_GF2m_simple_points_make_affine;
-+ec_GF2m_simple_set_compressed_coordinates;
-+ec_GFp_mont_field_decode;
-+ec_GFp_mont_field_encode;
-+ec_GFp_mont_field_mul;
-+ec_GFp_mont_field_set_to_one;
-+ec_GFp_mont_field_sqr;
-+ec_GFp_mont_group_clear_finish;
-+ec_GFp_mont_group_copy;
-+ec_GFp_mont_group_finish;
-+ec_GFp_mont_group_init;
-+ec_GFp_mont_group_set_curve;
-+ec_GFp_nist_field_mul;
-+ec_GFp_nist_field_sqr;
-+ec_GFp_nist_group_copy;
-+ec_GFp_nist_group_set_curve;
-+ec_GFp_simple_add;
-+ec_GFp_simple_cmp;
-+ec_GFp_simple_dbl;
-+ec_GFp_simple_field_mul;
-+ec_GFp_simple_field_sqr;
-+ec_GFp_simple_get_Jprojective_coordinates_GFp;
-+ec_GFp_simple_group_check_discriminant;
-+ec_GFp_simple_group_clear_finish;
-+ec_GFp_simple_group_copy;
-+ec_GFp_simple_group_finish;
-+ec_GFp_simple_group_get_curve;
-+ec_GFp_simple_group_get_degree;
-+ec_GFp_simple_group_init;
-+ec_GFp_simple_group_set_curve;
-+ec_GFp_simple_invert;
-+ec_GFp_simple_is_at_infinity;
-+ec_GFp_simple_is_on_curve;
-+ec_GFp_simple_make_affine;
-+ec_GFp_simple_oct2point;
-+ec_GFp_simple_point2oct;
-+ec_GFp_simple_point_clear_finish;
-+ec_GFp_simple_point_copy;
-+ec_GFp_simple_point_finish;
-+ec_GFp_simple_point_get_affine_coordinates;
-+ec_GFp_simple_point_init;
-+ec_GFp_simple_point_set_affine_coordinates;
-+ec_GFp_simple_point_set_to_infinity;
-+ec_GFp_simple_points_make_affine;
-+ec_GFp_simple_set_Jprojective_coordinates_GFp;
-+ec_GFp_simple_set_compressed_coordinates;
-+ec_wNAF_have_precompute_mult;
-+ec_wNAF_mul;
-+ec_wNAF_precompute_mult;
-+ecdh_check;
-+ecdsa_check;
-+engine_cleanup_add_first;
-+engine_cleanup_add_last;
-+engine_free_util;
-+engine_set_all_null;
-+engine_table_cleanup;
-+engine_table_register;
-+engine_table_select;
-+engine_table_unregister;
-+engine_unlocked_finish;
-+engine_unlocked_init;
-+fcrypt_body;
-+get_rfc2409_prime_1024;
-+get_rfc2409_prime_768;
-+get_rfc3526_prime_1536;
-+get_rfc3526_prime_2048;
-+get_rfc3526_prime_3072;
-+get_rfc3526_prime_4096;
-+get_rfc3526_prime_6144;
-+get_rfc3526_prime_8192;
-+hex_to_string;
-+i2a_ACCESS_DESCRIPTION;
-+i2a_ASN1_ENUMERATED;
-+i2a_ASN1_INTEGER;
-+i2a_ASN1_OBJECT;
-+i2a_ASN1_STRING;
-+i2c_ASN1_BIT_STRING;
-+i2c_ASN1_INTEGER;
-+i2d_ACCESS_DESCRIPTION;
-+i2d_ASN1_BIT_STRING;
-+i2d_ASN1_BMPSTRING;
-+i2d_ASN1_BOOLEAN;
-+i2d_ASN1_ENUMERATED;
-+i2d_ASN1_GENERALIZEDTIME;
-+i2d_ASN1_GENERALSTRING;
-+i2d_ASN1_HEADER;
-+i2d_ASN1_IA5STRING;
-+i2d_ASN1_INTEGER;
-+i2d_ASN1_NULL;
-+i2d_ASN1_OBJECT;
-+i2d_ASN1_OCTET_STRING;
-+i2d_ASN1_PRINTABLE;
-+i2d_ASN1_PRINTABLESTRING;
-+i2d_ASN1_SET;
-+i2d_ASN1_T61STRING;
-+i2d_ASN1_TIME;
-+i2d_ASN1_TYPE;
-+i2d_ASN1_UNIVERSALSTRING;
-+i2d_ASN1_UTCTIME;
-+i2d_ASN1_UTF8STRING;
-+i2d_ASN1_VISIBLESTRING;
-+i2d_ASN1_bytes;
-+i2d_AUTHORITY_INFO_ACCESS;
-+i2d_AUTHORITY_KEYID;
-+i2d_BASIC_CONSTRAINTS;
-+i2d_CERTIFICATEPOLICIES;
-+i2d_CRL_DIST_POINTS;
-+i2d_DHparams;
-+i2d_DIRECTORYSTRING;
-+i2d_DISPLAYTEXT;
-+i2d_DIST_POINT;
-+i2d_DIST_POINT_NAME;
-+i2d_DSAPrivateKey;
-+i2d_DSAPrivateKey_bio;
-+i2d_DSAPrivateKey_fp;
-+i2d_DSAPublicKey;
-+i2d_DSA_PUBKEY;
-+i2d_DSA_PUBKEY_bio;
-+i2d_DSA_PUBKEY_fp;
-+i2d_DSA_SIG;
-+i2d_DSAparams;
-+i2d_ECDSA_SIG;
-+i2d_ECPKPARAMETERS;
-+i2d_ECPKParameters;
-+i2d_ECParameters;
-+i2d_ECPrivateKey;
-+i2d_ECPrivateKey_bio;
-+i2d_ECPrivateKey_fp;
-+i2d_EC_PRIVATEKEY;
-+i2d_EC_PUBKEY;
-+i2d_EC_PUBKEY_bio;
-+i2d_EC_PUBKEY_fp;
-+i2d_EDIPARTYNAME;
-+i2d_EXTENDED_KEY_USAGE;
-+i2d_GENERAL_NAME;
-+i2d_GENERAL_NAMES;
-+i2d_KRB5_APREQ;
-+i2d_KRB5_APREQBODY;
-+i2d_KRB5_AUTHDATA;
-+i2d_KRB5_AUTHENT;
-+i2d_KRB5_AUTHENTBODY;
-+i2d_KRB5_CHECKSUM;
-+i2d_KRB5_ENCDATA;
-+i2d_KRB5_ENCKEY;
-+i2d_KRB5_PRINCNAME;
-+i2d_KRB5_TICKET;
-+i2d_KRB5_TKTBODY;
-+i2d_NETSCAPE_CERT_SEQUENCE;
-+i2d_NETSCAPE_ENCRYPTED_PKEY;
-+i2d_NETSCAPE_PKEY;
-+i2d_NETSCAPE_SPKAC;
-+i2d_NETSCAPE_SPKI;
-+i2d_NOTICEREF;
-+i2d_Netscape_RSA;
-+i2d_OCSP_BASICRESP;
-+i2d_OCSP_CERTID;
-+i2d_OCSP_CERTSTATUS;
-+i2d_OCSP_CRLID;
-+i2d_OCSP_ONEREQ;
-+i2d_OCSP_REQINFO;
-+i2d_OCSP_REQUEST;
-+i2d_OCSP_RESPBYTES;
-+i2d_OCSP_RESPDATA;
-+i2d_OCSP_RESPID;
-+i2d_OCSP_RESPONSE;
-+i2d_OCSP_REVOKEDINFO;
-+i2d_OCSP_SERVICELOC;
-+i2d_OCSP_SIGNATURE;
-+i2d_OCSP_SINGLERESP;
-+i2d_OTHERNAME;
-+i2d_PBE2PARAM;
-+i2d_PBEPARAM;
-+i2d_PBKDF2PARAM;
-+i2d_PKCS12;
-+i2d_PKCS12_BAGS;
-+i2d_PKCS12_MAC_DATA;
-+i2d_PKCS12_SAFEBAG;
-+i2d_PKCS12_bio;
-+i2d_PKCS12_fp;
-+i2d_PKCS7;
-+i2d_PKCS7_DIGEST;
-+i2d_PKCS7_ENCRYPT;
-+i2d_PKCS7_ENC_CONTENT;
-+i2d_PKCS7_ENVELOPE;
-+i2d_PKCS7_ISSUER_AND_SERIAL;
-+i2d_PKCS7_NDEF;
-+i2d_PKCS7_RECIP_INFO;
-+i2d_PKCS7_SIGNED;
-+i2d_PKCS7_SIGNER_INFO;
-+i2d_PKCS7_SIGN_ENVELOPE;
-+i2d_PKCS7_bio;
-+i2d_PKCS7_fp;
-+i2d_PKCS8PrivateKeyInfo_bio;
-+i2d_PKCS8PrivateKeyInfo_fp;
-+i2d_PKCS8PrivateKey_bio;
-+i2d_PKCS8PrivateKey_fp;
-+i2d_PKCS8PrivateKey_nid_bio;
-+i2d_PKCS8PrivateKey_nid_fp;
-+i2d_PKCS8_PRIV_KEY_INFO;
-+i2d_PKCS8_PRIV_KEY_INFO_bio;
-+i2d_PKCS8_PRIV_KEY_INFO_fp;
-+i2d_PKCS8_bio;
-+i2d_PKCS8_fp;
-+i2d_PKEY_USAGE_PERIOD;
-+i2d_POLICYINFO;
-+i2d_POLICYQUALINFO;
-+i2d_PROXY_CERT_INFO_EXTENSION;
-+i2d_PROXY_POLICY;
-+i2d_PUBKEY;
-+i2d_PUBKEY_bio;
-+i2d_PUBKEY_fp;
-+i2d_PrivateKey;
-+i2d_PrivateKey_bio;
-+i2d_PrivateKey_fp;
-+i2d_PublicKey;
-+i2d_RSAPrivateKey;
-+i2d_RSAPrivateKey_bio;
-+i2d_RSAPrivateKey_fp;
-+i2d_RSAPublicKey;
-+i2d_RSAPublicKey_bio;
-+i2d_RSAPublicKey_fp;
-+i2d_RSA_NET;
-+i2d_RSA_PUBKEY;
-+i2d_RSA_PUBKEY_bio;
-+i2d_RSA_PUBKEY_fp;
-+i2d_SXNET;
-+i2d_SXNETID;
-+i2d_USERNOTICE;
-+i2d_X509;
-+i2d_X509_ALGOR;
-+i2d_X509_ATTRIBUTE;
-+i2d_X509_AUX;
-+i2d_X509_CERT_AUX;
-+i2d_X509_CERT_PAIR;
-+i2d_X509_CINF;
-+i2d_X509_CRL;
-+i2d_X509_CRL_INFO;
-+i2d_X509_CRL_bio;
-+i2d_X509_CRL_fp;
-+i2d_X509_EXTENSION;
-+i2d_X509_NAME;
-+i2d_X509_NAME_ENTRY;
-+i2d_X509_PKEY;
-+i2d_X509_PUBKEY;
-+i2d_X509_REQ;
-+i2d_X509_REQ_INFO;
-+i2d_X509_REQ_bio;
-+i2d_X509_REQ_fp;
-+i2d_X509_REVOKED;
-+i2d_X509_SIG;
-+i2d_X509_VAL;
-+i2d_X509_bio;
-+i2d_X509_fp;
-+i2o_ECPublicKey;
-+i2s_ASN1_ENUMERATED;
-+i2s_ASN1_ENUMERATED_TABLE;
-+i2s_ASN1_INTEGER;
-+i2s_ASN1_OCTET_STRING;
-+i2t_ASN1_OBJECT;
-+i2v_ASN1_BIT_STRING;
-+i2v_GENERAL_NAME;
-+i2v_GENERAL_NAMES;
-+idea_cbc_encrypt;
-+idea_cfb64_encrypt;
-+idea_ecb_encrypt;
-+idea_encrypt;
-+idea_ofb64_encrypt;
-+idea_options;
-+idea_set_decrypt_key;
-+idea_set_encrypt_key;
-+level_add_node;
-+level_find_node;
-+lh_delete;
-+lh_doall;
-+lh_doall_arg;
-+lh_free;
-+lh_insert;
-+lh_new;
-+lh_node_stats;
-+lh_node_stats_bio;
-+lh_node_usage_stats;
-+lh_node_usage_stats_bio;
-+lh_num_items;
-+lh_retrieve;
-+lh_stats;
-+lh_stats_bio;
-+lh_strhash;
-+lh_version;
-+md4_block_data_order;
-+md4_block_host_order;
-+md5_block_asm_data_order_aligned;
-+md5_block_data_order;
-+md5_block_host_order;
-+ms_time_cmp;
-+ms_time_diff;
-+ms_time_free;
-+ms_time_get;
-+ms_time_new;
-+name_cmp;
-+o2i_ECPublicKey;
-+pitem_free;
-+pitem_new;
-+policy_cache_find_data;
-+policy_cache_free;
-+policy_cache_set;
-+policy_cache_set_mapping;
-+policy_data_free;
-+policy_data_new;
-+policy_node_cmp_new;
-+policy_node_free;
-+pqueue_find;
-+pqueue_free;
-+pqueue_insert;
-+pqueue_iterator;
-+pqueue_new;
-+pqueue_next;
-+pqueue_peek;
-+pqueue_pop;
-+pqueue_print;
-+rand_ssleay_meth;
-+ripemd160_block_data_order;
-+ripemd160_block_host_order;
-+s2i_ASN1_INTEGER;
-+s2i_ASN1_OCTET_STRING;
-+sha1_block_data_order;
-+sha1_block_host_order;
-+sha256_block_data_order;
-+sha256_block_host_order;
-+sha_block_data_order;
-+sha_block_host_order;
-+sk_delete;
-+sk_delete_ptr;
-+sk_dup;
-+sk_find;
-+sk_find_ex;
-+sk_free;
-+sk_insert;
-+sk_is_sorted;
-+sk_new;
-+sk_new_null;
-+sk_num;
-+sk_pop;
-+sk_pop_free;
-+sk_push;
-+sk_set;
-+sk_set_cmp_func;
-+sk_shift;
-+sk_sort;
-+sk_unshift;
-+sk_value;
-+sk_zero;
-+string_to_hex;
-+tree_find_sk;
-+uni2asc;
-+v2i_ASN1_BIT_STRING;
-+v2i_GENERAL_NAME;
-+v2i_GENERAL_NAMES;
-+v2i_GENERAL_NAME_ex;
-+v3_akey_id;
-+v3_alt;
-+v3_bcons;
-+v3_cpols;
-+v3_crl_hold;
-+v3_crl_invdate;
-+v3_crl_num;
-+v3_crl_reason;
-+v3_crld;
-+v3_delta_crl;
-+v3_ext_ku;
-+v3_info;
-+v3_inhibit_anyp;
-+v3_key_usage;
-+v3_name_constraints;
-+v3_ns_ia5_list;
-+v3_nscert;
-+v3_ocsp_accresp;
-+v3_ocsp_acutoff;
-+v3_ocsp_crlid;
-+v3_ocsp_nocheck;
-+v3_ocsp_nonce;
-+v3_ocsp_serviceloc;
-+v3_pci;
-+v3_pkey_usage_period;
-+v3_policy_constraints;
-+v3_policy_mappings;
-+v3_sinfo;
-+v3_skey_id;
-+v3_sxnet;
-+x509_dir_lookup;
-+x509_file_lookup;
-+x509_name_ff;
-+	local:
-+		*;
-+};
-+
---- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map	Fri Mar 26 16:13:54 2010
-+++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map	Fri Mar 26 16:11:27 2010
-@@ -1,1 +1,446 @@
--dummy
-+LIBSSL_OOO_0_9_8o {
-+	global:
-+BIO_f_ssl;
-+BIO_new_buffer_ssl_connect;
-+BIO_new_ssl;
-+BIO_new_ssl_connect;
-+BIO_ssl_copy_session_id;
-+BIO_ssl_shutdown;
-+DTLSv1_client_method;
-+DTLSv1_enc_data;
-+DTLSv1_method;
-+DTLSv1_server_method;
-+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8o;
-+SSL_CIPHER_description;
-+SSL_CIPHER_get_bits;
-+SSL_CIPHER_get_name;
-+SSL_CIPHER_get_version;
-+SSL_COMP_add_compression_method;
-+SSL_COMP_get_compression_methods;
-+SSL_COMP_get_name;
-+SSL_CTX_add_client_CA;
-+SSL_CTX_add_session;
-+SSL_CTX_callback_ctrl;
-+SSL_CTX_check_private_key;
-+SSL_CTX_ctrl;
-+SSL_CTX_flush_sessions;
-+SSL_CTX_free;
-+SSL_CTX_get_cert_store;
-+SSL_CTX_get_client_CA_list;
-+SSL_CTX_get_client_cert_cb;
-+SSL_CTX_get_ex_data;
-+SSL_CTX_get_ex_new_index;
-+SSL_CTX_get_info_callback;
-+SSL_CTX_get_quiet_shutdown;
-+SSL_CTX_get_timeout;
-+SSL_CTX_get_verify_callback;
-+SSL_CTX_get_verify_depth;
-+SSL_CTX_get_verify_mode;
-+SSL_CTX_load_verify_locations;
-+SSL_CTX_new;
-+SSL_CTX_remove_session;
-+SSL_CTX_sess_get_get_cb;
-+SSL_CTX_sess_get_new_cb;
-+SSL_CTX_sess_get_remove_cb;
-+SSL_CTX_sess_set_get_cb;
-+SSL_CTX_sess_set_new_cb;
-+SSL_CTX_sess_set_remove_cb;
-+SSL_CTX_sessions;
-+SSL_CTX_set_cert_store;
-+SSL_CTX_set_cert_verify_callback;
-+SSL_CTX_set_cipher_list;
-+SSL_CTX_set_client_CA_list;
-+SSL_CTX_set_client_cert_cb;
-+SSL_CTX_set_cookie_generate_cb;
-+SSL_CTX_set_cookie_verify_cb;
-+SSL_CTX_set_default_passwd_cb;
-+SSL_CTX_set_default_passwd_cb_userdata;
-+SSL_CTX_set_default_verify_paths;
-+SSL_CTX_set_ex_data;
-+SSL_CTX_set_generate_session_id;
-+SSL_CTX_set_info_callback;
-+SSL_CTX_set_msg_callback;
-+SSL_CTX_set_purpose;
-+SSL_CTX_set_quiet_shutdown;
-+SSL_CTX_set_session_id_context;
-+SSL_CTX_set_ssl_version;
-+SSL_CTX_set_timeout;
-+SSL_CTX_set_tmp_dh_callback;
-+SSL_CTX_set_tmp_ecdh_callback;
-+SSL_CTX_set_tmp_rsa_callback;
-+SSL_CTX_set_trust;
-+SSL_CTX_set_verify;
-+SSL_CTX_set_verify_depth;
-+SSL_CTX_use_PrivateKey;
-+SSL_CTX_use_PrivateKey_ASN1;
-+SSL_CTX_use_PrivateKey_file;
-+SSL_CTX_use_RSAPrivateKey;
-+SSL_CTX_use_RSAPrivateKey_ASN1;
-+SSL_CTX_use_RSAPrivateKey_file;
-+SSL_CTX_use_certificate;
-+SSL_CTX_use_certificate_ASN1;
-+SSL_CTX_use_certificate_chain_file;
-+SSL_CTX_use_certificate_file;
-+SSL_SESSION_cmp;
-+SSL_SESSION_free;
-+SSL_SESSION_get_ex_data;
-+SSL_SESSION_get_ex_new_index;
-+SSL_SESSION_get_id;
-+SSL_SESSION_get_time;
-+SSL_SESSION_get_timeout;
-+SSL_SESSION_hash;
-+SSL_SESSION_new;
-+SSL_SESSION_print;
-+SSL_SESSION_print_fp;
-+SSL_SESSION_set_ex_data;
-+SSL_SESSION_set_time;
-+SSL_SESSION_set_timeout;
-+SSL_accept;
-+SSL_add_client_CA;
-+SSL_add_dir_cert_subjects_to_stack;
-+SSL_add_file_cert_subjects_to_stack;
-+SSL_alert_desc_string;
-+SSL_alert_desc_string_long;
-+SSL_alert_type_string;
-+SSL_alert_type_string_long;
-+SSL_callback_ctrl;
-+SSL_check_private_key;
-+SSL_clear;
-+SSL_connect;
-+SSL_copy_session_id;
-+SSL_ctrl;
-+SSL_do_handshake;
-+SSL_dup;
-+SSL_dup_CA_list;
-+SSL_free;
-+SSL_get1_session;
-+SSL_get_SSL_CTX;
-+SSL_get_certificate;
-+SSL_get_cipher_list;
-+SSL_get_ciphers;
-+SSL_get_client_CA_list;
-+SSL_get_current_cipher;
-+SSL_get_current_compression;
-+SSL_get_current_expansion;
-+SSL_get_default_timeout;
-+SSL_get_error;
-+SSL_get_ex_data;
-+SSL_get_ex_data_X509_STORE_CTX_idx;
-+SSL_get_ex_new_index;
-+SSL_get_fd;
-+SSL_get_finished;
-+SSL_get_info_callback;
-+SSL_get_peer_cert_chain;
-+SSL_get_peer_certificate;
-+SSL_get_peer_finished;
-+SSL_get_privatekey;
-+SSL_get_quiet_shutdown;
-+SSL_get_rbio;
-+SSL_get_read_ahead;
-+SSL_get_rfd;
-+SSL_get_session;
-+SSL_get_shared_ciphers;
-+SSL_get_shutdown;
-+SSL_get_ssl_method;
-+SSL_get_verify_callback;
-+SSL_get_verify_depth;
-+SSL_get_verify_mode;
-+SSL_get_verify_result;
-+SSL_get_version;
-+SSL_get_wbio;
-+SSL_get_wfd;
-+SSL_has_matching_session_id;
-+SSL_library_init;
-+SSL_load_client_CA_file;
-+SSL_load_error_strings;
-+SSL_new;
-+SSL_peek;
-+SSL_pending;
-+SSL_read;
-+SSL_renegotiate;
-+SSL_renegotiate_pending;
-+SSL_rstate_string;
-+SSL_rstate_string_long;
-+SSL_set_accept_state;
-+SSL_set_bio;
-+SSL_set_cipher_list;
-+SSL_set_client_CA_list;
-+SSL_set_connect_state;
-+SSL_set_ex_data;
-+SSL_set_fd;
-+SSL_set_generate_session_id;
-+SSL_set_info_callback;
-+SSL_set_msg_callback;
-+SSL_set_purpose;
-+SSL_set_quiet_shutdown;
-+SSL_set_read_ahead;
-+SSL_set_rfd;
-+SSL_set_session;
-+SSL_set_session_id_context;
-+SSL_set_shutdown;
-+SSL_set_ssl_method;
-+SSL_set_tmp_dh_callback;
-+SSL_set_tmp_ecdh_callback;
-+SSL_set_tmp_rsa_callback;
-+SSL_set_trust;
-+SSL_set_verify;
-+SSL_set_verify_depth;
-+SSL_set_verify_result;
-+SSL_set_wfd;
-+SSL_shutdown;
-+SSL_state;
-+SSL_state_string;
-+SSL_state_string_long;
-+SSL_use_PrivateKey;
-+SSL_use_PrivateKey_ASN1;
-+SSL_use_PrivateKey_file;
-+SSL_use_RSAPrivateKey;
-+SSL_use_RSAPrivateKey_ASN1;
-+SSL_use_RSAPrivateKey_file;
-+SSL_use_certificate;
-+SSL_use_certificate_ASN1;
-+SSL_use_certificate_file;
-+SSL_version;
-+SSL_version_str;
-+SSL_want;
-+SSL_write;
-+SSLv23_client_method;
-+SSLv23_method;
-+SSLv23_server_method;
-+SSLv2_client_method;
-+SSLv2_method;
-+SSLv2_server_method;
-+SSLv3_client_method;
-+SSLv3_enc_data;
-+SSLv3_method;
-+SSLv3_server_method;
-+TLSv1_client_method;
-+TLSv1_enc_data;
-+TLSv1_method;
-+TLSv1_server_method;
-+_DYNAMIC;
-+_GLOBAL_OFFSET_TABLE_;
-+_PROCEDURE_LINKAGE_TABLE_;
-+_edata;
-+_end;
-+_etext;
-+_fini;
-+_init;
-+_lib_version;
-+check_srvr_ecc_cert_and_alg;
-+d2i_SSL_SESSION;
-+do_dtls1_write;
-+dtls1_accept;
-+dtls1_buffer_message;
-+dtls1_clear;
-+dtls1_clear_record_buffer;
-+dtls1_client_hello;
-+dtls1_connect;
-+dtls1_default_timeout;
-+dtls1_dispatch_alert;
-+dtls1_do_write;
-+dtls1_enc;
-+dtls1_free;
-+dtls1_get_ccs_header;
-+dtls1_get_message;
-+dtls1_get_message_header;
-+dtls1_get_record;
-+dtls1_new;
-+dtls1_output_cert_chain;
-+dtls1_read_bytes;
-+dtls1_read_failed;
-+dtls1_reset_seq_numbers;
-+dtls1_retransmit_message;
-+dtls1_send_certificate_request;
-+dtls1_send_change_cipher_spec;
-+dtls1_send_client_certificate;
-+dtls1_send_client_key_exchange;
-+dtls1_send_client_verify;
-+dtls1_send_finished;
-+dtls1_send_hello_request;
-+dtls1_send_server_certificate;
-+dtls1_send_server_done;
-+dtls1_send_server_hello;
-+dtls1_send_server_key_exchange;
-+dtls1_set_message_header;
-+dtls1_version_str;
-+dtls1_write_app_data_bytes;
-+dtls1_write_bytes;
-+dtlsv1_base_method;
-+i2d_SSL_SESSION;
-+ssl23_accept;
-+ssl23_connect;
-+ssl23_default_timeout;
-+ssl23_get_cipher;
-+ssl23_get_cipher_by_char;
-+ssl23_get_client_hello;
-+ssl23_num_ciphers;
-+ssl23_peek;
-+ssl23_put_cipher_by_char;
-+ssl23_read;
-+ssl23_read_bytes;
-+ssl23_write;
-+ssl23_write_bytes;
-+ssl2_accept;
-+ssl2_callback_ctrl;
-+ssl2_ciphers;
-+ssl2_clear;
-+ssl2_connect;
-+ssl2_ctrl;
-+ssl2_ctx_callback_ctrl;
-+ssl2_ctx_ctrl;
-+ssl2_default_timeout;
-+ssl2_do_write;
-+ssl2_enc;
-+ssl2_enc_init;
-+ssl2_free;
-+ssl2_generate_key_material;
-+ssl2_get_cipher;
-+ssl2_get_cipher_by_char;
-+ssl2_mac;
-+ssl2_new;
-+ssl2_num_ciphers;
-+ssl2_part_read;
-+ssl2_peek;
-+ssl2_pending;
-+ssl2_put_cipher_by_char;
-+ssl2_read;
-+ssl2_return_error;
-+ssl2_set_certificate;
-+ssl2_shutdown;
-+ssl2_version_str;
-+ssl2_write;
-+ssl2_write_error;
-+ssl3_accept;
-+ssl3_alert_code;
-+ssl3_callback_ctrl;
-+ssl3_cert_verify_mac;
-+ssl3_change_cipher_state;
-+ssl3_check_cert_and_algorithm;
-+ssl3_check_client_hello;
-+ssl3_choose_cipher;
-+ssl3_ciphers;
-+ssl3_cleanup_key_block;
-+ssl3_clear;
-+ssl3_client_hello;
-+ssl3_comp_find;
-+ssl3_connect;
-+ssl3_ctrl;
-+ssl3_ctx_callback_ctrl;
-+ssl3_ctx_ctrl;
-+ssl3_default_timeout;
-+ssl3_dispatch_alert;
-+ssl3_do_change_cipher_spec;
-+ssl3_do_compress;
-+ssl3_do_uncompress;
-+ssl3_do_write;
-+ssl3_enc;
-+ssl3_final_finish_mac;
-+ssl3_finish_mac;
-+ssl3_free;
-+ssl3_generate_master_secret;
-+ssl3_get_cert_verify;
-+ssl3_get_certificate_request;
-+ssl3_get_cipher;
-+ssl3_get_cipher_by_char;
-+ssl3_get_client_certificate;
-+ssl3_get_client_hello;
-+ssl3_get_client_key_exchange;
-+ssl3_get_finished;
-+ssl3_get_key_exchange;
-+ssl3_get_message;
-+ssl3_get_req_cert_type;
-+ssl3_get_server_certificate;
-+ssl3_get_server_done;
-+ssl3_get_server_hello;
-+ssl3_init_finished_mac;
-+ssl3_mac;
-+ssl3_new;
-+ssl3_num_ciphers;
-+ssl3_output_cert_chain;
-+ssl3_peek;
-+ssl3_pending;
-+ssl3_put_cipher_by_char;
-+ssl3_read;
-+ssl3_read_bytes;
-+ssl3_read_n;
-+ssl3_record_sequence_update;
-+ssl3_renegotiate;
-+ssl3_renegotiate_check;
-+ssl3_send_alert;
-+ssl3_send_certificate_request;
-+ssl3_send_change_cipher_spec;
-+ssl3_send_client_certificate;
-+ssl3_send_client_key_exchange;
-+ssl3_send_client_verify;
-+ssl3_send_finished;
-+ssl3_send_hello_request;
-+ssl3_send_server_certificate;
-+ssl3_send_server_done;
-+ssl3_send_server_hello;
-+ssl3_send_server_key_exchange;
-+ssl3_setup_buffers;
-+ssl3_setup_key_block;
-+ssl3_shutdown;
-+ssl3_undef_enc_method;
-+ssl3_version_str;
-+ssl3_write;
-+ssl3_write_bytes;
-+ssl3_write_pending;
-+ssl_bad_method;
-+ssl_bytes_to_cipher_list;
-+ssl_cert_dup;
-+ssl_cert_free;
-+ssl_cert_inst;
-+ssl_cert_new;
-+ssl_cert_type;
-+ssl_cipher_get_disabled;
-+ssl_cipher_get_evp;
-+ssl_cipher_id_cmp;
-+ssl_cipher_list_to_bytes;
-+ssl_cipher_ptr_id_cmp;
-+ssl_clear_bad_session;
-+ssl_clear_cipher_ctx;
-+ssl_create_cipher_list;
-+ssl_free_wbio_buffer;
-+ssl_get_ciphers_by_id;
-+ssl_get_new_session;
-+ssl_get_prev_session;
-+ssl_get_server_send_cert;
-+ssl_get_sign_pkey;
-+ssl_init_wbio_buffer;
-+ssl_load_ciphers;
-+ssl_ok;
-+ssl_sess_cert_free;
-+ssl_sess_cert_new;
-+ssl_set_cert_masks;
-+ssl_set_peer_cert_type;
-+ssl_undefined_const_function;
-+ssl_undefined_function;
-+ssl_undefined_void_function;
-+ssl_update_cache;
-+ssl_verify_alarm_type;
-+ssl_verify_cert_chain;
-+sslv23_base_method;
-+sslv2_base_method;
-+sslv3_base_method;
-+tls1_alert_code;
-+tls1_cert_verify_mac;
-+tls1_change_cipher_state;
-+tls1_clear;
-+tls1_default_timeout;
-+tls1_enc;
-+tls1_final_finish_mac;
-+tls1_free;
-+tls1_generate_master_secret;
-+tls1_mac;
-+tls1_new;
-+tls1_setup_key_block;
-+tls1_version_str;
-+tlsv1_base_method;
-+	local:
-+		*;
-+};
-+
-+
diff --git a/openssl/prj/build.lst b/openssl/prj/build.lst
deleted file mode 100644
index 756d0ed..0000000
--- a/openssl/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-ssl      openssl  :  soltools external EXPAT:expat NULL
-ssl      openssl     usr1           -       all     ssl_mkout NULL
-ssl      openssl     nmake          -       all     ssl_openssl NULL 
diff --git a/openssl/prj/d.lst b/openssl/prj/d.lst
deleted file mode 100644
index 109bbaa..0000000
--- a/openssl/prj/d.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\openssl
-..\version.mk %_DEST%\inc\external\openssl\version.mk
-..\%__SRC%\inc\*.h %_DEST%\inc\external\openssl
-..\%__SRC%\lib\ssleay32.lib %_DEST%\lib\ssleay32.lib
-..\%__SRC%\bin\ssleay32.dll %_DEST%\bin\ssleay32.dll
-..\%__SRC%\lib\libeay32.lib %_DEST%\lib\libeay32.lib
-..\%__SRC%\bin\libeay32.dll %_DEST%\bin\libeay32.dll
-..\%__SRC%\lib\libcrypto.a %_DEST%\lib\libcrypto.a
-..\%__SRC%\lib\libssl.a %_DEST%\lib\libssl.a
- 
diff --git a/openssl/version.mk b/openssl/version.mk
deleted file mode 100644
index 613f65a..0000000
--- a/openssl/version.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-OPENSSL_VERSION=0.9.8o
-
-.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8o
-.ENDIF
-\ No newline at end of file
diff --git a/redland/LICENSE.txt b/redland/LICENSE.txt
deleted file mode 100644
index a3a5fa8..0000000
--- a/redland/LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-LGPL Disclaimer
-
-For the avoidance of doubt, except that if any license choice other 
-than GPL or LGPL is available it will apply instead, Sun elects to 
-use only the Lesser General Public License version 2.1 (LGPLv2) at 
-this time for any software where a choice of LGPL license versions 
-is made available with the language indicating that LGPLv2.1 or any 
-later version may be used, or where a choice of which version of the 
-LGPL is applied is otherwise unspecified.
-
diff --git a/redland/README b/redland/README
deleted file mode 100644
index 87299eb..0000000
--- a/redland/README
+++ /dev/null
@@ -1,38 +0,0 @@
-Redland RDF library (librdf)
-
-Module: external/redland
-
-Upstream URL: http://librdf.org/
-
-License: Triple-licensed: LGPL v2+/GPL v2+/Apache v2
-         Note that Sun distributes this software only under LGPL v2
-         (see LICENSE.txt)
-
-Description:
-This module contains the third-party Redland RDF / librdf library, which
-is needed to support data in RDF (Resource Description Framework) format.
-It consists of 3 parts:
-- raptor:  parsers and serializers for numerous RDF file formats
-- rasqal:  query engine which supports SPARQL queries
-- redland: librdf integrates raptor and rasqal, and provides numerous storage
-           engines for storing RDF graphs (in memory, SQL, ...)
-
-Libraries: libraptor, librasqal, librdf
-
-Patches:
-There are several patches, most of which contain only hacks to get it to
-build with OOo build system.
-There used to be also 3 patches here that fix bugs in redland and ought to be
-of general interest:
-- redland-1.0.8.patch.free_null:
-  redland destructor functions don't check if argument is NULL
-- redland-1.0.8.patch.storage_hashes_context_serialize_get_statement:
-  hashes storage: the function to create statements during serialization does
-                  not fill in the context propery (i.e. context is NULL)
-- redland-1.0.8.patch.storage_hashes_list_duplicates:
-  hashes, list storage: if contexts are enabled, then it is possible to add
-                        duplicate statements
-Attempts to upstream these patches failed for reasons upstream kept to
-themselves.  Now these patches are replaced with workarounds in unoxml.
-Note to future maintainers: work around redland bugs in client code.
-
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
deleted file mode 100644
index c23ad52..0000000
--- a/redland/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-rld     redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
-rld	redland				usr1	-	all	rld_mkout	NULL
-rld	redland\raptor		nmake	-	all	rld_raptor	NULL
-rld	redland\rasqal		nmake	-	all	rld_rasqal	rld_raptor NULL
-rld	redland\redland		nmake	-	all	rld_redland	rld_raptor rld_rasqal NULL
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
deleted file mode 100644
index 20bae4d..0000000
--- a/redland/prj/d.lst
+++ /dev/null
@@ -1,19 +0,0 @@
-mkdir: %_DEST%\inc\external
-..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1
-symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib
-symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1
-symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib
-symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib
-..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0
-symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so
-..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib
-symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib
-..\%__SRC%\lib\*.a %_DEST%\lib
-..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\redlandversion.mk %_DEST%\inc\redlandversion.mk
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
deleted file mode 100644
index 50cc9ee..0000000
--- a/redland/raptor/makefile.mk
+++ /dev/null
@@ -1,186 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=redland
-TARGET=so_raptor
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_REDLAND)" == "YES"
-all:
-	@echo "An already available installation of Redland RDF should exist on your system."
-	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.INCLUDE :	../redlandversion.mk
-
-RAPTORVERSION=$(RAPTOR_MAJOR).4.18
-
-TARFILE_NAME=raptor-$(RAPTORVERSION)
-TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e
-
-ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
-
-OOO_PATCH_FILES= \
-    $(TARFILE_NAME).patch.legal \
-    $(TARFILE_NAME).patch.autotools \
-    $(TARFILE_NAME).patch.ooo_build \
-    $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-    raptor-aix.patch
-
-.IF "$(CROSS_COMPILING)"=="YES"
-OOO_PATCH_FILES += \
-    $(TARFILE_NAME).patch.cross
-.ENDIF
-
-PATCH_FILES=$(OOO_PATCH_FILES)
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-PATCH_FILES+=raptor-1.4.18.libxml.patch
-.ENDIF
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-PATCH_FILES+=raptor-1.4.18.libxslt.patch
-.ENDIF
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
-raptor_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-raptor_CC+=-shared-libgcc
-.ENDIF
-raptor_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols  -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ELSE
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-.ENDIF
-
-.ELSE # "WNT"
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-CFLAGS=-m64
-.EXPORT: CFLAGS
-.ENDIF
-
-# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
-CPPFLAGS+:=-I$(SOLARINCDIR)$/external
-LDFLAGS+:=-L$(SOLARLIBDIR)
-
-.IF "$(OS)"=="AIX"
-LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
-.ENDIF
-.ENDIF			# "$(SYSBASE)"!=""
-
-CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
-LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
-
-.EXPORT: CPPFLAGS
-.EXPORT: LDFLAGS
-.EXPORT: LIBXML2LIB
-.EXPORT: XSLTLIB
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-# do not enable grddl parser (#i93768#)
-CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-OUT2INC+=src$/raptor.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
-OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/libraptor.a
-OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="AIX"
-OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
-OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
-OUT2BIN+=src/raptor-config
-.ELSE
-# if we use dmake, this is done automagically
-.ENDIF
-.ELSE
-OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
-OUT2BIN+=src/raptor-config
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch
deleted file mode 100644
index 59e5ceb..0000000
--- a/redland/raptor/raptor-1.4.18.libxml.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- misc/raptor-1.4.18/configure	2011-06-05 11:55:18.000000000 -0400
-+++ misc/build/raptor-1.4.18/configure	2011-06-05 11:55:46.000000000 -0400
-@@ -23470,73 +23470,6 @@
- LIBS="$oLIBS"
- 
- 
--# Check whether --with-xml2-config was given.
--if test "${with_xml2_config+set}" = set; then
--  withval=$with_xml2_config; xml2_config="$withval"
--else
--  xml2_config=""
--fi
--
--
--if test "X$xml2_config" != "X" ; then
--  { echo "$as_me:$LINENO: checking for $xml2_config" >&5
--echo $ECHO_N "checking for $xml2_config... $ECHO_C" >&6; }
--
--  if test -f $xml2_config ; then
--    XML_CONFIG=$xml2_config
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--  else
--    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
--echo "${ECHO_T}no - searching PATH" >&6; }
--  fi
--fi
--if test "X$XML_CONFIG" = "X"; then
--  for ac_prog in xml2-config
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_XML_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$XML_CONFIG"; then
--  ac_cv_prog_XML_CONFIG="$XML_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_XML_CONFIG="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--XML_CONFIG=$ac_cv_prog_XML_CONFIG
--if test -n "$XML_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
--echo "${ECHO_T}$XML_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  test -n "$XML_CONFIG" && break
--done
--
--fi
--
--
- # Check whether --with-xslt-config was given.
- if test "${with_xslt_config+set}" = set; then
-   withval=$with_xslt_config; xslt_config="$withval"
-@@ -23719,8 +23652,8 @@
- 
- oCPPFLAGS="$CPPFLAGS"
- oLIBS="$LIBS"
--if test "X$XML_CONFIG" != X; then
--  LIBS="$LIBS `$XML_CONFIG --libs`"
-+if test 0; then
-+  LIBS="$LIBS $LIBXML_LIBS"
-   { echo "$as_me:$LINENO: checking for xmlCreatePushParserCtxt" >&5
- echo $ECHO_N "checking for xmlCreatePushParserCtxt... $ECHO_C" >&6; }
- if test "${ac_cv_func_xmlCreatePushParserCtxt+set}" = set; then
-@@ -23813,18 +23746,6 @@
-   if test $have_xmlCreatePushParserCtxt = yes; then
-     have_libxml_lib=1
-     have_libxml=1
--    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
--    LIBXML_VERSION=`$XML_CONFIG --version`
--    libxml_version_dec=`echo $LIBXML_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
--    libxml_min_version_dec=`echo $libxml_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
--    { echo "$as_me:$LINENO: result: yes - version $LIBXML_VERSION" >&5
--echo "${ECHO_T}yes - version $LIBXML_VERSION" >&6; }
--    if test $libxml_version_dec -lt $libxml_min_version_dec; then
--       { echo "$as_me:$LINENO: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&5
--echo "$as_me: WARNING: Using libxml $LIBXML_VERSION is unsupported - $libxml_min_version or newer required." >&2;}
--       have_libxml_lib=0
--       have_libxml=0
--    fi
-   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -26447,8 +26368,8 @@
-     CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
-     LIBS="$LIBS -Llibxml -llibxml"
-   else
--    LIBS="$LIBS `$XML_CONFIG --libs`"
--    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
-+    LIBS="$LIBS $LIBXML_LIBS"
-+    CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
-   fi
-   RAPTOR_XML_PARSER=libxml
- fi
diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch
deleted file mode 100644
index 6dfffd9..0000000
--- a/redland/raptor/raptor-1.4.18.libxslt.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- misc/raptor-1.4.18/configure	2011-06-05 11:57:41.000000000 -0400
-+++ misc/build/raptor-1.4.18/configure	2011-06-05 11:58:11.000000000 -0400
-@@ -23470,73 +23470,6 @@
- LIBS="$oLIBS"
- 
- 
--# Check whether --with-xslt-config was given.
--if test "${with_xslt_config+set}" = set; then
--  withval=$with_xslt_config; xslt_config="$withval"
--else
--  xslt_config=""
--fi
--
--
--if test "X$xslt_config" != "X" ; then
--  { echo "$as_me:$LINENO: checking for $xslt_config" >&5
--echo $ECHO_N "checking for $xslt_config... $ECHO_C" >&6; }
--
--  if test -f $xslt_config ; then
--    XSLT_CONFIG=$xslt_config
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--  else
--    { echo "$as_me:$LINENO: result: no - searching PATH" >&5
--echo "${ECHO_T}no - searching PATH" >&6; }
--  fi
--fi
--if test "X$XSLT_CONFIG" = "X"; then
--  for ac_prog in xslt-config
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_XSLT_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$XSLT_CONFIG"; then
--  ac_cv_prog_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_XSLT_CONFIG="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--XSLT_CONFIG=$ac_cv_prog_XSLT_CONFIG
--if test -n "$XSLT_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5
--echo "${ECHO_T}$XSLT_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--  test -n "$XSLT_CONFIG" && break
--done
--
--fi
--
--
- # Check whether --with-curl-config was given.
- if test "${with_curl_config+set}" = set; then
-   withval=$with_curl_config; curl_config="$withval"
-@@ -24702,8 +24635,8 @@
- 
- oCPPFLAGS="$CPPFLAGS"
- oLIBS="$LIBS"
--if test "X$XSLT_CONFIG" != X; then
--  LIBS="$LIBS `$XSLT_CONFIG --libs`"
-+if test 0; then
-+  LIBS="$LIBS $LIBXSLT_LIBS"
-   { echo "$as_me:$LINENO: checking for xsltSaveResultToString" >&5
- echo $ECHO_N "checking for xsltSaveResultToString... $ECHO_C" >&6; }
- if test "${ac_cv_func_xsltSaveResultToString+set}" = set; then
-@@ -24795,17 +24728,6 @@
- echo $ECHO_N "checking for system libxslt library... $ECHO_C" >&6; }
-   if test $have_xsltSaveResultToString = yes; then
-     have_libxslt=1
--    CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
--    LIBXSLT_VERSION=`$XSLT_CONFIG --version`
--    libxslt_version_dec=`echo $LIBXSLT_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
--    libxslt_min_version_dec=`echo $libxslt_min_version | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
--    { echo "$as_me:$LINENO: result: yes - version $LIBXSLT_VERSION" >&5
--echo "${ECHO_T}yes - version $LIBXSLT_VERSION" >&6; }
--    if test $libxslt_version_dec -lt $libxslt_min_version_dec; then
--       { echo "$as_me:$LINENO: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&5
--echo "$as_me: WARNING: Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required." >&2;}
--       have_libxslt=0
--    fi
-   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -26395,8 +26317,8 @@
- fi
- 
- if test $need_libxslt = 1; then
--  LIBS="$LIBS `$XSLT_CONFIG --libs`"
--  CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
-+  LIBS="$LIBS $LIBXSLT_LIBS"
-+  CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS"
- fi
- 
- RAPTOR_LIBTOOLLIBS=libraptor.la
diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools
deleted file mode 100644
index ed9e6bd..0000000
--- a/redland/raptor/raptor-1.4.18.patch.autotools
+++ /dev/null
@@ -1,57 +0,0 @@
---- misc/raptor-1.4.18/config.sub
-+++ misc/build/raptor-1.4.18/config.sub
-@@ -1272,7 +1272,7 @@
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
---- misc/raptor-1.4.18/configure	Sun Jun 15 10:25:55 2008
-+++ misc/build/raptor-1.4.18/configure	Wed Feb 18 13:23:12 2009
-@@ -4321,7 +4321,7 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
-@@ -4330,7 +4330,7 @@
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
-     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
---- misc/raptor-1.4.18/ltmain.sh	2008-02-02 22:28:24.000000000 +0900
-+++ misc/build/raptor-1.4.18/ltmain.sh	2008-07-08 11:58:42.000000000 +0900
-@@ -3262,9 +3262,9 @@
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
- 	    ;;
- 	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3344,8 +3344,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	irix | nonstopux)
diff --git a/redland/raptor/raptor-1.4.18.patch.cross b/redland/raptor/raptor-1.4.18.patch.cross
deleted file mode 100644
index bf4c432..0000000
--- a/redland/raptor/raptor-1.4.18.patch.cross
+++ /dev/null
@@ -1,35 +0,0 @@
---- misc/raptor-1.4.18/configure
-+++ misc/build/raptor-1.4.18/configure
-@@ -22643,11 +22643,13 @@
-   { echo "$as_me:$LINENO: checking vsnprintf has C99 compatible return value" >&5
- echo $ECHO_N "checking vsnprintf has C99 compatible return value... $ECHO_C" >&6; }
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_C99_VSNPRINTF 1
-+_ACEOF
-+
-+    { echo "$as_me:$LINENO: result: guessing yes" >&5
-+echo "${ECHO_T}guessing yes" >&6; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23367,11 +23369,8 @@
-     { echo "$as_me:$LINENO: checking for expat support of UTF-8 BOM" >&5
- echo $ECHO_N "checking for expat support of UTF-8 BOM... $ECHO_C" >&6; }
-     if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  { echo "$as_me:$LINENO: result: guessing yes" >&5
-+echo "${ECHO_T}guessing yes" >&6; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
deleted file mode 100644
index b017275..0000000
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ /dev/null
@@ -1,124 +0,0 @@
---- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
-+++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,119 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=raptor
-+LIBTARGET=NO
-+UWINAPIDLL=
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+UWINAPILIB=
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+CDEFS+=-DRAPTOR_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
-+
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES =	\
-+   $(SLO)$/n3_lexer.obj \
-+   $(SLO)$/n3_parser.obj \
-+   $(SLO)$/ntriples_parse.obj \
-+   $(SLO)$/parsedate.obj \
-+   $(SLO)$/raptor_feature.obj \
-+   $(SLO)$/raptor_general.obj \
-+   $(SLO)$/raptor_guess.obj \
-+   $(SLO)$/raptor_identifier.obj \
-+   $(SLO)$/raptor_iostream.obj \
-+   $(SLO)$/raptor_libxml.obj \
-+   $(SLO)$/raptor_locator.obj \
-+   $(SLO)$/raptor_namespace.obj \
-+   $(SLO)$/raptor_nfc.obj \
-+   $(SLO)$/raptor_nfc_data.obj \
-+   $(SLO)$/raptor_parse.obj \
-+   $(SLO)$/raptor_qname.obj \
-+   $(SLO)$/raptor_rdfxml.obj \
-+   $(SLO)$/raptor_rfc2396.obj \
-+   $(SLO)$/raptor_rss.obj \
-+   $(SLO)$/raptor_rss_common.obj \
-+   $(SLO)$/raptor_sax2.obj \
-+   $(SLO)$/raptor_sequence.obj \
-+   $(SLO)$/raptor_serialize.obj \
-+   $(SLO)$/raptor_serialize_ntriples.obj \
-+   $(SLO)$/raptor_serialize_rdfxml.obj \
-+   $(SLO)$/raptor_serialize_rdfxmla.obj \
-+   $(SLO)$/raptor_serialize_simple.obj \
-+   $(SLO)$/raptor_set.obj \
-+   $(SLO)$/raptor_stringbuffer.obj \
-+   $(SLO)$/raptor_uri.obj \
-+   $(SLO)$/raptor_utf8.obj \
-+   $(SLO)$/raptor_win32.obj \
-+   $(SLO)$/raptor_www.obj \
-+   $(SLO)$/raptor_www_libxml.obj \
-+   $(SLO)$/raptor_xml.obj \
-+   $(SLO)$/raptor_xml_writer.obj \
-+   $(SLO)$/raptor_xsd.obj \
-+   $(SLO)$/raptor_strcasecmp.obj \
-+   $(SLO)$/turtle_common.obj \
-+   $(SLO)$/turtle_lexer.obj \
-+   $(SLO)$/turtle_parser.obj \
-+   $(SLO)$/raptor_abbrev.obj \
-+   $(SLO)$/raptor_avltree.obj \
-+   $(SLO)$/raptor_statement.obj \
-+   $(SLO)$/raptor_turtle_writer.obj \
-+
-+#   $(SLO)$/raptor_grddl.obj \
-+#   $(SLO)$/raptor_serialize_rss.obj \
-+
-+
-+SHL1DEPN=   makefile.mk
-+SHL1OBJS=   $(SLOFILES)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=	$(TARGET)
-+SHL1IMPLIB= lib$(TARGET)
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+    $(LIBXML2LIB) \
-+    $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-+$(MISC)$/raptor_strcasecmp.c : strcasecmp.c
-+	$(COPY) $< $@
-+
diff --git a/redland/raptor/raptor-1.4.18.patch.legal b/redland/raptor/raptor-1.4.18.patch.legal
deleted file mode 100644
index 217b7d1..0000000
--- a/redland/raptor/raptor-1.4.18.patch.legal
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/raptor-1.4.18/LICENSE.txt	Sun Mar 30 06:52:22 2008
-+++ misc/build/raptor-1.4.18/LICENSE.txt	Mon Jun 16 15:55:38 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2000-2008 David Beckett
-    Copyright (C) 2000-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw
deleted file mode 100644
index e29a0a0..0000000
--- a/redland/raptor/raptor-1.4.18.patch.mingw
+++ /dev/null
@@ -1,30 +0,0 @@
---- misc/raptor-1.4.18/configure	2008-06-15 17:25:55.000000000 +0900
-+++ misc/build/raptor-1.4.18/configure	2009-06-04 21:10:22.447125000 +0900
-@@ -25238,6 +25238,12 @@
- rdfa_parser=yes
- 
- rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup rdfa"
-+case $host_os in
-+mingw*)
-+  rdfa_parser=no
-+  rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup"
-+  ;;
-+esac
- if test "$USE_MAINTAINER_MODE" = yes; then
-   rdf_parsers_available="$rdf_parsers_available n3"
- fi
---- misc/raptor-1.4.18/configure.ac	2008-06-15 17:25:20.000000000 +0900
-+++ misc/build/raptor-1.4.18/configure.ac	2009-06-04 21:10:31.025250000 +0900
-@@ -758,6 +758,12 @@
- rdfa_parser=yes
- 
- rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup rdfa"
-+case $host_os in
-+mingw*)
-+  rdfa_parser=no
-+  rdf_parsers_available="rdfxml ntriples turtle trig guess rss-tag-soup"
-+  ;;
-+esac
- if test "$USE_MAINTAINER_MODE" = yes; then
-   rdf_parsers_available="$rdf_parsers_available n3"
- fi
diff --git a/redland/raptor/raptor-1.4.18.patch.ooo_build b/redland/raptor/raptor-1.4.18.patch.ooo_build
deleted file mode 100644
index a168785..0000000
--- a/redland/raptor/raptor-1.4.18.patch.ooo_build
+++ /dev/null
@@ -1,43 +0,0 @@
---- misc/raptor-1.4.18/src/raptor-config.in	Sat Jan  6 05:02:00 2007
-+++ misc/build/raptor-1.4.18/src/raptor-config.in	Mon Jun 16 15:55:38 2008
-@@ -21,14 +21,23 @@
- # 
- #
- 
--prefix=@prefix@
--exec_prefix=@exec_prefix@
-+prefix=${SOLARVERSION}/${INPATH}
-+exec_prefix=${SOLARVERSION}/${INPATH}
-+#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+# HACK: map to build directory
-+includedir=../../../../inc
-+libdir=../../../../lib
-+includes=-I${includedir}
- 
--if test "@includedir@" != /usr/include ; then
--  includes="-I@includedir@"
--else
--  includes=
--fi
-+#prefix=@prefix@
-+#exec_prefix=@exec_prefix@
-+#
-+#if test "@includedir@" != /usr/include ; then
-+#  includes="-I@includedir@"
-+#else
-+#  includes=
-+#fi
- 
- 
- usage()
-@@ -130,7 +139,8 @@
-   done
- fi
- if test "$echo_libs" = "yes"; then
--  echo -L@libdir@ -lraptor
-+#  echo -L@libdir@ -lraptor
-+  echo -L${libdir} -lraptor
- fi
- if test "$echo_libtool_libs" = "yes"; then
-   echo @libdir@/@RAPTOR_LIBTOOLLIBS@
diff --git a/redland/raptor/raptor-1.4.18.patch.win32 b/redland/raptor/raptor-1.4.18.patch.win32
deleted file mode 100644
index 8de0d25..0000000
--- a/redland/raptor/raptor-1.4.18.patch.win32
+++ /dev/null
@@ -1,78 +0,0 @@
---- misc/raptor-1.4.18/src/win32_raptor_config.h	Wed Apr  2 06:50:14 2008
-+++ misc/build/raptor-1.4.18/src/win32_raptor_config.h	Wed Feb 18 13:21:23 2009
-@@ -38,6 +38,8 @@
- 
- #define HAVE_STDLIB_H 1
- 
-+#define HAVE_ERRNO_H 1
-+
- #if 0
- /* For using expat on win32 */
- #define RAPTOR_XML_EXPAT 1
-@@ -47,8 +49,17 @@
- /* For using libxml2 on win32 */
- #define RAPTOR_XML_LIBXML
- #define HAVE_LIBXML_XMLREADER_H
-+#define HAVE_LIBXML_HASH_H 1
-+#define HAVE_LIBXML_HTMLPARSER_H 1
-+#define HAVE_LIBXML_NANOHTTP_H 1
-+#define HAVE_LIBXML_PARSER_H 1
-+#define HAVE_LIBXSLT_XSLT_H 1
-+
-+#define RAPTOR_LIBXML_HTML_PARSE_NONET 1
-+#define RAPTOR_LIBXML_XML_PARSE_NONET 1
-+
- /* does libxml struct xmlEntity have a field etype */
--/*#define RAPTOR_LIBXML_ENTITY_ETYPE*/
-+#define RAPTOR_LIBXML_ENTITY_ETYPE
- 
- /* does libxml struct xmlEntity have a field name_length */
- /*#define RAPTOR_LIBXML_ENTITY_NAME_LENGTH*/
-@@ -60,16 +71,17 @@
- #define HAVE_XMLSAX2INTERNALSUBSET 1
- 
- /* does libxml xmlSAXHandler have externalSubset field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET*/
-+#define RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET 1
- 
- /* does libxml xmlSAXHandler have initialized field */
--/*#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED*/
-+#define RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED 1
- #endif
- 
- #define HAVE_STRICMP 1
- 
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -113,19 +125,23 @@
- #endif
- 
- #define RAPTOR_PARSER_GUESS 1
--#define RAPTOR_PARSER_GRDDL 1
-+/* #define RAPTOR_PARSER_GRDDL 1   disabled: (#i93768#) */
-+#ifndef __MINGW32__ /* conflicts with normal configure result */
- #define RAPTOR_PARSER_N3 1
-+#endif
- #define RAPTOR_PARSER_TURTLE 1
- #define RAPTOR_PARSER_NTRIPLES 1
- #define RAPTOR_PARSER_RDFXML 1
- 
-+/* does not build on wntmsci12 due to gettimeofday
- #define RAPTOR_SERIALIZER_ATOM 1
--#define RAPTOR_SERIALIZER_RSS_1_0 1
-+#define RAPTOR_SERIALIZER_RSS_1_0 1 */
- #define RAPTOR_SERIALIZER_RDFXML 1
- #define RAPTOR_SERIALIZER_RDFXML_ABBREV 1
- #define RAPTOR_SERIALIZER_NTRIPLES 1
- 
--#define RAPTOR_WWW_LIBCURL 1
-+//#define RAPTOR_WWW_LIBCURL 1
-+#define RAPTOR_WWW_LIBXML 1
- 
- 
- #include <windows.h>
diff --git a/redland/raptor/raptor-aix.patch b/redland/raptor/raptor-aix.patch
deleted file mode 100644
index d6427c5..0000000
--- a/redland/raptor/raptor-aix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- misc/raptor-1.4.18/config.guess	2010-09-16 03:07:14.000000000 -0500
-+++ misc/build/raptor-1.4.18/config.guess	2010-09-16 03:08:00.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
diff --git a/redland/raptor/raptor2.map b/redland/raptor/raptor2.map
deleted file mode 100644
index 109a74b..0000000
--- a/redland/raptor/raptor2.map
+++ /dev/null
@@ -1,294 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-raptor_ntriples_string_as_utf8_string;
-raptor_ntriples_term_as_string;
-raptor_feature_from_uri;
-raptor_get_feature_count;
-raptor_feature_value_type;
-raptor_xml_literal_datatype_uri_string_len;
-raptor_xml_literal_datatype_uri_string;
-raptor_version_decimal;
-raptor_version_release;
-raptor_version_minor;
-raptor_version_major;
-raptor_version_string;
-raptor_home_url_string;
-raptor_license_string;
-raptor_copyright_string;
-raptor_short_copyright_string;
-raptor_init;
-raptor_finish;
-raptor_vsnprintf;
-raptor_print_ntriples_string;
-raptor_free_memory;
-raptor_alloc_memory;
-raptor_calloc_memory;
-raptor_error_handlers_init;
-raptor_new_identifier;
-raptor_copy_identifier;
-raptor_free_identifier;
-raptor_new_iostream_to_string;
-raptor_new_iostream_to_filename;
-raptor_new_iostream_from_filename;
-raptor_iostream_write_string;
-raptor_iostream_write_uri;
-raptor_iostream_write_stringbuffer;
-raptor_iostream_format_hexadecimal;
-raptor_new_iostream_from_handler;
-raptor_new_iostream_to_sink;
-raptor_new_iostream_from_sink;
-raptor_new_iostream_from_handler2;
-raptor_new_iostream_to_file_handle;
-raptor_new_iostream_from_file_handle;
-raptor_new_iostream_from_string;
-raptor_free_iostream;
-raptor_iostream_tell;
-raptor_iostream_read_eof;
-raptor_iostream_read_bytes;
-raptor_iostream_write_decimal;
-raptor_iostream_get_bytes_written_count;
-raptor_iostream_write_end;
-raptor_iostream_write_counted_string;
-raptor_iostream_write_bytes;
-raptor_iostream_write_byte;
-raptor_print_locator;
-raptor_format_locator;
-raptor_locator_uri;
-raptor_locator_file;
-raptor_locator_byte;
-raptor_locator_column;
-raptor_locator_line;
-raptor_owl_namespace_uri;
-raptor_xmlschema_datatypes_namespace_uri;
-raptor_rdf_schema_namespace_uri;
-raptor_rdf_namespace_uri_len;
-raptor_rdf_namespace_uri;
-raptor_xml_namespace_uri;
-raptor_new_namespaces;
-raptor_namespaces_init;
-raptor_namespaces_start_namespace_full;
-raptor_new_namespace;
-raptor_namespace_copy;
-raptor_new_namespace_from_uri;
-raptor_free_namespaces;
-raptor_namespaces_clear;
-raptor_namespaces_end_for_depth;
-raptor_free_namespace;
-raptor_namespaces_format;
-raptor_iostream_write_namespace;
-raptor_new_namespace_parts_from_string;
-raptor_namespaces_qname_from_uri;
-raptor_namespaces_find_namespace;
-raptor_namespace_get_counted_prefix;
-raptor_namespace_get_prefix;
-raptor_namespace_get_uri;
-raptor_namespaces_namespace_in_scope;
-raptor_namespaces_find_namespace_by_uri;
-raptor_namespaces_get_default_namespace;
-raptor_namespaces_start_namespace;
-raptor_new_parser_for_content;
-raptor_new_parser;
-raptor_parse_file;
-raptor_parse_file_stream;
-raptor_parse_uri;
-raptor_parse_uri_with_connection;
-raptor_parse_chunk;
-raptor_start_parse;
-raptor_free_parser;
-raptor_features_enumerate;
-raptor_parser_set_feature_string;
-raptor_parser_get_feature_string;
-raptor_set_default_generate_id_parameters;
-raptor_guess_parser_name;
-raptor_syntax_name_check;
-raptor_parser_get_accept_header;
-raptor_parsers_enumerate;
-raptor_syntaxes_enumerate;
-raptor_get_mime_type;
-raptor_get_locator;
-raptor_parse_abort;
-raptor_get_need_base_uri;
-raptor_get_label;
-raptor_get_name;
-raptor_set_parser_strict;
-raptor_get_feature;
-raptor_set_feature;
-raptor_parser_set_uri_filter;
-raptor_set_namespace_handler;
-raptor_set_generate_id_handler;
-raptor_set_graph_handler;
-raptor_set_statement_handler;
-raptor_set_warning_handler;
-raptor_set_error_handler;
-raptor_set_fatal_error_handler;
-raptor_new_qname;
-raptor_new_qname_from_namespace_local_name;
-raptor_qname_copy;
-raptor_free_qname;
-raptor_qname_equal;
-raptor_qname_string_to_uri;
-raptor_iostream_write_qname;
-raptor_qname_get_counted_value;
-raptor_qname_get_value;
-raptor_qname_get_local_name;
-raptor_qname_get_namespace;
-raptor_uri_resolve_uri_reference;
-raptor_new_sax2;
-raptor_sax2_parse_start;
-raptor_free_sax2;
-raptor_sax2_parse_chunk;
-raptor_sax2_inscope_base_uri;
-raptor_sax2_inscope_xml_language;
-raptor_xml_element_is_empty;
-raptor_sax2_set_namespace_handler;
-raptor_sax2_set_external_entity_ref_handler;
-raptor_sax2_set_unparsed_entity_decl_handler;
-raptor_sax2_set_comment_handler;
-raptor_sax2_set_cdata_handler;
-raptor_sax2_set_characters_handler;
-raptor_sax2_set_end_element_handler;
-raptor_sax2_set_start_element_handler;
-raptor_compare_strings;
-raptor_sequence_sort;
-raptor_sequence_print_string;
-raptor_sequence_print_uri;
-raptor_sequence_print;
-raptor_free_sequence;
-raptor_sequence_set_at;
-raptor_sequence_push;
-raptor_sequence_shift;
-raptor_sequence_join;
-raptor_new_sequence;
-raptor_sequence_size;
-raptor_sequence_get_at;
-raptor_sequence_pop;
-raptor_sequence_unshift;
-raptor_sequence_set_print_handler;
-raptor_serializer_syntax_name_check;
-raptor_new_serializer;
-raptor_serializers_enumerate;
-raptor_serialize_start_to_filename;
-raptor_serialize_start_to_string;
-raptor_serialize_start_to_file_handle;
-raptor_serialize_start;
-raptor_serialize_set_namespace_from_namespace;
-raptor_serialize_end;
-raptor_free_serializer;
-raptor_serializer_features_enumerate;
-raptor_serializer_set_feature_string;
-raptor_serializer_get_feature_string;
-raptor_serializer_get_locator;
-raptor_serializer_set_warning_handler;
-raptor_serializer_set_error_handler;
-raptor_serializer_get_feature;
-raptor_serializer_set_feature;
-raptor_serializer_get_iostream;
-raptor_serialize_statement;
-raptor_serialize_set_namespace;
-raptor_iostream_write_statement_ntriples;
-raptor_iostream_write_string_ntriples;
-raptor_new_stringbuffer;
-raptor_free_stringbuffer;
-raptor_stringbuffer_append_decimal;
-raptor_stringbuffer_append_counted_string;
-raptor_stringbuffer_append_string;
-raptor_stringbuffer_append_stringbuffer;
-raptor_stringbuffer_prepend_counted_string;
-raptor_stringbuffer_prepend_string;
-raptor_stringbuffer_as_string;
-raptor_stringbuffer_copy_to_string;
-raptor_stringbuffer_length;
-raptor_uri_set_handler;
-raptor_uri_filename_to_uri_string;
-raptor_uri_uri_string_to_filename;
-raptor_uri_uri_string_to_filename_fragment;
-raptor_uri_is_file_uri;
-raptor_uri_uri_string_is_file_uri;
-raptor_new_uri_for_xmlbase;
-raptor_new_uri_for_retrieval;
-raptor_new_uri_from_id;
-raptor_uri_to_relative_uri_string;
-raptor_uri_to_relative_counted_uri_string;
-raptor_uri_compare;
-raptor_uri_print;
-raptor_uri_to_string;
-raptor_uri_to_counted_string;
-raptor_uri_as_counted_string;
-raptor_uri_as_string;
-raptor_uri_copy;
-raptor_uri_equals;
-raptor_free_uri;
-raptor_new_uri_for_rdf_concept;
-raptor_new_uri_relative_to_base;
-raptor_new_uri_from_uri_local_name;
-raptor_new_uri;
-raptor_uri_get_handler;
-raptor_utf8_check;
-raptor_unicode_is_xml10_namechar;
-raptor_unicode_is_xml10_namestartchar;
-raptor_unicode_is_xml11_namechar;
-raptor_unicode_is_xml11_namestartchar;
-raptor_utf8_to_unicode_char;
-raptor_unicode_char_to_utf8;
-raptor_www_new;
-raptor_www_new_with_connection;
-raptor_www_free;
-raptor_www_set_user_agent;
-raptor_www_set_proxy;
-raptor_www_set_http_accept;
-raptor_www_set_http_cache_control;
-raptor_www_fetch_to_string;
-raptor_www_fetch;
-raptor_www_get_final_uri;
-raptor_www_set_final_uri_handler;
-raptor_www_abort;
-raptor_www_get_connection;
-raptor_www_set_uri_filter;
-raptor_www_set_connection_timeout;
-raptor_www_set_content_type_handler;
-raptor_www_set_write_bytes_handler;
-raptor_www_set_error_handler;
-raptor_www_finish;
-raptor_www_no_www_library_init_finish;
-raptor_www_init;
-raptor_new_xml_element_from_namespace_local_name;
-raptor_new_xml_element;
-raptor_free_xml_element;
-raptor_xml_element_declare_namespace;
-raptor_iostream_write_xml_element;
-raptor_xml_escape_string;
-raptor_xml_any_escape_string;
-raptor_iostream_write_xml_escaped_string;
-raptor_iostream_write_xml_any_escaped_string;
-raptor_xml_name_check;
-raptor_xml_element_get_language;
-raptor_xml_element_get_attributes_count;
-raptor_xml_element_get_attributes;
-raptor_xml_element_set_attributes;
-raptor_xml_element_get_name;
-raptor_new_xml_writer;
-raptor_free_xml_writer;
-raptor_xml_writer_empty_element;
-raptor_xml_writer_start_element;
-raptor_xml_writer_end_element;
-raptor_xml_writer_comment;
-raptor_xml_writer_cdata;
-raptor_xml_writer_comment_counted;
-raptor_xml_writer_cdata_counted;
-raptor_xml_writer_raw;
-raptor_xml_writer_raw_counted;
-raptor_xml_writer_features_enumerate;
-raptor_xml_writer_set_feature_string;
-raptor_xml_writer_get_feature_string;
-raptor_xml_writer_get_feature;
-raptor_xml_writer_set_feature;
-raptor_statement_part_as_string;
-raptor_statement_part_as_counted_string;
-raptor_print_statement_as_ntriples;
-raptor_print_statement_detailed;
-raptor_print_statement;
-raptor_statement_compare;
-raptor_iostream_write_string_turtle;
-raptor_iostream_write_string_python;
-};
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
deleted file mode 100644
index ce3a6cf..0000000
--- a/redland/rasqal/makefile.mk
+++ /dev/null
@@ -1,168 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=redland
-TARGET=so_rasqal
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_REDLAND)" == "YES"
-all:
-    @echo "An already available installation of Redland RDF should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.INCLUDE :	../redlandversion.mk
-
-RASQALVERSION=0.9.16
-
-TARFILE_NAME=rasqal-$(RASQALVERSION)
-TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d
-
-ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
-
-OOO_PATCH_FILES= \
-    $(TARFILE_NAME).patch.legal \
-    $(TARFILE_NAME).patch.autotools \
-    $(TARFILE_NAME).patch.ooo_build \
-    $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32 \
-    rasqal-aix.patch
-
-PATCH_FILES=$(OOO_PATCH_FILES)
-
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-rasqal_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-rasqal_CC+=-shared-libgcc
-.ENDIF
-rasqal_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ELSE
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-.ENDIF
-.ELSE # "WNT"
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-CFLAGS=-m64
-.EXPORT: CFLAGS
-.ENDIF
-
-# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
-CPPFLAGS+:=-I$(SOLARINCDIR)$/external
-LDFLAGS+:=-L$(SOLARLIBDIR)
-
-.IF "$(OS)"=="AIX"
-LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
-.ENDIF
-.ENDIF			# "$(SYSBASE)"!=""
-
-CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
-LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
-
-.EXPORT: CPPFLAGS
-.EXPORT: LDFLAGS
-.EXPORT: LIBXML2LIB
-.EXPORT: XSLTLIB
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-OUT2INC+=src$/rasqal.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
-OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/librasqal.a
-OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/.libs$/*.dll
-OUT2BIN+=src/rasqal-config
-.ELSE
-# if we use dmake, this is done automagically
-.ENDIF
-.ELSE
-OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so
-OUT2BIN+=src/rasqal-config
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools
deleted file mode 100644
index 19b8792..0000000
--- a/redland/rasqal/rasqal-0.9.16.patch.autotools
+++ /dev/null
@@ -1,49 +0,0 @@
---- misc/rasqal-0.9.16/config.sub
-+++ misc/build/rasqal-0.9.16/config.sub
-@@ -1272,7 +1272,7 @@
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
---- misc/rasqal-0.9.16/ltmain.sh	Tue Apr 29 23:33:55 2008
-+++ misc/build/rasqal-0.9.16/ltmain.sh	Wed Feb 18 13:25:00 2009
-@@ -1565,6 +1565,11 @@
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  absdir=`cd "$dir" && pwd`
-+	  case $host_os in
-+	    mingw*)
-+	      absdir=`cygpath -m $absdir`
-+	      ;;
-+	  esac
- 	  if test -z "$absdir"; then
- 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- 	    absdir="$dir"
-@@ -3262,9 +3267,9 @@
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
- 	    ;;
- 	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3344,8 +3349,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	irix | nonstopux)
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
deleted file mode 100644
index 6795eb9..0000000
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ /dev/null
@@ -1,98 +0,0 @@
---- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
-+++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,94 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=rasqal
-+LIBTARGET=NO
-+UWINAPILIB=
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+CDEFS+=-DRASQAL_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS -D_MT
-+
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES =	\
-+   $(SLO)$/rasqal_datetime.obj \
-+   $(SLO)$/rasqal_decimal.obj \
-+   $(SLO)$/rasqal_engine.obj \
-+   $(SLO)$/rasqal_expr.obj \
-+   $(SLO)$/rasqal_feature.obj \
-+   $(SLO)$/rasqal_general.obj \
-+   $(SLO)$/rasqal_graph_pattern.obj \
-+   $(SLO)$/rasqal_literal.obj \
-+   $(SLO)$/rasqal_map.obj \
-+   $(SLO)$/rasqal_query_results.obj \
-+   $(SLO)$/rasqal_query.obj \
-+   $(SLO)$/rasqal_raptor.obj \
-+   $(SLO)$/rasqal_result_formats.obj \
-+   $(SLO)$/rasqal_rowsource.obj \
-+   $(SLO)$/rasqal_sparql_xml.obj \
-+   $(SLO)$/rasqal_xsd_datatypes.obj \
-+   $(SLO)$/rdql_lexer.obj \
-+   $(SLO)$/rdql_parser.obj \
-+   $(SLO)$/sparql_lexer.obj \
-+   $(SLO)$/sparql_parser.obj \
-+   $(SLO)$/strcasecmp.obj \
-+
-+
-+#   $(SLO)$/rasqal_redland.obj \
-+
-+SHL1DEPN=   makefile.mk
-+SHL1OBJS=   $(SLOFILES)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=	$(TARGET)
-+SHL1IMPLIB= lib$(TARGET)
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+
-+
-+#$(LIBXML2LIB) \
-+#    $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
diff --git a/redland/rasqal/rasqal-0.9.16.patch.legal b/redland/rasqal/rasqal-0.9.16.patch.legal
deleted file mode 100644
index 59b125d..0000000
--- a/redland/rasqal/rasqal-0.9.16.patch.legal
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/rasqal-0.9.16/LICENSE.txt	Fri Jun 27 04:24:52 2008
-+++ misc/build/rasqal-0.9.16/LICENSE.txt	Thu Nov  6 12:06:55 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2003-2008 Dave Beckett
-    Copyright (C) 2003-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
diff --git a/redland/rasqal/rasqal-0.9.16.patch.ooo_build b/redland/rasqal/rasqal-0.9.16.patch.ooo_build
deleted file mode 100644
index 8271479..0000000
--- a/redland/rasqal/rasqal-0.9.16.patch.ooo_build
+++ /dev/null
@@ -1,56 +0,0 @@
---- misc/rasqal-0.9.16/src/rasqal-config.in	Sun Jun 22 07:07:12 2008
-+++ misc/build/rasqal-0.9.16/src/rasqal-config.in	Thu Nov  6 12:10:52 2008
-@@ -22,10 +22,19 @@
- # 
- #
- 
--prefix=@prefix@
--includes="-I@includedir@/@PACKAGE@"
-+prefix=${SOLARVERSION}/${INPATH}
-+exec_prefix=${SOLARVERSION}/${INPATH}
-+#includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+#libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+# HACK: map to build directory
-+includedir=../../../../inc
-+libdir=../../../../lib
-+includes=-I${includedir}
- 
-+#prefix=@prefix@
-+#includes="-I@includedir@/@PACKAGE@"
- 
-+
- usage()
- {
- 	cat<<EOF
-@@ -104,7 +113,8 @@
-   echo $includes
- fi
- if test "$echo_libs" = "yes"; then
--  echo -L@libdir@ -lrasqal
-+#  echo -L@libdir@ -lrasqal
-+  echo -L${libdir} -lrasqal
- fi
- if test "$echo_libtool_libs" = "yes"; then
-   echo @libdir@/@RASQAL_LIBTOOLLIBS@
---- misc/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:21.000000000 +0000
-+++ misc/build/rasqal-0.9.16/Makefile.am	2010-02-12 08:43:56.000000000 +0000
-@@ -22,7 +22,7 @@
- 
- noinst_SCRIPTS = rasqal-src-config
- 
--SUBDIRS=src utils tests docs data win32
-+SUBDIRS=src tests docs data win32
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = rasqal.pc
---- misc/rasqal-0.9.16/Makefile.in	2010-02-12 08:43:19.000000000 +0000
-+++ misc/build/rasqal-0.9.16/Makefile.in	2010-02-12 08:44:03.000000000 +0000
-@@ -242,7 +242,7 @@
- with_raptor = @with_raptor@
- with_redland = @with_redland@
- noinst_SCRIPTS = rasqal-src-config
--SUBDIRS = src utils tests docs data win32
-+SUBDIRS = src tests docs data win32
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = rasqal.pc
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
diff --git a/redland/rasqal/rasqal-0.9.16.patch.win32 b/redland/rasqal/rasqal-0.9.16.patch.win32
deleted file mode 100644
index 51bad96..0000000
--- a/redland/rasqal/rasqal-0.9.16.patch.win32
+++ /dev/null
@@ -1,43 +0,0 @@
---- misc/rasqal-0.9.16/src/win32_rasqal_config.h	Fri Jun 27 04:02:09 2008
-+++ misc/build/rasqal-0.9.16/src/win32_rasqal_config.h	Thu Nov  6 12:07:06 2008
-@@ -37,10 +37,13 @@
- 
- #define HAVE_STDLIB_H 1
- 
-+#define HAVE_ERRNO_H 1
-+
- #define HAVE_STRICMP 1
- 
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -85,6 +88,9 @@
- #include <io.h>
- #include <memory.h>
- 
-+// argh! stupid winnt.h...
-+#undef DELETE
-+
- /* This is a SPARQL token define */
- #ifdef OPTIONAL
- #undef OPTIONAL
-@@ -116,8 +122,14 @@
- /* #define RAPTOR_TRIPLES_SOURCE_REDLAND 1 */
- 
- /* Use PCRE regex library */
--#define RASQAL_REGEX_PCRE 1
-+//#define RASQAL_REGEX_PCRE 1
- 
-+#define HAVE_LIBXML_SCHEMASINTERNALS_H 1
-+#define HAVE_LIBXML_XMLSCHEMASTYPES_H 1
-+#define HAVE_LIBXML_XMLSCHEMAS_H 1
-+
-+#define RASQAL_DECIMAL_NONE 1
-+
- #ifdef _DEBUG
- #define RASQAL_DEBUG 1
- #endif
diff --git a/redland/rasqal/rasqal-aix.patch b/redland/rasqal/rasqal-aix.patch
deleted file mode 100644
index 86470d4..0000000
--- a/redland/rasqal/rasqal-aix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- misc/rasqal-0.9.16/config.guess	2010-09-16 03:13:19.000000000 -0500
-+++ misc/build/rasqal-0.9.16/config.guess	2010-09-16 03:15:05.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
---- misc/rasqal-0.9.16/src/rasqal_literal.c	2010-09-09 14:53:30.000000000 -0500
-+++ misc/build/rasqal-0.9.16/src/rasqal_literal.c	2010-09-09 14:54:47.000000000 -0500
-@@ -36,8 +36,20 @@
- #include <stdlib.h>
- #endif
- #include <stdarg.h>
-+#ifdef _AIX
-+#  ifndef isnan
-+#   define isnan(x) \
-+      (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
-+       : sizeof (x) == sizeof (double) ? isnan_d (x) \
-+       : isnan_f (x))
-+  static inline int isnan_f  (float       x) { return x != x; }
-+  static inline int isnan_d  (double      x) { return x != x; }
-+  static inline int isnan_ld (long double x) { return x != x; }
-+#  endif
-+#else
- /* for isnan() */
- #include <math.h>
-+#endif
- 
- #ifdef RASQAL_REGEX_PCRE
- #include <pcre.h>
diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map
deleted file mode 100644
index 622043a..0000000
--- a/redland/rasqal/rasqal2.map
+++ /dev/null
@@ -1,194 +0,0 @@
-UDK_3_0_0 {
-global:
-GetVersionInfo;
-rasqal_xsd_decimal_set_string;
-rasqal_xsd_decimal_print;
-rasqal_xsd_decimal_as_counted_string;
-rasqal_xsd_decimal_as_string;
-rasqal_new_xsd_decimal;
-rasqal_free_xsd_decimal;
-rasqal_xsd_decimal_set_long;
-rasqal_xsd_decimal_set_double;
-rasqal_xsd_decimal_add;
-rasqal_xsd_decimal_subtract;
-rasqal_xsd_decimal_multiply;
-rasqal_xsd_decimal_divide;
-rasqal_xsd_decimal_negate;
-rasqal_xsd_decimal_equals;
-rasqal_xsd_decimal_compare;
-rasqal_xsd_decimal_is_zero;
-rasqal_xsd_decimal_get_double;
-rasqal_set_triples_source_factory;
-rasqal_new_variable;
-rasqal_new_variable_typed;
-rasqal_data_graph_print;
-rasqal_prefix_print;
-rasqal_new_data_graph;
-rasqal_new_prefix;
-rasqal_new_triple;
-rasqal_new_triple_from_triple;
-rasqal_new_0op_expression;
-rasqal_new_1op_expression;
-rasqal_new_2op_expression;
-rasqal_new_3op_expression;
-rasqal_new_string_op_expression;
-rasqal_new_literal_expression;
-rasqal_new_function_expression;
-rasqal_new_cast_expression;
-rasqal_free_variable;
-rasqal_free_expression;
-rasqal_free_data_graph;
-rasqal_free_prefix;
-rasqal_free_triple;
-rasqal_expression_evaluate;
-rasqal_variable_set_value;
-rasqal_variable_print;
-rasqal_expression_print;
-rasqal_expression_print_op;
-rasqal_triple_print;
-rasqal_expression_foreach;
-rasqal_expression_visit;
-rasqal_new_expression_from_expression;
-rasqal_triple_get_origin;
-rasqal_triple_set_origin;
-rasqal_features_enumerate;
-rasqal_feature_from_uri;
-rasqal_get_feature_count;
-rasqal_feature_value_type;
-rasqal_version_decimal;
-rasqal_version_release;
-rasqal_version_minor;
-rasqal_version_major;
-rasqal_version_string;
-rasqal_home_url_string;
-rasqal_license_string;
-rasqal_copyright_string;
-rasqal_short_copyright_string;
-rasqal_init;
-rasqal_finish;
-rasqal_language_name_check;
-rasqal_query_set_default_generate_bnodeid_parameters;
-rasqal_free_memory;
-rasqal_alloc_memory;
-rasqal_calloc_memory;
-rasqal_query_set_generate_bnodeid_handler;
-rasqal_languages_enumerate;
-rasqal_graph_pattern_add_constraint;
-rasqal_graph_pattern_print;
-rasqal_graph_pattern_add_sub_graph_pattern;
-rasqal_graph_pattern_get_flags;
-rasqal_graph_pattern_visit;
-rasqal_graph_pattern_get_constraint;
-rasqal_graph_pattern_get_triple;
-rasqal_graph_pattern_get_sub_graph_pattern;
-rasqal_graph_pattern_get_sub_graph_pattern_sequence;
-rasqal_graph_pattern_get_index;
-rasqal_graph_pattern_operator_as_string;
-rasqal_graph_pattern_get_operator;
-rasqal_graph_pattern_get_constraint_sequence;
-rasqal_new_floating_literal;
-rasqal_literal_compare;
-rasqal_literal_equals;
-rasqal_new_double_literal;
-rasqal_new_integer_literal;
-rasqal_new_float_literal;
-rasqal_new_typed_literal;
-rasqal_new_decimal_literal;
-rasqal_new_decimal_literal_from_decimal;
-rasqal_new_string_literal;
-rasqal_new_uri_literal;
-rasqal_new_boolean_literal;
-rasqal_literal_as_node;
-rasqal_free_literal;
-rasqal_literal_print;
-rasqal_literal_print_type;
-rasqal_new_pattern_literal;
-rasqal_new_simple_literal;
-rasqal_new_variable_literal;
-rasqal_literal_as_string;
-rasqal_literal_as_string_flags;
-rasqal_literal_value;
-rasqal_literal_datatype;
-rasqal_literal_as_variable;
-rasqal_new_literal_from_literal;
-rasqal_free_query_results;
-rasqal_query_results_get_bindings;
-rasqal_query_results_get_binding_value;
-rasqal_query_results_get_binding_value_by_name;
-rasqal_query_results_get_triple;
-rasqal_query_results_next;
-rasqal_query_results_next_triple;
-rasqal_query_results_write;
-rasqal_query_results_formatter_write;
-rasqal_query_results_get_boolean;
-rasqal_query_results_get_bindings_count;
-rasqal_query_results_get_binding_name;
-rasqal_query_results_finished;
-rasqal_query_results_get_count;
-rasqal_query_results_is_syntax;
-rasqal_query_results_is_graph;
-rasqal_query_results_is_boolean;
-rasqal_query_results_is_bindings;
-rasqal_new_query;
-rasqal_free_query;
-rasqal_query_set_feature_string;
-rasqal_query_get_feature_string;
-rasqal_query_add_data_graph;
-rasqal_query_set_variable;
-rasqal_query_add_prefix;
-rasqal_query_add_variable;
-rasqal_query_prepare;
-rasqal_query_execute;
-rasqal_query_print;
-rasqal_query_graph_pattern_visit;
-rasqal_query_write;
-rasqal_query_get_graph_pattern_sequence;
-rasqal_query_get_graph_pattern;
-rasqal_query_get_data_graph;
-rasqal_query_get_variable;
-rasqal_query_has_variable;
-rasqal_query_get_triple;
-rasqal_query_get_prefix;
-rasqal_query_get_construct_triple;
-rasqal_query_get_order_condition;
-rasqal_query_get_group_condition;
-rasqal_query_escape_counted_string;
-rasqal_query_iostream_write_escaped_counted_string;
-rasqal_query_get_group_conditions_sequence;
-rasqal_query_get_order_conditions_sequence;
-rasqal_query_get_wildcard;
-rasqal_query_get_verb;
-rasqal_query_set_user_data;
-rasqal_query_get_user_data;
-rasqal_query_verb_as_string;
-rasqal_query_get_construct_triples_sequence;
-rasqal_query_get_query_graph_pattern;
-rasqal_query_get_prefix_sequence;
-rasqal_query_get_triple_sequence;
-rasqal_query_get_all_variable_sequence;
-rasqal_query_get_anonymous_variable_sequence;
-rasqal_query_get_bound_variable_sequence;
-rasqal_query_get_data_graph_sequence;
-rasqal_query_set_offset;
-rasqal_query_get_offset;
-rasqal_query_set_limit;
-rasqal_query_get_limit;
-rasqal_query_set_explain;
-rasqal_query_get_explain;
-rasqal_query_set_distinct;
-rasqal_query_get_distinct;
-rasqal_query_get_feature;
-rasqal_query_set_feature;
-rasqal_query_set_warning_handler;
-rasqal_query_set_error_handler;
-rasqal_query_set_fatal_error_handler;
-rasqal_query_get_label;
-rasqal_query_get_name;
-rasqal_query_results_formats_check;
-rasqal_new_query_results_formatter;
-rasqal_new_query_results_formatter_by_mime_type;
-rasqal_query_results_formats_enumerate;
-rasqal_query_results_formats_enumerate_full;
-rasqal_free_query_results_formatter;
-rasqal_query_results_formatter_get_mime_type;
-};
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
deleted file mode 100644
index 4bed69e..0000000
--- a/redland/redland/makefile.mk
+++ /dev/null
@@ -1,168 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=redland
-TARGET=so_redland
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_REDLAND)" == "YES"
-all:
-    @echo "An already available installation of Redland RDF should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.INCLUDE :	../redlandversion.mk
-
-REDLANDVERSION=1.0.8
-
-TARFILE_NAME=redland-$(REDLANDVERSION)
-TARFILE_MD5=ca66e26082cab8bb817185a116db809b
-
-ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
-
-OOO_PATCH_FILES= \
-    $(TARFILE_NAME).patch.legal \
-    $(TARFILE_NAME).patch.autotools \
-    $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.ooo_build \
-    $(TARFILE_NAME).patch.win32 \
-    redland-aix.patch
-
-PATCH_FILES=$(OOO_PATCH_FILES) \
-
-
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-redland_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-redland_CC+=-shared-libgcc
-.ENDIF
-redland_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ELSE
-# there is no wntmsci build environment in the tarball; we use custom dmakefile
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/librdf
-.ENDIF
-.ELSE # "WNT"
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
-
-.IF "$(COM)"=="C52" && "$(CPU)"=="U"
-CFLAGS=-m64
-.EXPORT: CFLAGS
-.ENDIF
-
-# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
-CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external
-LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR)
-
-.IF "$(OS)"=="AIX"
-LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
-.ENDIF
-.ENDIF			# "$(SYSBASE)"!=""
-
-.IF "$(OS)"=="MACOSX"
-LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib
-.ENDIF
-
-CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
-LDFLAGS+:=$(EXTRA_LINKFLAGS)
-XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
-
-.EXPORT: CPPFLAGS
-.EXPORT: LDFLAGS
-.EXPORT: LIBXML2LIB
-.EXPORT: XSLTLIB
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-.IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-
-OUT2INC+=librdf$/*.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-OUT2LIB+=librdf$/.libs$/librdf.a
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=librdf$/.libs$/*.a
-OUT2BIN+=librdf$/.libs$/*.dll
-.ELSE
-# if we use dmake, this is done automagically
-.ENDIF
-.ELSE
-OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools
deleted file mode 100644
index 2bd2085..0000000
--- a/redland/redland/redland-1.0.8.patch.autotools
+++ /dev/null
@@ -1,69 +0,0 @@
---- misc/redland-1.0.8/config.sub
-+++ misc/build/redland-1.0.8/config.sub
-@@ -1272,7 +1272,7 @@
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
---- misc/redland-1.0.8/configure	Fri Jul  4 18:00:39 2008
-+++ misc/build/redland-1.0.8/configure	Wed Feb 18 13:27:43 2009
-@@ -4671,7 +4671,7 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
-@@ -4680,7 +4680,7 @@
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
-     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
---- misc/redland-1.0.8/ltmain.sh	Tue Apr 29 23:33:55 2008
-+++ misc/build/redland-1.0.8/ltmain.sh	Wed Feb 18 13:28:39 2009
-@@ -1565,6 +1565,11 @@
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  absdir=`cd "$dir" && pwd`
-+	  case $host_os in
-+	    mingw*)
-+	      absdir=`cygpath -m $absdir`
-+	      ;;
-+	  esac
- 	  if test -z "$absdir"; then
- 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- 	    absdir="$dir"
-@@ -3262,9 +3267,9 @@
- 	    revision="$number_revision"
- 	    ;;
- 	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
- 	    ;;
- 	  irix|nonstopux)
- 	    current=`expr $number_major + $number_minor`
-@@ -3344,8 +3349,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
- 	  ;;
- 
- 	irix | nonstopux)
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
deleted file mode 100644
index 34ba51d..0000000
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ /dev/null
@@ -1,115 +0,0 @@
---- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
-+++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,111 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=redland
-+TARGET=librdf
-+LIBTARGET=NO
-+UWINAPILIB=
-+
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
-+
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES =	\
-+   $(SLO)$/rdf_concepts.obj \
-+   $(SLO)$/rdf_digest.obj \
-+   $(SLO)$/rdf_digest_md5.obj \
-+   $(SLO)$/rdf_digest_openssl.obj \
-+   $(SLO)$/rdf_digest_sha1.obj \
-+   $(SLO)$/rdf_files.obj \
-+   $(SLO)$/rdf_hash.obj \
-+   $(SLO)$/rdf_hash_cursor.obj \
-+   $(SLO)$/rdf_hash_memory.obj \
-+   $(SLO)$/rdf_heuristics.obj \
-+   $(SLO)$/rdf_init.obj \
-+   $(SLO)$/rdf_iterator.obj \
-+   $(SLO)$/rdf_list.obj \
-+   $(SLO)$/rdf_log.obj \
-+   $(SLO)$/rdf_model.obj \
-+   $(SLO)$/rdf_model_storage.obj \
-+   $(SLO)$/rdf_node.obj \
-+   $(SLO)$/rdf_parser.obj \
-+   $(SLO)$/rdf_parser_raptor.obj \
-+   $(SLO)$/rdf_query.obj \
-+   $(SLO)$/rdf_query_rasqal.obj \
-+   $(SLO)$/rdf_query_results.obj \
-+   $(SLO)$/rdf_query_triples.obj \
-+   $(SLO)$/rdf_serializer.obj \
-+   $(SLO)$/rdf_serializer_raptor.obj \
-+   $(SLO)$/rdf_statement.obj \
-+   $(SLO)$/rdf_storage.obj \
-+   $(SLO)$/rdf_storage_file.obj \
-+   $(SLO)$/rdf_storage_list.obj \
-+   $(SLO)$/rdf_storage_hashes.obj \
-+   $(SLO)$/rdf_stream.obj \
-+   $(SLO)$/rdf_uri.obj \
-+   $(SLO)$/rdf_utf8.obj \
-+
-+
-+#   $(SLO)$/rdf_hash_bdb.obj \
-+#   $(SLO)$/rdf_storage_mysql.obj \
-+#   $(SLO)$/rdf_storage_sqlite.obj \
-+
-+
-+SHL1DEPN=   makefile.mk
-+SHL1OBJS=   $(SLOFILES)
-+
-+#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=	$(TARGET)
-+SHL1IMPLIB= $(TARGET)
-+SHL1USE_EXPORTS=name
-+
-+#SHL1VERSIONMAP=../service/exports.map
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+DEF1NAME=$(SHL1TARGET)
-+
-+SHL1STDLIBS= \
-+    $(OPENSSLLIB) \
-+    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
-+
-+
-+#$(LIBXML2LIB) \
-+#    $(XSLTLIB) \
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
diff --git a/redland/redland/redland-1.0.8.patch.legal b/redland/redland/redland-1.0.8.patch.legal
deleted file mode 100644
index 9e9a25b..0000000
--- a/redland/redland/redland-1.0.8.patch.legal
+++ /dev/null
@@ -1,54 +0,0 @@
---- misc/redland-1.0.8/LICENSE.txt	Tue Jul  1 07:55:28 2008
-+++ misc/build/redland-1.0.8/LICENSE.txt	Thu Nov  6 12:44:39 2008
-@@ -76,3 +76,15 @@
-   10. NOTICE
-   11. http://www.dajobe.org/
-   12. http://www.bristol.ac.uk/
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
---- misc/redland-1.0.8/raptor/LICENSE.txt	Sun Mar 30 06:52:22 2008
-+++ misc/build/redland-1.0.8/raptor/LICENSE.txt	Thu Nov  6 12:44:39 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2000-2008 David Beckett
-    Copyright (C) 2000-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
---- misc/redland-1.0.8/rasqal/LICENSE.txt	Fri Jun 27 04:24:52 2008
-+++ misc/build/redland-1.0.8/rasqal/LICENSE.txt	Thu Nov  6 12:44:40 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2003-2008 Dave Beckett
-    Copyright (C) 2003-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.patch.ooo_build
deleted file mode 100644
index 805a88d..0000000
--- a/redland/redland/redland-1.0.8.patch.ooo_build
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/redland-1.0.8/Makefile.am	2010-02-12 08:47:40.000000000 +0000
-+++ misc/build/redland-1.0.8/Makefile.am	2010-02-12 08:47:51.000000000 +0000
-@@ -48,7 +48,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
--SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
- 
- EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- ChangeLog.5 ChangeLog.6 ChangeLog.7 \
---- misc/redland-1.0.8/Makefile.in	2010-02-12 08:47:39.000000000 +0000
-+++ misc/build/redland-1.0.8/Makefile.in	2010-02-12 08:47:55.000000000 +0000
-@@ -283,7 +283,7 @@
- # to ensure that the raptor and rasqal subdirectories are called
- # as CONFIG_SUBDIR directories.
- #
--SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
-+SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
- EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
- ChangeLog.5 ChangeLog.6 ChangeLog.7 \
- README      NEWS      LICENSE.txt  TODO \
diff --git a/redland/redland/redland-1.0.8.patch.win32 b/redland/redland/redland-1.0.8.patch.win32
deleted file mode 100644
index 41d3503..0000000
--- a/redland/redland/redland-1.0.8.patch.win32
+++ /dev/null
@@ -1,154 +0,0 @@
---- misc/redland-1.0.8/librdf/win32_rdf_config.h	Tue Jul  1 05:10:26 2008
-+++ misc/build/redland-1.0.8/librdf/win32_rdf_config.h	Wed Feb 18 13:31:07 2009
-@@ -43,7 +43,8 @@
- #define HAVE_STRICMP 1
- 
- /* MS names for these functions */
--#define vsnprintf _vsnprintf
-+// next line breaks build on wntmsci12
-+//#define vsnprintf _vsnprintf
- #define snprintf _snprintf
- #define access _access
- #define stricmp _stricmp
-@@ -72,40 +73,40 @@
-  */
- 
- /* BDB has close method with 2 args */
--#define HAVE_BDB_CLOSE_2_ARGS 1
-+// #define HAVE_BDB_CLOSE_2_ARGS 1
- 
- /* BDB defines DBC */
--#define HAVE_BDB_CURSOR 1
-+// #define HAVE_BDB_CURSOR 1
- 
- /* BDB cursor method has 4 arguments */
--#define HAVE_BDB_CURSOR_4_ARGS 1
-+// #define HAVE_BDB_CURSOR_4_ARGS 1
- 
- /* BDB defines DB_TXN */
--#define HAVE_BDB_DB_TXN 1
-+// #define HAVE_BDB_DB_TXN 1
- 
- /* BDB has fd method with 2 args */
--#define HAVE_BDB_FD_2_ARGS 1
-+// #define HAVE_BDB_FD_2_ARGS 1
- 
- /* Have BDB hash support */
--#define HAVE_BDB_HASH 1
-+// #define HAVE_BDB_HASH 1
- 
- /* BDB has open method with 6 args */
- /* #undef HAVE_BDB_OPEN_6_ARGS */
- 
- /* BDB has open method with 7 args */
--#define HAVE_BDB_OPEN_7_ARGS 1
-+// #define HAVE_BDB_OPEN_7_ARGS 1
- 
- /* BDB has set_flags method */
--#define HAVE_BDB_SET_FLAGS 1
-+// #define HAVE_BDB_SET_FLAGS 1
- 
- /* BDB has dbopen method */
- /* #undef HAVE_DBOPEN */
- 
- /* BDB has db_create method */
--#define HAVE_DB_CREATE 1
-+// #define HAVE_DB_CREATE 1
- 
- /* Define to 1 if you have the <db.h> header file. */
--#define HAVE_DB_H 1
-+// #define HAVE_DB_H 1
- 
- /* Define to 1 if you have the <dlfcn.h> header file. */
- /* undef HAVE_DLFCN_H */
-@@ -141,13 +142,13 @@
- /* #undef HAVE_LIBWWW */
- 
- /* Have local MD5 digest */
--#define HAVE_LOCAL_MD5_DIGEST 1
-+// #define HAVE_LOCAL_MD5_DIGEST 1
- 
- /* Have local RIPEMD160 digest */
- /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
- 
- /* Have local SHA1 digest */
--#define HAVE_LOCAL_SHA1_DIGEST 1
-+// #define HAVE_LOCAL_SHA1_DIGEST 1
- 
- /* Define to 1 if you have the <memory.h> header file. */
- #define HAVE_MEMORY_H 1
-@@ -159,25 +160,33 @@
- #define HAVE_MKTEMP 1
- 
- /* MySQL libraries are present */
--#define HAVE_MYSQL 1
-+// #define HAVE_MYSQL 1
- 
- /* Define to 1 if you have the <openssl/crypto.h> header file. */
- /* #undef HAVE_OPENSSL_CRYPTO_H */
-+#define HAVE_OPENSSL_CRYPTO_H 1
- 
- /* Have openssl MD5 digest */
- /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */
-+#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1
- 
- /* Have openssl RIPEMD160 digest */
- /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */
-+#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1
- 
- /* Have openssl SHA1 digest */
- /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */
-+#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1
- 
- /* Have openssl digests */
- /* #undef HAVE_OPENSSL_DIGESTS */
-+#define HAVE_OPENSSL_DIGESTS 1
- 
- /* Define to 1 if you have the <pthread.h> header file. */
- /* #undef HAVE_PTHREAD_H */
-+#ifdef __MINGW32__
-+#undef HAVE_PTHREAD_H
-+#endif
- 
- /* Define to 1 if you have the <stdint.h> header file. */
- #define HAVE_STDINT_H 1
-@@ -246,7 +255,7 @@
- #define SIZEOF_UNSIGNED_LONG_LONG 8
- 
- /* SQLite API version */
--#define SQLITE_API 3
-+// #define SQLITE_API 3
- 
- /* Define to 1 if you have the ANSI C header files. */
- #define STDC_HEADERS 1
-@@ -254,14 +263,17 @@
- /* Building file storage */
- #define STORAGE_FILE 1
- 
-+#define STORAGE_HASHES 1
-+#define STORAGE_MEMORY 1
-+
- /* Building MySQL storage */
--#define STORAGE_MYSQL 1
-+// #define STORAGE_MYSQL 1
- 
- /* Building PostgreSQL storage */
- /*#undef STORAGE_POSTGRESQL*/
- 
- /* Building SQLite storage */
--#define STORAGE_SQLITE 1
-+// #define STORAGE_SQLITE 1
- 
- /* Building 3store storage */
- /*#undef STORAGE_TSTORE*/
---- misc/redland-1.0.8/utils/rdfproc.c	Tue Jul  1 05:10:25 2008
-+++ misc/build/redland-1.0.8/utils/rdfproc.c	Wed Feb 18 13:26:41 2009
-@@ -28,7 +28,7 @@
- #endif
- 
- #ifdef WIN32
--#include <win32_config.h>
-+#include <win32_rdf_config.h>
- #endif
- 
- #include <stdio.h>
diff --git a/redland/redland/redland-aix.patch b/redland/redland/redland-aix.patch
deleted file mode 100644
index 20d52e4..0000000
--- a/redland/redland/redland-aix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- misc/redland-1.0.8/config.guess	2010-09-16 03:21:03.000000000 -0500
-+++ misc/build/redland-1.0.8/config.guess	2010-09-16 03:22:33.000000000 -0500
-@@ -532,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,6 +544,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map
deleted file mode 100644
index 5798f46..0000000
--- a/redland/redland/redland2.map
+++ /dev/null
@@ -1,316 +0,0 @@
-UDK_3_0_0 {
-global:
-GetVersionInfo;
-librdf_get_concept_resource_by_index;
-librdf_get_concept_uri_by_index;
-librdf_new_digest;
-librdf_digest_update_string;
-librdf_digest_final;
-librdf_digest_print;
-librdf_digest_to_string;
-librdf_free_digest;
-librdf_digest_get_digest_length;
-librdf_digest_get_digest;
-librdf_digest_update;
-librdf_digest_init;
-librdf_new_hash_from_string;
-librdf_new_hash_from_array_of_strings;
-librdf_hash_get_del;
-librdf_hash_get_as_boolean;
-librdf_hash_get_as_long;
-librdf_hash_get;
-librdf_hash_interpret_template;
-librdf_hash_print;
-librdf_hash_print_keys;
-librdf_hash_print_values;
-librdf_new_hash_from_hash;
-librdf_free_hash;
-librdf_hash_put_strings;
-librdf_version_decimal;
-librdf_version_release;
-librdf_version_minor;
-librdf_version_major;
-librdf_version_string;
-librdf_copyright_string;
-librdf_short_copyright_string;
-librdf_init_world;
-librdf_new_world;
-librdf_destroy_world;
-librdf_free_world;
-librdf_world_open;
-librdf_world_init_mutex;
-librdf_world_set_feature;
-librdf_world_get_feature;
-librdf_world_set_digest;
-librdf_world_set_logger;
-librdf_world_set_warning;
-librdf_world_set_error;
-librdf_iterator_have_elements;
-librdf_iterator_end;
-librdf_iterator_next;
-librdf_iterator_get_object;
-librdf_iterator_get_context;
-librdf_iterator_get_key;
-librdf_iterator_get_value;
-librdf_free_iterator;
-librdf_iterator_add_map;
-librdf_new_iterator;
-librdf_new_empty_iterator;
-librdf_log_message_locator;
-librdf_log_message_message;
-librdf_log_message_facility;
-librdf_log_message_level;
-librdf_log_message_code;
-librdf_new_model;
-librdf_new_model_with_options;
-librdf_model_enumerate;
-librdf_free_model;
-librdf_model_add_typed_literal_statement;
-librdf_model_add_string_literal_statement;
-librdf_model_add;
-librdf_model_get_source;
-librdf_model_get_arc;
-librdf_model_get_target;
-librdf_model_add_submodel;
-librdf_model_remove_submodel;
-librdf_model_print;
-librdf_model_add_statement;
-librdf_model_remove_statement;
-librdf_model_contains_statement;
-librdf_model_context_add_statements;
-librdf_model_context_add_statement;
-librdf_model_context_remove_statements;
-librdf_model_context_remove_statement;
-librdf_model_find_statements_with_options;
-librdf_model_find_statements_in_context;
-librdf_new_model_from_model;
-librdf_model_size;
-librdf_model_add_statements;
-librdf_model_as_stream;
-librdf_model_serialise;
-librdf_model_find_statements;
-librdf_model_get_sources;
-librdf_model_get_arcs;
-librdf_model_get_targets;
-librdf_model_get_arcs_in;
-librdf_model_get_arcs_out;
-librdf_model_has_arc_in;
-librdf_model_has_arc_out;
-librdf_model_contains_context;
-librdf_model_context_as_stream;
-librdf_model_context_serialize;
-librdf_model_query_execute;
-librdf_model_sync;
-librdf_model_get_storage;
-librdf_model_get_contexts;
-librdf_model_get_feature;
-librdf_model_set_feature;
-librdf_model_load;
-librdf_model_to_string;
-librdf_model_to_counted_string;
-librdf_model_transaction_get_handle;
-librdf_model_transaction_rollback;
-librdf_model_transaction_commit;
-librdf_model_transaction_start_with_handle;
-librdf_model_transaction_start;
-librdf_new_node_from_uri_local_name;
-librdf_new_node_from_normalised_uri_string;
-librdf_node_decode;
-librdf_new_node_from_uri_string;
-librdf_new_node_from_uri;
-librdf_new_node_from_literal;
-librdf_new_node_from_typed_literal;
-librdf_new_node_from_typed_counted_literal;
-librdf_new_node;
-librdf_new_node_from_blank_identifier;
-librdf_free_node;
-librdf_node_get_literal_value_as_latin1;
-librdf_node_get_literal_value_is_wf_xml;
-librdf_node_get_li_ordinal;
-librdf_node_print;
-librdf_node_to_string;
-librdf_node_to_counted_string;
-librdf_node_encode;
-librdf_node_static_iterator_create;
-librdf_new_node_from_node;
-librdf_node_get_uri;
-librdf_node_get_type;
-librdf_node_get_literal_value;
-librdf_node_get_literal_value_as_counted_string;
-librdf_node_get_literal_value_language;
-librdf_node_get_literal_value_datatype_uri;
-librdf_node_get_blank_identifier;
-librdf_node_is_resource;
-librdf_node_is_literal;
-librdf_node_is_blank;
-librdf_node_equals;
-librdf_parser_register_factory;
-librdf_new_parser;
-librdf_parser_enumerate;
-librdf_new_parser_from_factory;
-librdf_free_parser;
-librdf_parser_parse_as_stream;
-librdf_parser_parse_into_model;
-librdf_parser_parse_string_as_stream;
-librdf_parser_parse_string_into_model;
-librdf_parser_parse_counted_string_as_stream;
-librdf_parser_parse_counted_string_into_model;
-librdf_parser_get_feature;
-librdf_parser_set_feature;
-librdf_parser_guess_name;
-librdf_parser_get_uri_filter;
-librdf_parser_set_uri_filter;
-librdf_parser_get_namespaces_seen_count;
-librdf_parser_get_namespaces_seen_uri;
-librdf_parser_get_namespaces_seen_prefix;
-librdf_parser_get_accept_header;
-librdf_parser_set_warning;
-librdf_parser_set_error;
-librdf_query_register_factory;
-librdf_new_query;
-librdf_new_query_from_query;
-librdf_new_query_from_factory;
-librdf_free_query;
-librdf_query_execute;
-librdf_query_set_offset;
-librdf_query_get_offset;
-librdf_query_set_limit;
-librdf_query_get_limit;
-librdf_free_query_results;
-librdf_query_results_to_string;
-librdf_query_results_to_counted_string;
-librdf_query_results_to_file;
-librdf_query_results_to_file_handle;
-librdf_query_results_get_count;
-librdf_query_results_next;
-librdf_query_results_finished;
-librdf_query_results_get_bindings;
-librdf_query_results_get_binding_value;
-librdf_query_results_get_binding_name;
-librdf_query_results_get_binding_value_by_name;
-librdf_query_results_get_bindings_count;
-librdf_query_results_is_bindings;
-librdf_query_results_is_boolean;
-librdf_query_results_is_graph;
-librdf_query_results_is_syntax;
-librdf_query_results_get_boolean;
-librdf_query_results_as_stream;
-librdf_query_results_formats_check;
-librdf_query_results_formats_enumerate;
-librdf_query_results_formatter_write;
-librdf_free_query_results_formatter;
-librdf_new_query_results_formatter_by_mime_type;
-librdf_new_query_results_formatter;
-librdf_serializer_register_factory;
-librdf_new_serializer;
-librdf_serializer_enumerate;
-librdf_new_serializer_from_factory;
-librdf_free_serializer;
-librdf_serializer_serialize_stream_to_file;
-librdf_serializer_serialize_model_to_file;
-librdf_serializer_set_namespace;
-librdf_serializer_serialize_stream_to_file_handle;
-librdf_serializer_serialize_model;
-librdf_serializer_serialize_model_to_file_handle;
-librdf_serializer_serialize_stream_to_counted_string;
-librdf_serializer_serialize_model_to_counted_string;
-librdf_serializer_serialize_stream_to_string;
-librdf_serializer_serialize_model_to_string;
-librdf_serializer_serialize_stream_to_iostream;
-librdf_serializer_serialize_model_to_iostream;
-librdf_serializer_get_feature;
-librdf_serializer_set_feature;
-librdf_serializer_set_warning;
-librdf_serializer_set_error;
-librdf_new_statement_from_statement;
-librdf_new_statement_from_nodes;
-librdf_new_statement;
-librdf_statement_init;
-librdf_free_statement;
-librdf_statement_is_complete;
-librdf_statement_print;
-librdf_statement_to_string;
-librdf_statement_equals;
-librdf_statement_match;
-librdf_statement_encode;
-librdf_statement_encode_parts;
-librdf_statement_decode;
-librdf_statement_decode_parts;
-librdf_statement_clear;
-librdf_statement_get_subject;
-librdf_statement_set_subject;
-librdf_statement_get_predicate;
-librdf_statement_set_predicate;
-librdf_statement_get_object;
-librdf_statement_set_object;
-librdf_storage_register_factory;
-librdf_new_storage;
-librdf_new_storage_with_options;
-librdf_storage_enumerate;
-librdf_new_storage_from_factory;
-librdf_storage_context_add_statements;
-librdf_storage_add_statements;
-librdf_storage_context_add_statement;
-librdf_storage_add_statement;
-librdf_storage_contains_statement;
-librdf_storage_find_statements;
-librdf_storage_has_arc_in;
-librdf_storage_get_sources;
-librdf_storage_get_arcs;
-librdf_storage_has_arc_out;
-librdf_storage_get_targets;
-librdf_storage_get_arcs_in;
-librdf_storage_get_arcs_out;
-librdf_new_storage_from_storage;
-librdf_storage_remove_reference;
-librdf_free_storage;
-librdf_storage_context_remove_statements;
-librdf_storage_find_statements_with_options;
-librdf_storage_find_statements_in_context;
-librdf_storage_open;
-librdf_storage_close;
-librdf_storage_size;
-librdf_storage_remove_statement;
-librdf_storage_context_remove_statement;
-librdf_storage_context_serialise;
-librdf_storage_context_as_stream;
-librdf_storage_supports_query;
-librdf_storage_query_execute;
-librdf_storage_sync;
-librdf_storage_get_contexts;
-librdf_storage_get_feature;
-librdf_storage_set_feature;
-librdf_storage_transaction_get_handle;
-librdf_storage_transaction_rollback;
-librdf_storage_transaction_commit;
-librdf_storage_transaction_start_with_handle;
-librdf_storage_transaction_start;
-librdf_storage_serialise;
-librdf_storage_add_reference;
-librdf_free_stream;
-librdf_stream_print;
-librdf_stream_end;
-librdf_stream_next;
-librdf_stream_get_object;
-librdf_stream_get_context;
-librdf_stream_add_map;
-librdf_new_stream_from_node_iterator;
-librdf_new_stream;
-librdf_new_empty_stream;
-librdf_new_uri_from_uri_local_name;
-librdf_new_uri_normalised_to_base;
-librdf_new_uri_relative_to_base;
-librdf_new_uri_from_filename;
-librdf_new_uri;
-librdf_free_uri;
-librdf_uri_print;
-librdf_uri_to_string;
-librdf_uri_to_counted_string;
-librdf_uri_is_file_uri;
-librdf_uri_to_filename;
-librdf_new_uri_from_uri;
-librdf_uri_as_string;
-librdf_uri_as_counted_string;
-librdf_uri_equals;
-librdf_uri_compare;
-};
diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk
deleted file mode 100644
index e5389da..0000000
--- a/redland/redlandversion.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-RAPTOR_MAJOR=1
-RASQAL_MAJOR=1
-# redland has no stable abi
-REDLAND_MAJOR=0
-
diff --git a/rhino/README b/rhino/README
deleted file mode 100644
index f8f47a1..0000000
--- a/rhino/README
+++ /dev/null
@@ -1,12 +0,0 @@
-The Scripting Framework makes use of the Rhino (http://www.mozilla.org/rhino/)
-JavaScript interpreter, available under the Mozilla Public License 
-(http://www.mozilla.org/MPL/MPL-1.1.html).
-
-In addition, to support the debugging of scripts contained in OpenOffice.org
-documents, we have modified the Java source file Main.java.
-
-The Rhino source tarball is unpacked and patched with the modified code. The
-Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and
-built as part of this procesS) and delivered to the solver. The file
-rhino1_5R5.patch contains the changes made in order to build Rhino. The patch
-was generated using the command: diff -wurN
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
deleted file mode 100644
index 91117d9..0000000
--- a/rhino/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=ooo_rhino
-TARGET=ooo_rhino
-
-.IF "$(SOLAR_JAVA)"!=""
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  antsettings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=rhino1_5R5
-TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685
-TARFILE_ROOTDIR=rhino1_5R5
-
-ADDITIONAL_FILES= \
-    toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
-
-PATCH_FILES=rhino1_5R5.patch \
-    rhino1_5R5-find_swing.patch \
-    rhino1_5R5-updateToolTip.patch
-
-.IF "$(OS_FOR_BUILD)"=="WNT"
-FIXED_TARFILE_LOCATION=`cygpath -m -s "$(TARFILE_LOCATION)"`
-.ELSE
-FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
-.ENDIF
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
-.ELSE
-BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ELSE
-all:
-        @echo java disabled
-.ENDIF
diff --git a/rhino/prj/build.lst b/rhino/prj/build.lst
deleted file mode 100644
index d23bc36..0000000
--- a/rhino/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-xh	rhino	:	soltools NULL
-xh	rhino		usr1	-	all	xh_mkout NULL
-xh	rhino      nmake	-	all	xh_rhino NULL
diff --git a/rhino/prj/d.lst b/rhino/prj/d.lst
deleted file mode 100644
index b98f6b7..0000000
--- a/rhino/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin\js.jar
diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch
deleted file mode 100644
index 220c4f4..0000000
--- a/rhino/rhino1_5R5-find_swing.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/rhino1_5R5/toolsrc/build.xml	2009-10-29 18:29:46.605524507 +0100
-+++ misc/build/rhino1_5R5/toolsrc/build.xml	2009-10-29 18:29:26.536908810 +0100
-@@ -12,6 +12,8 @@
-       <os family="unix"/>
-     </and>
-   </condition>
-+  <property environment="solenv"/>
-+  <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/>
-   <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
-   <!-- rhino.jar from OpenJDK breaks build -->
-   <path id="nonMacPath">
-@@ -38,7 +42,7 @@
-     <!-- Download source from Sun's site, unzip it, remove
-          the files we don't need, and change the package
-     -->
--    <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/>
-+    <unzip src="${swing_zip}" dest="${src.debugger}"/>
-     <delete file="${src.debugger}/FileSystemModel2.java" />
-     <delete file="${src.debugger}/MergeSort.java" />
-     <delete file="${src.debugger}/TreeTableExample2.java" />
diff --git a/rhino/rhino1_5R5-updateToolTip.patch b/rhino/rhino1_5R5-updateToolTip.patch
deleted file mode 100644
index 16857d3..0000000
--- a/rhino/rhino1_5R5-updateToolTip.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	Wed Feb 23 10:25:09 2011
-+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	Wed Feb 23 10:25:01 2011
-@@ -1045,9 +1045,18 @@
-             } );
-     }
- 
-+    // Fix taken from <ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip>
-+    // toolsrc/org/mozilla/javascript/tools/debugger/SwingGui.java:
-     private void updateToolTip() {
--        // in case fileName is very long, try to set tool tip on frame
--        Component c = getComponent(1);
-+        // Try to set tool tip on frame. On Mac OS X 10.5,
-+        // the number of components is different, so try to be safe.
-+        int n = getComponentCount() - 1;
-+        if (n > 1) {
-+            n = 1;
-+        } else if (n < 0) {
-+            return;
-+        }
-+        Component c = getComponent(n);
-         // this will work at least for Metal L&F
-         if (c != null && c instanceof JComponent) {
-             ((JComponent)c).setToolTipText(getUrl());
diff --git a/rhino/rhino1_5R5.patch b/rhino/rhino1_5R5.patch
deleted file mode 100644
index 21b4a48..0000000
--- a/rhino/rhino1_5R5.patch
+++ /dev/null
@@ -1,1205 +0,0 @@
---- misc/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java	Thu Mar 25 21:54:34 2004
-+++ misc/build/rhino1_5R5/src/org/mozilla/javascript/DefiningClassLoader.java	Fri Mar 28 17:24:23 2008
-@@ -38,6 +38,7 @@
- package org.mozilla.javascript;
- 
- import java.lang.reflect.Method;
-+import java.lang.reflect.InvocationTargetException;
- 
- /**
-  * Load generated classes.
-@@ -48,11 +49,34 @@
-     implements GeneratedClassLoader
- {
-     public DefiningClassLoader() {
--        this.parentLoader = getClass().getClassLoader();
-+        init(getClass().getClassLoader());
-     }
- 
-     public DefiningClassLoader(ClassLoader parentLoader) {
-+
-+        init(parentLoader);
-+    }
-+
-+    private void init(ClassLoader parentLoader) {
-+
-         this.parentLoader = parentLoader;
-+
-+        this.contextLoader = null;
-+        if (method_getContextClassLoader != null) {
-+            try {
-+                this.contextLoader = (ClassLoader)
-+                    method_getContextClassLoader.invoke(
-+                        Thread.currentThread(),
-+                        ScriptRuntime.emptyArgs);
-+            } catch (IllegalAccessException ex) {
-+            } catch (InvocationTargetException ex) {
-+            } catch (SecurityException ex) {
-+            }
-+            if (this.contextLoader == this.parentLoader) {
-+                this.contextLoader = null;
-+            }
-+        }
-+
-     }
- 
-     public Class defineClass(String name, byte[] data) {
-@@ -68,10 +92,20 @@
-     {
-         Class cl = findLoadedClass(name);
-         if (cl == null) {
--            if (parentLoader != null) {
--                cl = parentLoader.loadClass(name);
-+            // First try parent class loader and if that does not work, try
-+            // contextLoader, but that will be null if
-+            // Thread.getContextClassLoader() == parentLoader
-+            // or on JDK 1.1 due to lack Thread.getContextClassLoader().
-+            // To avoid catching and rethrowing ClassNotFoundException
-+            // in this cases, use try/catch check only if contextLoader != null.
-+            if (contextLoader == null) {
-+                cl = loadFromParent(name);
-             } else {
--                cl = findSystemClass(name);
-+                try {
-+                    cl = loadFromParent(name);
-+                } catch (ClassNotFoundException ex) {
-+                    cl = contextLoader.loadClass(name);
-+                }
-             }
-         }
-         if (resolve) {
-@@ -80,5 +114,37 @@
-         return cl;
-     }
- 
-+    private Class loadFromParent(String name)
-+        throws ClassNotFoundException
-+    {
-+        if (parentLoader != null) {
-+            return parentLoader.loadClass(name);
-+        } else {
-+            return findSystemClass(name);
-+        }
-+
-+    }
-+
-     private ClassLoader parentLoader;
-+
-+    private ClassLoader contextLoader;
-+
-+    // We'd like to use "Thread.getContextClassLoader", but
-+    // that's only available on Java2.
-+    private static Method method_getContextClassLoader;
-+
-+    static {
-+        try {
-+            // Don't use "Thread.class": that performs the lookup
-+            // in the class initializer, which doesn't allow us to
-+            // catch possible security exceptions.
-+            Class threadClass = Class.forName("java.lang.Thread");
-+            method_getContextClassLoader =
-+                threadClass.getDeclaredMethod("getContextClassLoader",
-+                                               new Class[0]);
-+        } catch (ClassNotFoundException e) {
-+        } catch (NoSuchMethodException e) {
-+        } catch (SecurityException e) {
-+        }
-+    }
- }
---- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 21:54:34.000000000 +0100
-+++ misc/build/rhino1_5R5/toolsrc/build.xml	2009-01-17 20:46:44.000000000 +0100
-@@ -6,6 +6,24 @@
- -->
- <project name="toolsrc" default="compile" basedir=".">
- 
-+  <condition property="boot_refID" value="macPath" else="nonMacPath">
-+    <and>
-+      <os family="mac"/>
-+      <os family="unix"/>
-+    </and>
-+  </condition>
-+  <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
-+  <!-- rhino.jar from OpenJDK breaks build -->
-+  <path id="nonMacPath">
-+    <fileset dir="${java.home}/">
-+       <include name="jre/lib/*.jar"/>
-+       <include name="lib/*.jar"/>
-+       <exclude name="jre/lib/rhino.jar"/>
-+       <exclude name="lib/rhino.jar"/>
-+     </fileset>
-+  </path>
-+  <path id="my.bootstrap.classpath" refID="${boot_refID}"/>
-+
-   <target name="properties">
-     <property name="nest" value=".."/>
-     <property name="build.dir" value="./build"/>
-@@ -20,46 +38,10 @@
-     <!-- Download source from Sun's site, unzip it, remove
-          the files we don't need, and change the package
-     -->
--    <get src="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip" dest="${nest}/${build.dir}/swingExSrc.zip"/>
--    <unzip src="${nest}/${build.dir}/swingExSrc.zip" dest="${src.debugger}"/>
-+    <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/>
-     <delete file="${src.debugger}/FileSystemModel2.java" />
-     <delete file="${src.debugger}/MergeSort.java" />
-     <delete file="${src.debugger}/TreeTableExample2.java" />
--    <replace file="${src.debugger}/AbstractCellEditor.java">
--       <replacetoken>import java.awt.Component;</replacetoken>
--       <replacevalue>
--         package org.mozilla.javascript.tools.debugger;
--         import java.awt.Component;
--       </replacevalue>
--    </replace>
--    <replace file="${src.debugger}/AbstractTreeTableModel.java">
--       <replacetoken>import javax.swing.tree.*;</replacetoken>
--       <replacevalue>
--         package org.mozilla.javascript.tools.debugger;
--         import javax.swing.tree.*;
--       </replacevalue>
--    </replace>
--    <replace file="${src.debugger}/JTreeTable.java">
--       <replacetoken>import javax.swing.*;</replacetoken>
--       <replacevalue>
--         package org.mozilla.javascript.tools.debugger;
--         import javax.swing.*;
--       </replacevalue>
--    </replace>
--    <replace file="${src.debugger}/TreeTableModel.java">
--       <replacetoken>import javax.swing.tree.TreeModel;</replacetoken>
--       <replacevalue>
--         package org.mozilla.javascript.tools.debugger;
--         import javax.swing.tree.TreeModel;
--       </replacevalue>
--    </replace>
--    <replace file="${src.debugger}/TreeTableModelAdapter.java">
--       <replacetoken>import javax.swing.JTree;</replacetoken>
--       <replacevalue>
--         package org.mozilla.javascript.tools.debugger;
--         import javax.swing.JTree;
--       </replacevalue>
--    </replace>
-   </target>
- 
-   <target name="compile" depends="properties,get-swing-ex">
-@@ -68,6 +50,7 @@
-            includes="org/**/*.java"
-            deprecation="on"
-            debug="${debug}">
-+      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
-     </javac>
-     <copy todir="${nest}/${classes}">
-       <fileset dir="." includes="org/**/*.properties" />
---- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	2004-03-25 21:54:34.000000000 +0100
-+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	2009-01-17 20:44:22.000000000 +0100
-@@ -470,15 +470,21 @@
-         case KeyEvent.VK_BACK_SPACE:
-         case KeyEvent.VK_ENTER:
-         case KeyEvent.VK_DELETE:
-+            if (w.isEditable() == false) {
-             e.consume();
-+            }
-             break;
-         }
-     }
-     public void keyTyped(KeyEvent e) {
-+        if (w.isEditable() == false) {
-         e.consume();
-+        }
-     }
-     public void keyReleased(KeyEvent e) {
-+        if (w.isEditable() == false) {
-         e.consume();
-+        }
-     }
- }
- 
-@@ -879,7 +885,7 @@
-     }
- };
- 
--class FileWindow extends JInternalFrame implements ActionListener {
-+class FileWindow extends JInternalFrame implements ActionListener, DocumentListener {
- 
-     Main db;
-     SourceInfo sourceInfo;
-@@ -888,15 +894,16 @@
-     JScrollPane p;
-     int currentPos;
-     JLabel statusBar;
-+    boolean isModified = false;
- 
-     public void actionPerformed(ActionEvent e) {
-         String cmd = e.getActionCommand();
-         if (cmd.equals("Cut")) {
--            // textArea.cut();
-+            textArea.cut();
-         } else if (cmd.equals("Copy")) {
-             textArea.copy();
-         } else if (cmd.equals("Paste")) {
--            // textArea.paste();
-+            textArea.paste();
-         }
-     }
- 
-@@ -910,17 +917,73 @@
-     }
- 
-     void load() {
--        Scriptable scope = db.getScope();
-+        //Scriptable scope = db.getScope();
-+        Scriptable scope = db.officeScripts.getScriptScope( getUrl() );
-+        if ( scope == null )
-+        {
-+            scope = db.getScope();
-+        }
-         if (scope == null) {
-             MessageDialogWrapper.showMessageDialog(db, "Can't load scripts: no scope available", "Run", JOptionPane.ERROR_MESSAGE);
-         } else {
-             String url = getUrl();
-             if (url != null) {
--                new Thread(new LoadFile(db,scope,url)).start();
-+                new Thread(new LoadFile(db,scope, url, new StringReader(textArea.getText()))).start();
-             }
-         }
-     }
- 
-+    void save() {
-+        if (getUrl() != null) {
-+            OutputStream os = null;
-+            try {
-+                if ( getUrl().startsWith("vnd.sun.star")  )
-+                {
-+                    URL scriptUrl = db.officeScripts.getScriptUrl( getUrl() );
-+                    if ( scriptUrl == null )
-+                    {
-+                        throw new IOException("Can't optain stream for " + getUrl() );
-+                    }
-+                    os = scriptUrl.openConnection().getOutputStream();
-+                }
-+                else
-+                {
-+                   os = new FileOutputStream( getUrl() );
-+                }
-+                String s = textArea.getText();
-+                os.write(s.getBytes(), 0, s.length());
-+
-+                this.isModified = false;
-+            }
-+            catch (IOException ioe) {
-+                JOptionPane.showMessageDialog(this,
-+                    "Error saving file: " + ioe.getMessage(),
-+                    "Error", JOptionPane.ERROR_MESSAGE);
-+            }
-+            finally
-+            {
-+                if ( os != null )
-+                {
-+                    try
-+                    {
-+                        os.close();
-+                        os = null;
-+                    }
-+                    catch( IOException ioe )
-+                    {
-+                        System.err.println("Error closing stream: " + ioe.getMessage() );
-+                        ioe.printStackTrace();
-+                    }
-+                }
-+            }
-+        }
-+   }
-+
-+   public boolean isEditable() {
-+       return db.isSourceEditingEnabled();
-+   }
-+
-+
-    public int getPosition(int line) {
-         int result = -1;
-         try {
-@@ -953,7 +1016,7 @@
-             fileHeader.repaint();
-         }
-     }
--
-+    public Main getDB() { return db; }
-     FileWindow(Main db, SourceInfo sourceInfo) {
-         super(SourceInfo.getShortName(sourceInfo.getUrl()),
-               true, true, true, true);
-@@ -972,6 +1035,14 @@
-         pack();
-         updateText();
-         textArea.select(0);
-+        addInternalFrameListener( new InternalFrameAdapter() {
-+            public void internalFrameClosed(InternalFrameEvent e) {
-+                    // clean up scriptItems and sourceNames hashes
-+                    getDB().removeScript( getUrl() );
-+                    // remove scripts for officeScripts
-+                    getDB().officeScripts.deleteScript( getUrl() );
-+                }
-+            } );
-     }
- 
-     private void updateToolTip() {
-@@ -990,7 +1061,10 @@
-     void updateText() {
-         String newText = sourceInfo.getSource();
-         if (!textArea.getText().equals(newText)) {
-+            textArea.getDocument().removeDocumentListener(this);
-             textArea.setText(newText);
-+            this.isModified = false;
-+            textArea.getDocument().addDocumentListener(this);
-             int pos = 0;
-             if (currentPos != -1) {
-                 pos = currentPos;
-@@ -1001,6 +1075,31 @@
-         fileHeader.repaint();
-     }
- 
-+    /* Implementation of DocumentListener interface */
-+    public void insertUpdate(DocumentEvent e) {
-+        doChanged(e);
-+    }
-+
-+    public void removeUpdate(DocumentEvent e) {
-+        doChanged(e);
-+    }
-+
-+    public void changedUpdate(DocumentEvent e) {
-+        doChanged(e);
-+    }
-+
-+    public void doChanged(DocumentEvent e) {
-+        this.isModified = true;
-+    }
-+
-+    public boolean isModified() {
-+        return this.isModified;
-+    }
-+
-+    public String getText() {
-+        return textArea.getText();
-+    }
-+
-     void setPosition(int pos) {
-         textArea.select(pos);
-         currentPos = pos;
-@@ -1618,7 +1717,7 @@
-         if (line != -1) {
-             db.currentWindow = w;
-         }
--        db.menubar.addFile(url);
-+        // db.menubar.addFile(url);
-         w.setVisible(true);
-         if (activate) {
-             try {
-@@ -1752,8 +1851,10 @@
-     Menubar(Main db) {
-         super();
-         this.db = db;
--        String[] fileItems  = {"Open...", "Run...", "", "Exit"};
--        String[] fileCmds  = {"Open", "Load", "", "Exit"};
-+        // String[] fileItems  = {"Open...", "Run...", "", "Exit"};
-+        // String[] fileCmds  = {"Open", "Load", "", "Exit"};
-+        String[] fileItems  = {"Run", "Save", "", "Exit"};
-+        String[] fileCmds  = {"Run", "Save", "", "Exit"};
-         char[] fileShortCuts = {'0', 'N', '\0', 'X'};
-         int[] fileAccelerators = {KeyEvent.VK_O,
-                                   KeyEvent.VK_N,
-@@ -1795,6 +1896,9 @@
-                     KeyStroke k = KeyStroke.getKeyStroke(fileAccelerators[i], Event.CTRL_MASK);
-                     item.setAccelerator(k);
-                 }
-+                if (fileItems[i].equals("Save")) {
-+                    saveItem = item;
-+                }
-             }
-         }
-         for (int i = 0; i < editItems.length; ++i) {
-@@ -1849,9 +1953,9 @@
-         item.addActionListener(this);
-         windowMenu.add(item = new JMenuItem("Tile", 'T'));
-         item.addActionListener(this);
--        windowMenu.addSeparator();
--        windowMenu.add(item = new JMenuItem("Console", 'C'));
--        item.addActionListener(this);
-+//        windowMenu.addSeparator();
-+//        windowMenu.add(item = new JMenuItem("Console", 'C'));
-+//        item.addActionListener(this);
-         add(windowMenu);
- 
-     }
-@@ -1925,11 +2029,16 @@
-         item.addActionListener(this);
-     }
- 
-+    public void setSaveEnabled(boolean state) {
-+        saveItem.setEnabled(state);
-+    }
-+
-     Main db;
-     JMenu windowMenu;
-     JCheckBoxMenuItem breakOnExceptions;
-     JCheckBoxMenuItem breakOnEnter;
-     JCheckBoxMenuItem breakOnReturn;
-+    JMenuItem saveItem;
- };
- 
- class EnterInterrupt implements Runnable {
-@@ -1942,6 +2051,13 @@
-     public void run() {
-         JMenu menu = db.getJMenuBar().getMenu(0);
-         //menu.getItem(0).setEnabled(false); // File->Load
-+
-+        // disable Edit menu Cut, Copy, Paste items
-+        menu = db.getJMenuBar().getMenu(1);
-+        for (int i = 0; i < 3; i++) {
-+            menu.getItem(i).setEnabled(false);
-+        }
-+
-         menu = db.getJMenuBar().getMenu(2);
-         menu.getItem(0).setEnabled(false); // Debug->Break
-         int count = menu.getItemCount();
-@@ -1954,6 +2070,10 @@
-             b = true;
-         }
-         db.toolBar.setEnabled(true);
-+
-+        // set flag to disable source editing
-+        db.setSourceEditingEnabled(false);
-+
-         // raise the debugger window
-         db.toFront();
-     }
-@@ -1967,6 +2087,13 @@
-     public void run() {
-         JMenu menu = db.getJMenuBar().getMenu(0);
-         menu.getItem(0).setEnabled(true); // File->Load
-+
-+        // enable Edit menu items
-+        menu = db.getJMenuBar().getMenu(1);
-+        for (int i = 0; i < 3; i++) {
-+            menu.getItem(i).setEnabled(true);
-+        }
-+
-         menu = db.getJMenuBar().getMenu(2);
-         menu.getItem(0).setEnabled(true); // Debug->Break
-         int count = menu.getItemCount() - 1;
-@@ -1980,6 +2107,10 @@
-             db.toolBar.getComponent(ci).setEnabled(b);
-             b = false;
-         }
-+
-+        // set flag to enable source editing
-+        db.setSourceEditingEnabled(true);
-+
-         //db.console.consoleTextArea.requestFocus();
-     }
- };
-@@ -1988,17 +2119,24 @@
- {
-     String fileName;
-     Main db;
-+    Reader reader = null;
-     OpenFile(Main db, String fileName)
-     {
-         this.fileName = fileName;
-         this.db = db;
-     }
-+    OpenFile(Main db, String fileName, Reader reader) {
-+        this(db, fileName);
-+        this.reader = reader;
-+    }
-     public void run() {
-         Context cx = Context.enter();
-         ContextData contextData = ContextData.get(cx);
-         contextData.breakNextLine = true;
-         try {
--            cx.compileReader(new FileReader(fileName), fileName, 1, null);
-+            cx.compileReader(
-+                reader == null ? new FileReader(fileName) : reader,
-+                               fileName, 1, null);
-         } catch (Exception exc) {
-             String msg = exc.getMessage();
-             if (exc instanceof EcmaError) {
-@@ -2019,29 +2157,79 @@
-     Scriptable scope;
-     String fileName;
-     Main db;
-+    Reader reader = null;
-+    Object result = null;
-+    Exception exception = null;
-+    int lineNum = -1;
-+    boolean sfExecute = false;
-+
-     LoadFile(Main db, Scriptable scope, String fileName) {
-         this.scope = scope;
-         this.fileName = fileName;
-         this.db = db;
-     }
-+
-+    LoadFile(Main db, Scriptable scope, String fileName, Reader reader) {
-+        this(db, scope, fileName);
-+        this.reader = reader;
-+    }
-+    LoadFile(Main db, Scriptable scope, String fileName, Reader reader, boolean sfExecute ) {
-+        this(db, scope, fileName);
-+        this.reader = reader;
-+        this.sfExecute = sfExecute;
-+    }
-+
-     public void run() {
-+        if ( db.officeScripts.isScriptRunning( fileName ) )
-+        { 
-+            exception = new Exception("The script is already executing");
-+            if ( !sfExecute ) {
-+                MessageDialogWrapper.showMessageDialog(db,
-+                                                   "Script already executing",
-+                                                   "Run",
-+                                                   JOptionPane.ERROR_MESSAGE);
-+            }
-+            return;
-+        } 
-+        db.officeScripts.setScriptRunning( fileName, true );
-         Context cx = Context.enter();
-         ContextData contextData = ContextData.get(cx);
-+        if ( sfExecute )
-+        {
-+            contextData.breakNextLine = false;
-+        }
-+        else
-+        {
-         contextData.breakNextLine = true;
-+        }
-+        /*
-+        FileWindow w = (FileWindow)db.getSelectedFrame();
-+        if ( sfExecute )        
-+        {
-+            db.swingInvoke(new SetFilePosition(db, w, -1 ) );                
-+        }*/
-         try {
--            cx.evaluateReader(scope, new FileReader(fileName),
-+            result = cx.evaluateReader(scope,
-+                reader == null ? new FileReader(fileName) : reader,
-                               fileName, 1, null);
-         } catch (Exception exc) {
-+            exception = exc;
-             String msg = exc.getMessage();
-             if (exc instanceof EcmaError) {
-                 EcmaError err = (EcmaError)exc;
-                 msg = err.getSourceName() + ", line " + err.getLineNumber() + ": " + msg;
--            }
-+    
-+                int lineNum =  err.getLineNumber() ;
-+                //db.swingInvoke(new SetFilePosition(db, w, lineNum ) );
-+                if ( !sfExecute ) {
-             MessageDialogWrapper.showMessageDialog(db,
-                                                    msg,
-                                                    "Run",
-                                                    JOptionPane.ERROR_MESSAGE);
-+                }
-+            }
-         } finally {
-+            db.officeScripts.setScriptRunning( fileName, false );
-             cx.exit();
-         }
-     }
-@@ -2416,13 +2604,13 @@
-         super.setVisible(b);
-         if (b) {
-             // this needs to be done after the window is visible
--            console.consoleTextArea.requestFocus();
-+            // console.consoleTextArea.requestFocus();
-             context.split.setDividerLocation(0.5);
-             try {
--                console.setMaximum(true);
--                console.setSelected(true);
--                console.show();
--                console.consoleTextArea.requestFocus();
-+                // console.setMaximum(true);
-+                // console.setSelected(true);
-+                // console.show();
-+                // console.consoleTextArea.requestFocus();
-             } catch (Exception exc) {
-             }
-         }
-@@ -2449,35 +2637,6 @@
- 
-     Hashtable functionNames = new Hashtable();
- 
--    ScriptItem getScriptItem(DebuggableScript fnOrScript) {
--        ScriptItem item = (ScriptItem)scriptItems.get(fnOrScript);
--        if (item == null) {
--            String url = getNormilizedUrl(fnOrScript);
--            SourceInfo si = (SourceInfo)sourceNames.get(url);
--            if (si == null) {
--                if (!fnOrScript.isGeneratedScript()) {
--                    // Not eval or Function, try to load it from URL
--                    String source = null;
--                    try {
--                        InputStream is = openSource(url);
--                        try { source = readSource(is); }
--                        finally { is.close(); }
--                    } catch (IOException ex) {
--                        System.err.println
--                            ("Failed to load source from "+url+": "+ ex);
--                    }
--                    if (source != null) {
--                        si = registerSource(url, source);
--                    }
--                }
--            }
--            if (si != null) {
--                item = registerScript(si, fnOrScript);
--            }
--        }
--        return item;
--    }
--
-     /* Debugger Interface */
- 
-     public void handleCompilationDone(Context cx, DebuggableScript fnOrScript,
-@@ -2490,7 +2649,7 @@
- 
-     String getNormilizedUrl(DebuggableScript fnOrScript) {
-         String url = fnOrScript.getSourceName();
--        if (url == null) { url = "<stdin>"; }
-+        if (url == null) { url = "document"; }
-         else {
-             // Not to produce window for eval from different lines,
-             // strip line numbers, i.e. replace all #[0-9]+\(eval\) by (eval)
-@@ -2601,7 +2760,7 @@
-             if (si == null) {
-                 si = new SourceInfo(sourceUrl, source);
-                 sourceNames.put(sourceUrl, si);
--            } else {
-+            } else if (!source.equals(si.getSource())) {
-                 si.setSource(source);
-             }
-         }
-@@ -2762,7 +2921,7 @@
-         desk = new JDesktopPane();
-         desk.setPreferredSize(new Dimension(600, 300));
-         desk.setMinimumSize(new Dimension(150, 50));
--        desk.add(console = new JSInternalConsole("JavaScript Console"));
-+        // desk.add(console = new JSInternalConsole("JavaScript Console"));
-         context = new ContextWindow(this);
-         context.setPreferredSize(new Dimension(600, 120));
-         context.setMinimumSize(new Dimension(50, 50));
-@@ -2871,7 +3030,7 @@
-             FrameHelper frame = contextData.getFrame(frameIndex);
-             String sourceName = frame.getUrl();
-             if (sourceName == null || sourceName.equals("<stdin>")) {
--                console.show();
-+                // console.show();
-                 helper.reset();
-                 return;
-             }
-@@ -2895,6 +3054,19 @@
-     int dispatcherIsWaiting = 0;
-     Context currentContext = null;
- 
-+    // Flag used to establish whether source code editing is allowed in
-+    // the debugger, switched on and off depending on whether a debug session
-+    // is active
-+    boolean sourceEditingEnabled = true;
-+
-+    public boolean isSourceEditingEnabled() {
-+        return sourceEditingEnabled;
-+    }
-+
-+    void setSourceEditingEnabled(boolean b) {
-+        sourceEditingEnabled = b;
-+    }
-+
-     Context getCurrentContext() {
-         return currentContext;
-     }
-@@ -3028,14 +3200,14 @@
-                     swingInvoke(CreateFileWindow.action(this, si, line));
-                 }
-             } else {
--                if (console.isVisible()) {
-+                /* if (console.isVisible()) {
-                     final JSInternalConsole finalConsole = console;
-                     swingInvoke(new Runnable() {
-                             public void run() {
-                                 finalConsole.show();
-                             }
-                         });
--                }
-+                } */
-             }
-             swingInvoke(new EnterInterrupt(this, cx));
-             swingInvoke(new UpdateContext(this, cx));
-@@ -3217,6 +3389,14 @@
-                                             fileName)).start();
-                 }
-             }
-+        } else if (cmd.equals("Run")) {
-+            FileWindow w = (FileWindow)getSelectedFrame();
-+            if (w != null)
-+                w.load();
-+        } else if (cmd.equals("Save")) {
-+            FileWindow w = (FileWindow)getSelectedFrame();
-+            if (w != null)
-+                w.save();
-         } else if (cmd.equals("More Windows...")) {
-             MoreWindows dlg = new MoreWindows(this, fileWindows,
-                                               "Window", "Files");
-@@ -3509,6 +3689,60 @@
-         }
-     }
- 
-+    JInternalFrame getFrameForUrl( URL url )
-+    { 
-+        JInternalFrame[] frames = desk.getAllFrames();
-+        for (int i = 0; i < frames.length; i++) {
-+           FileWindow w = (FileWindow)frames[i];
-+           if ( url.toString().equals( w.getUrl() ) ) {
-+               return w;
-+               }
-+           }
-+        return null; 
-+    } 
-+    public void highlighLineInSelectedWindow(URL url, int lineNum ){
-+        //FileWindow w = (FileWindow)getFrameForUrl( url );
-+        FileWindow w = (FileWindow)getSelectedFrame();
-+        if (w != null)
-+        {
-+            if ( lineNum > -1 )
-+                swingInvoke(new SetFilePosition(this, w, lineNum ) );
-+        }
-+    }
-+    public Object  runSelectedWindow( URL scriptUrl ) throws Exception
-+    {
-+        Object result = null;
-+        FileWindow w = (FileWindow)getSelectedFrame();
-+        //FileWindow w = (FileWindow)getFrameForUrl( scriptUrl );
-+        w.toFront();
-+        if (w != null)
-+        {
-+            Scriptable scope = w.db.getScope();
-+            if (scope == null) 
-+            {
-+                MessageDialogWrapper.showMessageDialog(w.db, "Can't load scripts: no scope available", "Run", JOptionPane.ERROR_MESSAGE);
-+                result =  null;
-+            } 
-+            else 
-+            {
-+                String url = w.getUrl();
-+                Thread executorThread = null;
-+                if (url != null) 
-+                {
-+                    LoadFile executor = new  LoadFile(w.db,scope, url, new StringReader(w.textArea.getText()), true );
-+                    executor.run(); 
-+                    result = executor.result;  
-+                    if ( executor.exception != null )
-+                    {
-+                        throw executor.exception;
-+                    }
-+                }
-+            }
-+        }
-+        return result;
-+
-+    }
-+
-     //
-     // public interface
-     //
-@@ -3604,6 +3838,69 @@
-         return console.getErr();
-     }
- 
-+    public void openFile(URL scriptUrl, Scriptable scope, Runnable closeCallback ) {
-+        if (scope == null) {
-+            MessageDialogWrapper.showMessageDialog(this,
-+                "Can't compile scripts: no scope available",
-+                "Open", JOptionPane.ERROR_MESSAGE);
-+        } else {
-+            if (scriptUrl != null) {
-+                try
-+                {
-+                    InputStreamReader reader = new InputStreamReader(scriptUrl.openStream()); 
-+                    String fileName = null;
-+                    if ( scriptUrl.getProtocol().startsWith("vnd.sun.star.") )
-+                    {
-+                        fileName = scriptUrl.toString();
-+                    }
-+                    else
-+                    {
-+                        fileName = scriptUrl.getPath();
-+                    }
-+                    officeScripts.addScript( fileName, scriptUrl, scope, closeCallback  );
-+                    //new Thread(new OpenFile(this, scope, fileName, reader )).start();
-+                    swingInvoke( new OpenFile(this, fileName, reader ));
-+                }
-+                catch ( IOException e )
-+                {
-+                    MessageDialogWrapper.showMessageDialog(this,
-+                        "Can't open stream for script: " + e.toString(),
-+                        "Open", JOptionPane.ERROR_MESSAGE);
-+                }
-+            }
-+        }
-+        split1.setDividerLocation(1.0);
-+    }
-+
-+    public void openFile(String fileName) {
-+        Scriptable scope = getScope();
-+        if (scope == null) {
-+            MessageDialogWrapper.showMessageDialog(this,
-+                "Can't compile scripts: no scope available",
-+                "Open", JOptionPane.ERROR_MESSAGE);
-+        } else {
-+            if (fileName != null) {
-+                new Thread(new OpenFile(this, fileName)).start();
-+            }
-+        }
-+        split1.setDividerLocation(1.0);
-+    }
-+
-+    public void openStream(InputStream in) {
-+        Scriptable scope = getScope();
-+        if (scope == null) {
-+            MessageDialogWrapper.showMessageDialog(this,
-+                "Can't compile scripts: no scope available",
-+                "Open", JOptionPane.ERROR_MESSAGE);
-+        } else {
-+            if (in != null) {
-+                new Thread(new OpenFile(this, null, new InputStreamReader(in))).start();
-+            }
-+        }
-+        split1.setDividerLocation(1.0);
-+        menubar.setSaveEnabled(false);
-+    }
-+
-     public static void main(String[] args) {
-         try {
-             mainThread = Thread.currentThread();
-@@ -3635,5 +3932,162 @@
-         }
-     }
- 
-+    // patched Office specific interface
-+ 
-+    OfficeScriptInfo officeScripts = new OfficeScriptInfo();
-+
-+    void removeScript( String url )
-+    {
-+        // Remove the FileWindow from list of open sources
-+        fileWindows.remove( url );
-+
-+        // Remove sourceInfo from sourceNames, ensures that
-+        // breakpoints etc are deleted
-+        synchronized (sourceNames) {
-+            sourceNames.remove( url );
-+        }
-+        // Removes scriptItems for the script, ensures that a new open ( from openFile )
-+        // will succeed, openFile should open file but fails due to fact that 
-+        synchronized ( scriptItems ) 
-+        {   
-+            Iterator iter = scriptItems.entrySet().iterator();
-+            while ( iter.hasNext() )
-+            {
-+                Map.Entry me = ( Map.Entry )iter.next();
-+                ScriptItem item = (ScriptItem)me.getValue();
-+                SourceInfo si =   item.getSourceInfo();
-+                if ( si.getUrl().equals( url ) )
-+                {
-+                    //match
-+                    scriptItems.remove( me.getKey() );
-+                    break;
-+                }
-+            }
-+        }
-+        officeScripts.deleteScript( url );
-+    }
-+
-+
-+    ScriptItem getScriptItem(DebuggableScript fnOrScript) {
-+        ScriptItem item = (ScriptItem)scriptItems.get(fnOrScript);
-+        if (item == null) {
-+            String url = getNormilizedUrl(fnOrScript);
-+            SourceInfo si = (SourceInfo)sourceNames.get(url);
-+            if (si == null) {
-+                if (!fnOrScript.isGeneratedScript()) {
-+                    // Not eval or Function, try to load it from URL
-+                    String source = null;
-+                    try {
-+                        InputStream is = openSource(url);
-+                        try { source = readSource(is); }
-+                        finally { is.close(); }
-+                    } catch (IOException ex) {
-+                        System.err.println
-+                            ("Failed to load source from "+url+": "+ ex);
-+                    }
-+                    if (source != null) {
-+                        si = registerSource(url, source);
-+                    }
-+                }
-+            }
-+            if (si != null) {
-+                item = registerScript(si, fnOrScript);
-+            }
-+        }
-+        
-+        return item;
-+    }
-+
-+    public void showScriptWindow(URL url ){
-+        String key = url.getPath();
-+        if ( url.getProtocol().startsWith("vnd.sun.star") )
-+        {
-+            key = url.toString();
-+        }
-+        FileWindow w = (FileWindow)getFileWindow( key );
-+        if ( w != null )
-+        {
-+            //w.maximize();
-+            desk.getDesktopManager().deiconifyFrame(w);
-+            desk.getDesktopManager().activateFrame(w);
-+            w.show();
-+            w.toFront();
-+        }
-+    }
-+
-+    public void highlighLineInScriptWindow(URL url, int lineNum ){
-+        String key = url.getPath();
-+        if ( url.getProtocol().startsWith("vnd.sun.star") )
-+        {
-+            key = url.getPath();
-+        }
-+        FileWindow w = (FileWindow)getFileWindow( key );
-+        if (w != null)
-+        {
-+            if ( lineNum > -1 )
-+                swingInvoke(new SetFilePosition(this, w, lineNum ) );
-+        }
-+    }
-+    public Object runScriptWindow( URL scriptUrl ) throws Exception
-+    {
-+        String key = scriptUrl.getPath();
-+        if ( scriptUrl.getProtocol().startsWith("vnd.sun.star") )
-+        {
-+            key = scriptUrl.toString();
-+        }
-+        FileWindow w = (FileWindow)getFileWindow( key );
-+        Object result = null;
-+        w.toFront();
-+        if (w != null)
-+        {
-+            //Scriptable scope = w.db.getScope();
-+            Scriptable scope = w.db.officeScripts.getScriptScope( key );
-+            if (scope == null) 
-+            {
-+                MessageDialogWrapper.showMessageDialog(w.db, "Can't load scripts: no scope available", "Run", JOptionPane.ERROR_MESSAGE);
-+                result =  null;
-+            } 
-+            else 
-+            {
-+                String url = w.getUrl();
-+                Thread executorThread = null;
-+                if (url != null) 
-+                {
-+                    LoadFile executor = new  LoadFile(w.db,scope, url, new StringReader(w.textArea.getText()), true );
-+                    executor.run(); 
-+                    result = executor.result;  
-+                    if ( executor.exception != null )
-+                    {
-+                        throw executor.exception;
-+                    }
-+                }
-+            }
-+        }
-+        return result;
-+
-+    }
-+
-+    public boolean isModified( URL url ) 
-+    {
-+        String key = url.getPath();
-+        if ( url.getProtocol().startsWith("vnd.sun.star") )
-+        {
-+            key = url.toString();
-+        }
-+        FileWindow w = (FileWindow)getFileWindow( key );
-+        return w.isModified();
-+    }
-+
-+    public String getText( URL url )
-+    {
-+        String key = url.toString();
-+        if ( url.getProtocol().startsWith("vnd.sun.star") )
-+        {
-+            key = url.toString();
-+        }
-+        FileWindow w = (FileWindow)getFileWindow( key );
-+        return w.getText();
-+    }
-+
- }
- 
---- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java	Fri Mar 28 17:25:34 2008
-+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java	Fri Mar 28 17:24:59 2008
-@@ -1 +1,130 @@
--dummy
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+
-+package org.mozilla.javascript.tools.debugger;
-+import java.net.URL;
-+import java.util.Hashtable;
-+import org.mozilla.javascript.Scriptable;
-+
-+public class OfficeScriptInfo
-+{
-+    private Hashtable loadedSFScripts = new Hashtable();
-+   
-+    public void addScript( URL url, Scriptable scope, Runnable closeCallback )
-+    {
-+        addScript( url.toString(), url, scope, closeCallback );
-+    }
-+
-+    public void addScript( String key, URL url, Scriptable scope, Runnable closeCallback )
-+    {
-+        SFScriptInfo si = (SFScriptInfo)loadedSFScripts.get( key );
-+        if ( si == null )
-+        {
-+            si = new SFScriptInfo();
-+            si.url = url;
-+            si.scope = scope; 
-+            si.closeCallback = closeCallback; 
-+            loadedSFScripts.put( key, si );
-+        }  
-+    }   
-+
-+    public void deleteScript( String key )
-+    {
-+        SFScriptInfo info = (SFScriptInfo)loadedSFScripts.remove( key );
-+        if ( info != null )
-+        {
-+            if ( info.closeCallback != null )
-+            {
-+                System.out.println("** In removeSFScriptInfo  have callback for " + key );
-+                info.closeCallback.run(); // really need to do this in seperate thread????
-+            }
-+        }
-+    }
-+
-+    public Scriptable getScriptScope( String key )
-+    {
-+        Scriptable result = null;
-+        SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key );
-+        if ( info != null )
-+        {
-+            result = info.scope;
-+        }
-+        return result;
-+    } 
-+  
-+    public URL getScriptUrl( String key )
-+    {
-+        URL result = null;
-+        SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key );
-+        if ( info != null )
-+        {
-+            result = info.url;
-+        }
-+        return result;
-+    } 
-+    public boolean hasScript( String key )
-+    {
-+        boolean result = true;
-+        SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key );
-+        if ( info == null )
-+        {
-+            result = false;
-+        }      
-+        return result;
-+    } 
-+
-+    public void setScriptRunning( String key, boolean running )
-+    {
-+        SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key );
-+        if ( info != null )
-+        {
-+            info.isExecuting = running;
-+        }
-+    }
-+
-+    public boolean isScriptRunning( String key )
-+    {
-+        boolean result = false;
-+        SFScriptInfo info = (SFScriptInfo)loadedSFScripts.get( key );
-+        if ( info != null )
-+        {
-+            result = info.isExecuting;
-+        }
-+        return result;
-+    }
-+
-+    
-+  
-+    class SFScriptInfo
-+    {
-+        Scriptable scope;
-+        boolean isExecuting;
-+        URL url;
-+        Runnable closeCallback;
-+    }
-+}
---- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	Thu Mar 25 21:54:34 2004
-+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	Fri Mar 28 17:24:23 2008
-@@ -36,6 +36,7 @@
- package org.mozilla.javascript.tools.shell;
- 
- import java.security.*;
-+import java.security.cert.Certificate;
- import java.net.MalformedURLException;
- import java.net.URL;
- import java.util.Hashtable;
-@@ -124,7 +125,7 @@
- 
-     public JavaPolicySecurity() {
-         // To trigger error on jdk-1.1 with lazy load
--        new CodeSource(null, null);
-+        new CodeSource(null, (Certificate [])null);
-     }
- 
-     protected void callProcessFileSecure(final Context cx,
-@@ -167,7 +168,7 @@
-     }
- 
-     private ProtectionDomain getUrlDomain(URL url) {
--        CodeSource cs = new CodeSource(url, null);
-+        CodeSource cs = new CodeSource(url, (Certificate [])null);
-         PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-         return new ProtectionDomain(cs, pc);
-     }
diff --git a/sane/inc/sane.h b/sane/inc/sane.h
deleted file mode 100644
index 212e5be..0000000
--- a/sane/inc/sane.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* sane - Scanner Access Now Easy.
-   Copyright (C) 1997 David Mosberger-Tang and Andreas Beck
-   This file is part of the SANE package.
-
-   This file is in the public domain.  You may use and modify it as
-   you see fit, as long as this copyright message is included and
-   that there is an indication as to what modifications have been
-   made (if any).
-
-   SANE is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.
-
-   This file declares SANE application interface.  See the SANE
-   standard for a detailed explanation of the interface.  */
-#ifndef sane_h
-#define sane_h
-
-#define SANE_CURRENT_MAJOR	0
-
-#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_FALSE	0
-#define SANE_TRUE	1
-
-typedef unsigned char SANE_Byte;
-typedef int SANE_Word;
-typedef SANE_Word SANE_Bool;
-typedef SANE_Word SANE_Int;
-typedef char SANE_Char;
-typedef SANE_Char *SANE_String;
-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))
-
-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;
-
-typedef enum
-  {
-    SANE_TYPE_BOOL = 0,
-    SANE_TYPE_INT,
-    SANE_TYPE_FIXED,
-    SANE_TYPE_STRING,
-    SANE_TYPE_BUTTON,
-    SANE_TYPE_GROUP
-  }
-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;
-
-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_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_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)
-
-typedef enum
-  {
-    SANE_CONSTRAINT_NONE = 0,
-    SANE_CONSTRAINT_RANGE,
-    SANE_CONSTRAINT_WORD_LIST,
-    SANE_CONSTRAINT_STRING_LIST
-  }
-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_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_Int size;
-    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_Range *range;
-      }
-    constraint;
-  }
-SANE_Option_Descriptor;
-
-typedef enum
-  {
-    SANE_ACTION_GET_VALUE = 0,
-    SANE_ACTION_SET_VALUE,
-    SANE_ACTION_SET_AUTO
-  }
-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;
-
-typedef struct
-  {
-    SANE_Frame format;
-    SANE_Bool last_frame;
-    SANE_Int bytes_per_line;
-    SANE_Int pixels_per_line;
-    SANE_Int lines;
-    SANE_Int depth;
-  }
-SANE_Parameters;
-
-struct SANE_Auth_Data;
-
-#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],
-                    SANE_Char password[SANE_MAX_PASSWORD_LEN]);
-
-extern SANE_Status sane_init (SANE_Int * version_code,
-                  SANE_Auth_Callback authorize);
-extern void sane_exit (void);
-extern SANE_Status sane_get_devices (const SANE_Device *** device_list,
-                     SANE_Bool local_only);
-extern SANE_Status sane_open (SANE_String_Const devicename,
-                  SANE_Handle * handle);
-extern void sane_close (SANE_Handle handle);
-extern const SANE_Option_Descriptor *
-  sane_get_option_descriptor (SANE_Handle handle, SANE_Int option);
-extern SANE_Status sane_control_option (SANE_Handle handle, SANE_Int option,
-                    SANE_Action action, void *value,
-                    SANE_Int * info);
-extern SANE_Status sane_get_parameters (SANE_Handle handle,
-                    SANE_Parameters * params);
-extern SANE_Status sane_start (SANE_Handle handle);
-extern SANE_Status sane_read (SANE_Handle handle, SANE_Byte * data,
-                  SANE_Int max_length, SANE_Int * length);
-extern void sane_cancel (SANE_Handle handle);
-extern SANE_Status sane_set_io_mode (SANE_Handle handle,
-                     SANE_Bool non_blocking);
-extern SANE_Status sane_get_select_fd (SANE_Handle handle,
-                       SANE_Int * fd);
-extern SANE_String_Const sane_strstatus (SANE_Status status);
-
-#endif /* sane_h */
diff --git a/sane/prj/build.lst b/sane/prj/build.lst
deleted file mode 100644
index c1c6fb9..0000000
--- a/sane/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-sa	sane	:	solenv NULL
-sa	sane							usr1	-	all	sa_mkout NULL
-sa	sane\prj						get		-	all	sa_prj NULL
diff --git a/sane/prj/d.lst b/sane/prj/d.lst
deleted file mode 100644
index f592821..0000000
--- a/sane/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\sane
-..\inc\sane.h %_DEST%\inc\external\sane\sane.h
diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk
deleted file mode 100644
index b311001..0000000
--- a/translate_toolkit/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Petr Mladek <pmladek@suse.cz>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s): 
-# Ted <ted@bear.com>
-# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=trt
-TARGET=trt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
-@all:
-	@echo "Using system translate toolkit..."
-.ENDIF
-
-# --- Python paths --------------------------------------------------
-
-.IF "$(SYSTEM_PYTHON)" == "YES"
-PY_CMD=$(PYTHON)
-.ELSE                   # "$(SYSTEM_PYTHON)" == "YES"
-.IF "$(OS)"=="MACOSX"
-# the framework only gets delivered as zip, so call it from python's output-dir
-PY_CMD=$(SRC_ROOT)/python/$(INPATH)/misc/build/python-inst/OOoPython.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/OOoPython
-.ELSE
-PY_CMD=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python
-# watch for the path delimiter
-.IF "$(GUI)"=="WNT"
-PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)/python;$(SOLARLIBDIR)/python/lib-dynload
-.ELSE                   # "$(GUI)"=="WNT"
-PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)/python:$(SOLARLIBDIR)/python/lib-dynload
-.ENDIF                  # "$(GUI)"=="WNT"
-.EXPORT: PYTHONPATH
-.ENDIF                  # "$(OS)"=="MACOSX"
-.ENDIF                  # "$(SYSTEM_PYTHON)" == "YES"
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=translate-toolkit-1.8.1
-TARFILE_MD5=b4cae0700aa1c2aef7eb7f345365e6f1
-PATCH_FILES=translate-toolkit-1.8.1-skipsource.patch
-BUILD_ACTION=$(PY_CMD) setup.py build
-BUILD_DIR=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/translate_toolkit/prj/build.lst b/translate_toolkit/prj/build.lst
deleted file mode 100644
index f87945c..0000000
--- a/translate_toolkit/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-trt     translate_toolkit       :       solenv PYTHON:python NULL
-trt     translate_toolkit       usr1    -       all     trt_mkout NULL
-trt     translate_toolkit       nmake   -       all     translate_toolkit NULL
diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst
deleted file mode 100644
index 31d61b0..0000000
--- a/translate_toolkit/prj/d.lst
+++ /dev/null
@@ -1,35 +0,0 @@
-mkdir: %_DEST%\bin\translate
-mkdir: %_DEST%\bin\translate\convert
-mkdir: %_DEST%\bin\translate\filters
-mkdir: %_DEST%\bin\translate\lang
-mkdir: %_DEST%\bin\translate\misc
-mkdir: %_DEST%\bin\translate\misc\typecheck
-mkdir: %_DEST%\bin\translate\storage
-mkdir: %_DEST%\bin\translate\storage\placeables
-mkdir: %_DEST%\bin\translate\storage\versioncontrol
-mkdir: %_DEST%\bin\translate\storage\xml_extract
-mkdir: %_DEST%\bin\translate\search
-mkdir: %_DEST%\bin\translate\search\indexing
-mkdir: %_DEST%\bin\translate\services
-mkdir: %_DEST%\bin\translate\share
-mkdir: %_DEST%\bin\translate\share\langmodels
-mkdir: %_DEST%\bin\translate\tools
-
-..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin\translate\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin\translate\convert\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin\translate\filters\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin\translate\lang\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin\translate\misc\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin\translate\misc/typecheck\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin\translate\storage\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin\translate\storage/placeables\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin\translate\storage/versioncontrol\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin\translate\storage/xml_extract\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin\translate\search\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin\translate\search/indexing\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin\translate\services\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin\translate\share\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin\translate\share\langmodels\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin\translate\tools\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po  %_DEST%\bin\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo  %_DEST%\bin\*
diff --git a/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch b/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
deleted file mode 100644
index c4cd7a0..0000000
--- a/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: convert/po2oo.py
-===================================================================
---- misc/translate-toolkit-1.8.1/translate/convert/po2oo.py	(revision 17314)
-+++ misc/build/translate-toolkit-1.8.1/translate/convert/po2oo.py	(working copy)
-@@ -188,7 +188,7 @@
- filter = oocheckfilter(options, [checks.OpenOfficeChecker, checks.StandardUnitChecker], checks.openofficeconfig)
- 
- 
--def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None, targetlanguage=None, timestamp=None, includefuzzy=False, multifilestyle="single", filteraction=None):
-+def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None, targetlanguage=None, timestamp=None, includefuzzy=False, multifilestyle="single", skip_source=False, filteraction=None):
-     inputstore = factory.getobject(inputfile)
-     inputstore.filename = getattr(inputfile, 'name', '')
-     if not targetlanguage:
-@@ -205,7 +205,7 @@
-         convertor = reoo(templatefile, languages=languages, timestamp=timestamp, includefuzzy=includefuzzy, long_keys=multifilestyle != "single", filteraction=filteraction)
-     outputstore = convertor.convertstore(inputstore)
-     # TODO: check if we need to manually delete missing items
--    outputfile.write(str(outputstore))
-+    outputfile.write(outputstore.__str__(skip_source, targetlanguage))
-     return True
- 
- 
-@@ -223,6 +223,7 @@
-             help="don't change the timestamps of the strings")
-     parser.add_option("", "--nonrecursiveoutput", dest="allowrecursiveoutput", default=True, action="store_false", help="don't treat the output oo as a recursive store")
-     parser.add_option("", "--nonrecursivetemplate", dest="allowrecursivetemplate", default=True, action="store_false", help="don't treat the template oo as a recursive store")
-+    parser.add_option("", "--skipsource", dest="skip_source", default=False, action="store_true", help="don't output the source language, but fallback to it where needed")
-     parser.add_option("", "--filteraction", dest="filteraction", default="none", metavar="ACTION",
-             help="action on pofilter failure: none (default), warn, exclude-serious, exclude-all")
-     parser.add_fuzzy_option()
-@@ -230,6 +231,7 @@
-     parser.passthrough.append("sourcelanguage")
-     parser.passthrough.append("targetlanguage")
-     parser.passthrough.append("timestamp")
-+    parser.passthrough.append("skip_source")
-     parser.passthrough.append("filteraction")
-     parser.run(argv)
- 
-Index: convert/test_po2oo.py
-===================================================================
---- misc/translate-toolkit-1.8.1/translate/convert/test_po2oo.py	(revision 17280)
-+++ misc/build/translate-toolkit-1.8.1/translate/convert/test_po2oo.py	(working copy)
-@@ -170,6 +170,7 @@
-         options = self.help_check(options, "--nonrecursiveoutput")
-         options = self.help_check(options, "--nonrecursivetemplate")
-         options = self.help_check(options, "--filteraction")
-+        options = self.help_check(options, "--skipsource")
-         options = self.help_check(options, "--fuzzy")
-         options = self.help_check(options, "--nofuzzy")
-         options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
-Index: storage/oo.py
-===================================================================
---- misc/translate-toolkit-1.8.1/translate/storage/oo.py	(revision 17301)
-+++ misc/build/translate-toolkit-1.8.1/translate/storage/oo.py	(working copy)
-@@ -246,9 +246,18 @@
-         """convert to a string. double check that unicode is handled"""
-         return encode_if_needed_utf8(self.getoutput())
- 
--    def getoutput(self):
-+    def getoutput(self, skip_source=False, fallback_lang=None):
-         """return the lines in tab-delimited form"""
--        return "\r\n".join([str(line) for line in self.lines])
-+        if skip_source:
-+            lines = self.lines[1:]
-+            if not lines:
-+                # Untranslated, so let's do fall-back: (bug 1883)
-+                new_line = ooline(self.lines[0].getparts())
-+                new_line.languageid = fallback_lang
-+                lines = [new_line]
-+        else:
-+            lines = self.lines
-+        return "\r\n".join([str(line) for line in lines])
- 
- 
- class oofile:
-@@ -295,11 +304,11 @@
-             thisline = ooline(parts)
-             self.addline(thisline)
- 
--    def __str__(self):
-+    def __str__(self, skip_source=False, fallback_lang=None):
-         """convert to a string. double check that unicode is handled"""
--        return encode_if_needed_utf8(self.getoutput())
-+        return encode_if_needed_utf8(self.getoutput(skip_source, fallback_lang))
- 
--    def getoutput(self):
-+    def getoutput(self, skip_source=False, fallback_lang=None):
-         """converts all the lines back to tab-delimited form"""
-         lines = []
-         for oe in self.units:
-@@ -307,7 +316,7 @@
-                 warnings.warn("contains %d lines (should be 2 at most): languages %r" % (len(oe.lines), oe.languages))
-                 oekeys = [line.getkey() for line in oe.lines]
-                 warnings.warn("contains %d lines (should be 2 at most): keys %r" % (len(oe.lines), oekeys))
--            oeline = str(oe) + "\r\n"
-+            oeline = oe.getoutput(skip_source, fallback_lang) + "\r\n"
-             lines.append(oeline)
-         return "".join(lines)
- 
diff --git a/twain/inc/twain.h b/twain/inc/twain.h
deleted file mode 100644
index 8c50034..0000000
--- a/twain/inc/twain.h
+++ /dev/null
@@ -1,1973 +0,0 @@
-/* ======================================================================== *\
-
-  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, 
-  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.  
-  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.  
-  All rights reserved.
-
-
-  TWAIN.h -  This is the definitive include file for applications and
-          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 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 
-                                 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 
-                                 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 
-                                 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
-      version 1.8  January 1999    Removed undocumented duplicate AUTO<cap> JMH
-    version 1.8  March 1999      Removed undocumented 1.8 caps:
-                                 CAP_FILESYSTEM
-                                 CAP_PAPERBINDING
-                                 CAP_PASSTHRU
-                                 CAP_POWERDOWNTIME
-                                 ICAP_AUTODISCARDBLANKPAGES
-                               * 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
-                                   for 1.9 Specification MLM
-      version 1.9  March 2000	     Added ICAP_JPEGQUALITY, TWJQ_ values,
-                                 updated TWON_PROTOCOLMINOR for Release v1.9 MN
-\* ======================================================================== */
-
-#ifndef TWAIN
-#define TWAIN
-
-/*  SDH - 02/08/95 - TWUNK */
-/*  Force 32-bit twain to use same packing of twain structures as existing */
-/*  16-bit twain.  This allows 16/32-bit thunking.                         */
-#ifdef  WIN32
-    #ifdef __MINGW32__
-        #pragma pack (push, 2)
-    #elif __BORLANDC__ //(Mentor June 13, 1996) if using a Borland compiler
-        #pragma option -a2  //(Mentor June 13, 1996) switch to word alignment
-    #else   //(Mentor June 13, 1996) if we're using some other compiler
-        #pragma pack (push, before_twain)
-        #pragma pack (2)
-    #endif  //(Mentor June 13, 1996)
-#else   /* WIN32 */
-#endif  /* WIN32 */
-
-/****************************************************************************
- * TWAIN Version                                                            *
- ****************************************************************************/
-#define TWON_PROTOCOLMINOR   9        /* Changed for Version 1.9            */
-#define TWON_PROTOCOLMAJOR   1
-
-/****************************************************************************
- * Platform Dependent Definitions and Typedefs                              *
- ****************************************************************************/
-
-/* Define one of the following, depending on the platform */
-/* #define _MAC_   */
-/* #define _UNIX_  */
-#define _MSWIN_
-
-#ifdef  _MSWIN_
-    typedef HANDLE         TW_HANDLE;
-    typedef LPVOID         TW_MEMREF;
-
-    /*  SDH - 05/05/95 - TWUNK */
-    /*  For common code between 16 and 32 bits.  */
-    #ifdef  WIN32
-        #define TW_HUGE
-    #else   /* WIN32 */
-        #define TW_HUGE    huge
-    #endif  /* WIN32 */
-    typedef BYTE TW_HUGE * HPBYTE;
-    typedef void TW_HUGE * HPVOID;
-#endif  /* _MSWIN_ */
-
-#ifdef  _MAC_
-    /*
-    * NOTE:
-    * Corrected to allow building of TWAIN MacOS PowerPC Applications
-    * and MacOS PowerPC TWAIN sources.
-    *
-    * 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 
-    * TWAIN during the communication between the Application and Source.
-    *
-    * The Data Alignment must be  68k code and not PowerPC.
-    * - Paul Plaquette, LOGi 27, FRANCE-Montpellier
-    */
-    #if PRAGMA_STRUCT_ALIGN
-         #pragma options align=mac68k
-    #elif PRAGMA_STRUCT_PACKPUSH
-         #pragma pack(push, 2)
-    #elif PRAGMA_STRUCT_PACK
-         #pragma pack(2)
-    #endif
-
-    #define PASCAL         pascal
-    #define FAR
-    typedef Handle         TW_HANDLE;
-    typedef char          *TW_MEMREF;
-#endif  /* _MAC_ */
-
-#ifdef  _UNIX_
-    #define PASCAL         pascal
-    typedef unsigned char *TW_HANDLE;
-    typedef unsigned char *TW_MEMREF;
-#endif  /* _UNIX_ */
-
-/****************************************************************************
- * Type Definitions                                                         *
- ****************************************************************************/
-
-/* String types. These include room for the strings and a NULL char,     *
- * or, on the Mac, a length byte followed by the string.                 *
- * TW_STR255 must hold less than 256 chars so length fits in first byte. */
-typedef char    TW_STR32[34],     FAR *pTW_STR32;
-typedef char    TW_STR64[66],     FAR *pTW_STR64;
-typedef char    TW_STR128[130],   FAR *pTW_STR128;
-typedef char    TW_STR255[256],   FAR *pTW_STR255;
-typedef char    TW_STR1024[1026], FAR *pTW_STR1024;   /* added 1.9 */
-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 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; 
-
-/* Fixed point structure type. */
-typedef struct {
-    TW_INT16     Whole;        /* maintains the sign */
-    TW_UINT16    Frac;
-} TW_FIX32,  FAR *pTW_FIX32;
-
-/****************************************************************************
- * Structure Definitions                                                    *
- ****************************************************************************/
-
-/* No DAT needed. */
-typedef struct {
-   TW_FIX32   X;
-   TW_FIX32   Y;
-   TW_FIX32   Z;
-} TW_CIEPOINT, FAR * pTW_CIEPOINT;
-
-/* No DAT needed. */
-typedef struct {
-   TW_FIX32   StartIn;
-   TW_FIX32   BreakIn;
-   TW_FIX32   EndIn;
-   TW_FIX32   StartOut;
-   TW_FIX32   BreakOut;
-   TW_FIX32   EndOut;
-   TW_FIX32   Gamma;
-   TW_FIX32   SampleCount;  /* if =0 use the gamma */
-} TW_DECODEFUNCTION, FAR * pTW_DECODEFUNCTION;
-
-/* No DAT needed. */
-typedef struct {
-   TW_UINT8    Index;    /* Value used to index into the color table. */
-   TW_UINT8    Channel1; /* First  tri-stimulus value (e.g Red)       */
-   TW_UINT8    Channel2; /* Second tri-stimulus value (e.g Green)     */
-   TW_UINT8    Channel3; /* Third  tri-stimulus value (e.g Blue)      */
-} TW_ELEMENT8, FAR * pTW_ELEMENT8;
-
-/* No DAT.  Defines a frame rectangle in ICAP_UNITS coordinates. */
-typedef struct {
-   TW_FIX32   Left;
-   TW_FIX32   Top;
-   TW_FIX32   Right;
-   TW_FIX32   Bottom;
-} TW_FRAME, FAR * pTW_FRAME;
-
-/* No DAT needed.  Used to manage memory buffers. */
-typedef struct {
-   TW_UINT32  Flags;  /* Any combination of the TWMF_ constants.           */
-   TW_UINT32  Length; /* Number of bytes stored in buffer TheMem.          */
-   TW_MEMREF  TheMem; /* Pointer or handle to the allocated memory buffer. */
-} TW_MEMORY, FAR * pTW_MEMORY;
-
-/* No DAT needed. */
-typedef struct {
-   TW_DECODEFUNCTION   Decode[3];
-   TW_FIX32            Mix[3][3];
-} TW_TRANSFORMSTAGE, FAR * pTW_TRANSFORMSTAGE;
-
-/* No DAT needed.  Describes version of software currently running. */
-typedef struct {
-   TW_UINT16  MajorNum;  /* Major revision number of the software. */
-   TW_UINT16  MinorNum;  /* Incremental revision number of the software. */
-   TW_UINT16  Language;  /* e.g. TWLG_SWISSFRENCH */
-   TW_UINT16  Country;   /* e.g. TWCY_SWITZERLAND */
-   TW_STR32   Info;      /* e.g. "1.0b3 Beta release" */
-} TW_VERSION, FAR * pTW_VERSION;
-
-/* TWON_ARRAY. Container for array of values (a simplified TW_ENUMERATION) */
-typedef struct {
-   TW_UINT16  ItemType;
-   TW_UINT32  NumItems;    /* How many items in ItemList           */
-   TW_UINT8   ItemList[1]; /* Array of ItemType values starts here */
-} TW_ARRAY, FAR * pTW_ARRAY;
-
-/* TWON_ENUMERATION. Container for a collection of values. */
-typedef struct {
-   TW_UINT16  ItemType;
-   TW_UINT32  NumItems;     /* How many items in ItemList                 */
-   TW_UINT32  CurrentIndex; /* Current value is in ItemList[CurrentIndex] */
-   TW_UINT32  DefaultIndex; /* Powerup value is in ItemList[DefaultIndex] */
-   TW_UINT8   ItemList[1];  /* Array of ItemType values starts here       */
-} TW_ENUMERATION, FAR * pTW_ENUMERATION;
-
-/* TWON_ONEVALUE. Container for one value. */
-typedef struct {
-   TW_UINT16  ItemType;
-   TW_UINT32  Item;
-} TW_ONEVALUE, FAR * pTW_ONEVALUE;
-
-/* TWON_RANGE. Container for a range of values. */
-typedef struct {
-   TW_UINT16  ItemType;
-   TW_UINT32  MinValue;     /* Starting value in the range.           */
-   TW_UINT32  MaxValue;     /* Final value in the range.              */
-   TW_UINT32  StepSize;     /* Increment from MinValue to MaxValue.   */
-   TW_UINT32  DefaultValue; /* Power-up value.                        */
-   TW_UINT32  CurrentValue; /* The value that is currently in effect. */
-} TW_RANGE, FAR * pTW_RANGE;
-
-/* DAT_CAPABILITY. Used by application to get/set capability from/in a data source. */
-typedef struct {
-   TW_UINT16  Cap; /* id of capability to set or get, e.g. CAP_BRIGHTNESS */
-   TW_UINT16  ConType; /* TWON_ONEVALUE, _RANGE, _ENUMERATION or _ARRAY   */
-   TW_HANDLE  hContainer; /* Handle to container of type Dat              */
-} TW_CAPABILITY, FAR * pTW_CAPABILITY;
-
-/* DAT_CIECOLOR. */
-typedef struct {
-   TW_UINT16           ColorSpace;
-   TW_INT16            LowEndian;
-   TW_INT16            DeviceDependent;
-   TW_INT32            VersionNumber;
-   TW_TRANSFORMSTAGE   StageABC;
-   TW_TRANSFORMSTAGE   StageLMN;
-   TW_CIEPOINT         WhitePoint;
-   TW_CIEPOINT         BlackPoint;
-   TW_CIEPOINT         WhitePaper;
-   TW_CIEPOINT         BlackInk;
-   TW_FIX32            Samples[1];
-} TW_CIECOLOR, FAR * pTW_CIECOLOR;
-
-/* DAT_EVENT. For passing events down from the application to the DS. */
-typedef struct {
-   TW_MEMREF  pEvent;    /* Windows pMSG or Mac pEvent.                 */
-   TW_UINT16  TWMessage; /* TW msg from data source, e.g. MSG_XFERREADY */
-} TW_EVENT, FAR * pTW_EVENT;
-
-/* DAT_GRAYRESPONSE */
-typedef struct {
-   TW_ELEMENT8         Response[1];
-} TW_GRAYRESPONSE, FAR * pTW_GRAYRESPONSE;
-
-/* DAT_IDENTITY. Identifies the program/library/code resource. */
-typedef struct {
-   TW_UINT32  Id;              /* Unique number.  In Windows, application hWnd      */
-   TW_VERSION Version;         /* Identifies the piece of code              */
-   TW_UINT16  ProtocolMajor;   /* Application and DS must set to TWON_PROTOCOLMAJOR */
-   TW_UINT16  ProtocolMinor;   /* Application and DS must set to TWON_PROTOCOLMINOR */
-   TW_UINT32  SupportedGroups; /* Bit field OR combination of DG_ constants */
-   TW_STR32   Manufacturer;    /* Manufacturer name, e.g. "Hewlett-Packard" */
-   TW_STR32   ProductFamily;   /* Product family name, e.g. "ScanJet"       */
-   TW_STR32   ProductName;     /* Product name, e.g. "ScanJet Plus"         */
-} TW_IDENTITY, FAR * pTW_IDENTITY;
-
-/* DAT_IMAGEINFO. Application gets detailed image info from DS with this. */
-typedef struct {
-   TW_FIX32   XResolution;      /* Resolution in the horizontal             */
-   TW_FIX32   YResolution;      /* Resolution in the vertical               */
-   TW_INT32   ImageWidth;       /* Columns in the image, -1 if unknown by DS*/
-   TW_INT32   ImageLength;      /* Rows in the image, -1 if unknown by DS   */
-   TW_INT16   SamplesPerPixel;  /* Number of samples per pixel, 3 for RGB   */
-   TW_INT16   BitsPerSample[8]; /* Number of bits for each sample           */
-   TW_INT16   BitsPerPixel;     /* Number of bits for each padded pixel     */
-   TW_BOOL    Planar;           /* True if Planar, False if chunky          */
-   TW_INT16   PixelType;        /* How to interp data; photo interp (TWPT_) */
-   TW_UINT16  Compression;      /* How the data is compressed (TWCP_xxxx)   */
-} TW_IMAGEINFO, FAR * pTW_IMAGEINFO;
-
-/* DAT_IMAGELAYOUT. Provides image layout information in current units. */
-typedef struct {
-   TW_FRAME   Frame;          /* Frame coords within larger document */
-   TW_UINT32  DocumentNumber;
-   TW_UINT32  PageNumber;     /* Reset when you go to next document  */
-   TW_UINT32  FrameNumber;    /* Reset when you go to next page      */
-} TW_IMAGELAYOUT, FAR * pTW_IMAGELAYOUT;
-
-/* DAT_IMAGEMEMXFER. Used to pass image data (e.g. in strips) from DS to application.*/
-typedef struct {
-   TW_UINT16  Compression;  /* How the data is compressed                */
-   TW_UINT32  BytesPerRow;  /* Number of bytes in a row of data          */
-   TW_UINT32  Columns;      /* How many columns                          */
-   TW_UINT32  Rows;         /* How many rows                             */
-   TW_UINT32  XOffset;      /* How far from the side of the image        */
-   TW_UINT32  YOffset;      /* How far from the top of the image         */
-   TW_UINT32  BytesWritten; /* How many bytes written in Memory          */
-   TW_MEMORY  Memory;       /* Mem struct used to pass actual image data */
-} TW_IMAGEMEMXFER, FAR * pTW_IMAGEMEMXFER;
-
-/* Changed in 1.1: QuantTable, HuffmanDC, HuffmanAC TW_MEMREF -> TW_MEMORY  */
-/* DAT_JPEGCOMPRESSION. Based on JPEG Draft International Std, ver 10918-1. */
-typedef struct {
-   TW_UINT16   ColorSpace;       /* One of the TWPT_xxxx values                */
-   TW_UINT32   SubSampling;      /* Two word "array" for subsampling values    */
-   TW_UINT16   NumComponents;    /* Number of color components in image        */
-   TW_UINT16   RestartFrequency; /* Frequency of restart marker codes in MDU's */
-   TW_UINT16   QuantMap[4];      /* Mapping of components to QuantTables       */
-   TW_MEMORY   QuantTable[4];    /* Quantization tables                        */
-   TW_UINT16   HuffmanMap[4];    /* Mapping of components to Huffman tables    */
-   TW_MEMORY   HuffmanDC[2];     /* DC Huffman tables                          */
-   TW_MEMORY   HuffmanAC[2];     /* AC Huffman tables                          */
-} TW_JPEGCOMPRESSION, FAR * pTW_JPEGCOMPRESSION;
-
-/* DAT_PALETTE8. Color palette when TWPT_PALETTE pixels xfer'd in mem buf. */
-typedef struct {
-   TW_UINT16    NumColors;   /* Number of colors in the color table.  */
-   TW_UINT16    PaletteType; /* TWPA_xxxx, specifies type of palette. */
-   TW_ELEMENT8  Colors[256]; /* Array of palette values starts here.  */
-} TW_PALETTE8, FAR * pTW_PALETTE8;
-
-/* DAT_PENDINGXFERS. Used with MSG_ENDXFER to indicate additional data. */
-typedef struct {
-   TW_UINT16 Count;
-   union {
-      TW_UINT32 EOJ;
-      TW_UINT32 Reserved;
-   };
-} TW_PENDINGXFERS, FAR *pTW_PENDINGXFERS;
-
-/* DAT_RGBRESPONSE */
-typedef struct {
-   TW_ELEMENT8         Response[1];
-} TW_RGBRESPONSE, FAR * pTW_RGBRESPONSE;
-
-/* DAT_SETUPFILEXFER. Sets up DS to application data transfer via a file. */
-typedef struct {
-   TW_STR255 FileName;
-   TW_UINT16 Format;   /* Any TWFF_ constant */
-   TW_INT16  VRefNum;  /* Used for Mac only  */
-} TW_SETUPFILEXFER, FAR * pTW_SETUPFILEXFER;
-
-/* DAT_SETUPFILEXFER2. Sets up DS to application data transfer via a file. */
-/* Added 1.9                                                               */
-typedef struct {
-   TW_MEMREF FileName;     /* Pointer to file name text */
-   TW_UINT16 FileNameType; /* TWTY_STR1024 or TWTY_UNI512 */
-   TW_UINT16 Format;       /* Any TWFF_ constant */
-   TW_INT16  VRefNum;      /* Used for Mac only  */
-   TW_UINT32 parID;        /* Used for Mac only */
-} TW_SETUPFILEXFER2, FAR * pTW_SETUPFILEXFER2;
-
-/* DAT_SETUPMEMXFER. Sets up DS to application data transfer via a memory buffer. */
-typedef struct {
-   TW_UINT32 MinBufSize;
-   TW_UINT32 MaxBufSize;
-   TW_UINT32 Preferred;
-} TW_SETUPMEMXFER, FAR * pTW_SETUPMEMXFER;
-
-/* DAT_STATUS. Application gets detailed status info from a data source with this. */
-typedef struct {
-   TW_UINT16  ConditionCode; /* Any TWCC_ constant     */
-   TW_UINT16  Reserved;      /* Future expansion space */
-} TW_STATUS, FAR * pTW_STATUS;
-
-/* DAT_USERINTERFACE. Coordinates UI between application and data source. */
-typedef struct {
-   TW_BOOL    ShowUI;  /* TRUE if DS should bring up its UI           */
-   TW_BOOL    ModalUI; /* For Mac only - true if the DS's UI is modal */
-   TW_HANDLE  hParent; /* For windows only - Application window handle        */
-} TW_USERINTERFACE, FAR * pTW_USERINTERFACE;
-
-/* SDH - 03/21/95 - TWUNK */
-/* DAT_TWUNKIDENTITY. Provides DS identity and 'other' information necessary */
-/*                    across thunk link. */
-typedef struct {
-   TW_IDENTITY identity;        /* Identity of data source.                 */
-   TW_STR255   dsPath;          /* Full path and file name of data source.  */
-} TW_TWUNKIDENTITY, FAR * pTW_TWUNKIDENTITY;
-
-/* SDH - 03/21/95 - TWUNK */
-/* Provides DS_Entry parameters over thunk link. */
-typedef struct
-{
-    TW_INT8     destFlag;       /* TRUE if dest is not NULL                 */
-    TW_IDENTITY dest;           /* Identity of data source (if used)        */
-    TW_INT32    dataGroup;      /* DSM_Entry dataGroup parameter            */
-    TW_INT16    dataArgType;    /* DSM_Entry dataArgType parameter          */
-    TW_INT16    message;        /* DSM_Entry message parameter              */
-    TW_INT32    pDataSize;      /* Size of pData (0 if NULL)                */
-    //  TW_MEMREF   pData;      /* Based on implementation specifics, a     */
-                                /* pData parameter makes no sense in this   */
-                                /* structure, but data (if provided) will be*/
-                                /* appended in the data block.              */
-   } TW_TWUNKDSENTRYPARAMS, FAR * pTW_TWUNKDSENTRYPARAMS;
-
-/* SDH - 03/21/95 - TWUNK */
-/* Provides DS_Entry results over thunk link. */
-typedef struct
-{
-    TW_UINT16   returnCode;     /* Thunker DsEntry return code.             */
-    TW_UINT16   conditionCode;  /* Thunker DsEntry condition code.          */
-    TW_INT32    pDataSize;      /* Size of pData (0 if NULL)                */
-    //  TW_MEMREF   pData;      /* Based on implementation specifics, a     */
-                                /* pData parameter makes no sense in this   */
-                                /* structure, but data (if provided) will be*/
-                                /* appended in the data block.              */
-} TW_TWUNKDSENTRYRETURN, FAR * pTW_TWUNKDSENTRYRETURN;
-
-/* WJD - 950818 */
-/* Added for 1.6 Specification */
-/* TWAIN 1.6 CAP_SUPPORTEDCAPSEXT structure */
-typedef struct
-{
-    TW_UINT16 Cap;   /* Which CAP/ICAP info is relevant to */
-    TW_UINT16 Properties;  /* Messages this CAP/ICAP supports */
-} TW_CAPEXT, FAR * pTW_CAPEXT;
-
-/* ----------------------------------------------------------------------- *\
-
-  Version 1.7:      Added Following data structure for Document Imaging 
-  July 1997         Enhancement.
-  KHL               TW_CUSTOMDSDATA --  For Saving and Restoring Source's 
-                                        state.
-                    TW_INFO         --  Each attribute for extended image
-                                        information.
-                    TW_EXTIMAGEINFO --  Extended image information structure.
-
-\* ----------------------------------------------------------------------- */
-
-typedef struct {
-    TW_UINT32  InfoLength;     /* Length of Information in bytes.  */
-    TW_HANDLE  hData;          /* Place holder for data, DS Allocates */
-}TW_CUSTOMDSDATA, FAR *pTW_CUSTOMDSDATA;
-
-typedef struct {
-    TW_UINT16   InfoID;
-    TW_UINT16   ItemType;
-    TW_UINT16   NumItems;
-    TW_UINT16   CondCode;
-    TW_UINT32   Item;
-}TW_INFO, FAR* pTW_INFO;
-
-typedef struct {
-    TW_UINT32   NumInfos;
-    TW_INFO     Info[1];
-}TW_EXTIMAGEINFO, FAR* pTW_EXTIMAGEINFO;
-
-/* Added 1.8 */
-
-/* DAT_AUDIOINFO, information about audio data */
-typedef struct {
-   TW_STR255  Name;       /* name of audio data */
-   TW_UINT32  Reserved;   /* reserved space */
-} TW_AUDIOINFO, FAR * pTW_AUDIOINFO;
-
-/* DAT_DEVICEEVENT, information about events */
-typedef struct {
-   TW_UINT32  Event;                  /* One of the TWDE_xxxx values. */
-   TW_STR255  DeviceName;             /* The name of the device that generated the event */
-   TW_UINT32  BatteryMinutes;         /* Battery Minutes Remaining    */
-   TW_INT16   BatteryPercentage;      /* Battery Percentage Remaining */
-   TW_INT32   PowerSupply;            /* Power Supply                 */
-   TW_FIX32   XResolution;            /* Resolution                   */
-   TW_FIX32   YResolution;            /* Resolution                   */
-   TW_UINT32  FlashUsed2;             /* Flash Used2                  */
-   TW_UINT32  AutomaticCapture;       /* Automatic Capture            */
-   TW_UINT32  TimeBeforeFirstCapture; /* Automatic Capture            */
-   TW_UINT32  TimeBetweenCaptures;    /* Automatic Capture            */
-} TW_DEVICEEVENT, FAR * pTW_DEVICEEVENT;
-
-/* DAT_FILESYSTEM, information about TWAIN file system */
-typedef struct {
-   /* DG_CONTROL / DAT_FILESYSTEM / MSG_xxxx fields     */
-   TW_STR255  InputName; /* The name of the input or source file */
-   TW_STR255  OutputName; /* The result of an operation or the name of a destination file */
-   TW_MEMREF  Context; /* Source specific data used to remember state information */
-   /* DG_CONTROL / DAT_FILESYSTEM / MSG_DELETE field    */
-   int        Recursive; /* recursively delete all sub-directories */
-   /* DG_CONTROL / DAT_FILESYSTEM / MSG_GETINFO fields  */
-   TW_INT32   FileType; /* One of the TWFT_xxxx values */
-   TW_UINT32  Size; /* Size of current FileType */
-   TW_STR32   CreateTimeDate; /* creation date of the file */
-   TW_STR32   ModifiedTimeDate; /* last date the file was modified */
-   TW_UINT32  FreeSpace; /* bytes of free space on the current device */
-   TW_INT32   NewImageSize; /* estimate of the amount of space a new image would take up */
-   TW_UINT32  NumberOfFiles; /* number of files, depends on FileType */
-   TW_UINT32  NumberOfSnippets; /* number of audio snippets */
-   TW_UINT32  DeviceGroupMask; /* used to group cameras (ex: front/rear bitonal, front/rear grayscale...) */
-   char       Reserved[508]; /**/
-} TW_FILESYSTEM, FAR * pTW_FILESYSTEM;
-
-/* DAT_PASSTHRU, device dependant data to pass through Data Source */
-typedef struct {
-   TW_MEMREF  pCommand;        /* Pointer to Command buffer */
-   TW_UINT32  CommandBytes;    /* Number of bytes in Command buffer */
-   TW_INT32   Direction;       /* One of the TWDR_xxxx values.  Defines the direction of data flow */
-   TW_MEMREF  pData;           /* Pointer to Data buffer */
-   TW_UINT32  DataBytes;       /* Number of bytes in Data buffer */
-   TW_UINT32  DataBytesXfered; /* Number of bytes successfully transferred */
-} TW_PASSTHRU, FAR * pTW_PASSTHRU;
-
-/* DAT_SETUPAUDIOFILEXFER, information required to setup an audio file transfer */
-typedef struct {
-   TW_STR255  FileName; /* full path target file */
-   TW_UINT16  Format;   /* one of TWAF_xxxx */
-   TW_INT16 VRefNum;
-} TW_SETUPAUDIOFILEXFER, FAR * pTW_SETUPAUDIOFILEXFER;
-
-#ifdef _MAC_
-     /*
-     * Restore original Macintosh structure packing
-     */
-     #if PRAGMA_STRUCT_ALIGN
-          #pragma options align=reset
-     #elif PRAGMA_STRUCT_PACKPUSH
-          #pragma pack(pop)
-     #elif PRAGMA_STRUCT_PACK
-          #pragma pack()
-     #endif
-#endif /* _MAC_ */
-
-/****************************************************************************
- * Generic Constants                                                        *
- ****************************************************************************/
-
-#define TWON_ARRAY           3 /* indicates TW_ARRAY container       */
-#define TWON_ENUMERATION     4 /* indicates TW_ENUMERATION container */
-#define TWON_ONEVALUE        5 /* indicates TW_ONEVALUE container    */
-#define TWON_RANGE           6 /* indicates TW_RANGE container       */
-
-#define TWON_ICONID          962 /* res Id of icon used in USERSELECT lbox */
-#define TWON_DSMID           461 /* res Id of the DSM version num resource */
-#define TWON_DSMCODEID       63  /* res Id of the Mac SM Code resource     */
-
-#define TWON_DONTCARE8       0xff
-#define TWON_DONTCARE16      0xffff
-#define TWON_DONTCARE32      0xffffffff
-
-/* Flags used in TW_MEMORY structure. */
-#define TWMF_APPOWNS     0x1
-#define TWMF_DSMOWNS     0x2
-#define TWMF_DSOWNS      0x4
-#define TWMF_POINTER     0x8
-#define TWMF_HANDLE      0x10
-
-/* Palette types for TW_PALETTE8 */
-#define TWPA_RGB         0
-#define TWPA_GRAY        1
-#define TWPA_CMY         2
-
-/* There are four containers used for capabilities negotiation:
- *    TWON_ONEVALUE, TWON_RANGE, TWON_ENUMERATION, TWON_ARRAY
- * In each container structure ItemType can be TWTY_INT8, TWTY_INT16, etc.
- * The kind of data stored in the container can be determined by doing
- * DCItemSize[ItemType] where the following is defined in TWAIN glue code:
- *          DCItemSize[]= { sizeof(TW_INT8),
- *                          sizeof(TW_INT16),
- *                          etc.
- *                          sizeof(TW_UINT32) };
- *
- */
-
-#define TWTY_INT8        0x0000    /* Means Item is a TW_INT8   */
-#define TWTY_INT16       0x0001    /* Means Item is a TW_INT16  */
-#define TWTY_INT32       0x0002    /* Means Item is a TW_INT32  */
-
-#define TWTY_UINT8       0x0003    /* Means Item is a TW_UINT8  */
-#define TWTY_UINT16      0x0004    /* Means Item is a TW_UINT16 */
-#define TWTY_UINT32      0x0005    /* Means Item is a TW_UINT32 */
-
-#define TWTY_BOOL        0x0006    /* Means Item is a TW_BOOL   */
-
-#define TWTY_FIX32       0x0007    /* Means Item is a TW_FIX32  */
-
-#define TWTY_FRAME       0x0008    /* Means Item is a TW_FRAME  */
-
-#define TWTY_STR32       0x0009    /* Means Item is a TW_STR32  */
-#define TWTY_STR64       0x000a    /* Means Item is a TW_STR64  */
-#define TWTY_STR128      0x000b    /* Means Item is a TW_STR128 */
-#define TWTY_STR255      0x000c    /* Means Item is a TW_STR255 */
-#define TWTY_STR1024     0x000d    /* Means Item is a TW_STR1024...added 1.9 */
-#define TWTY_UNI512      0x000e    /* Means Item is a TW_UNI512...added 1.9 */
-
-/****************************************************************************
- * Capability Constants                                                     *
- ****************************************************************************/
-
-/* ICAP_BITORDER values (BO_ means Bit Order) */
-#define TWBO_LSBFIRST    0
-#define TWBO_MSBFIRST    1
-
-/* ICAP_COMPRESSION values (CP_ means ComPression ) */
-#define TWCP_NONE        0
-#define TWCP_PACKBITS    1
-#define TWCP_GROUP31D    2 /* Follows CCITT spec (no End Of Line)          */
-#define TWCP_GROUP31DEOL 3 /* Follows CCITT spec (has End Of Line)         */
-#define TWCP_GROUP32D    4 /* Follows CCITT spec (use cap for K Factor)    */
-#define TWCP_GROUP4      5 /* Follows CCITT spec                           */
-#define TWCP_JPEG        6 /* Use capability for more info                 */
-#define TWCP_LZW         7 /* Must license from Unisys and IBM to use      */
-#define TWCP_JBIG        8 /* For Bitonal images  -- Added 1.7 KHL         */
-/* Added 1.8 */
-#define TWCP_PNG         9
-#define TWCP_RLE4        10
-#define TWCP_RLE8        11
-#define TWCP_BITFIELDS   12
-
-
-/* ICAP_IMAGEFILEFORMAT values (FF_means File Format)   */
-#define TWFF_TIFF        0    /* Tagged Image File Format     */
-#define TWFF_PICT        1    /* Macintosh PICT               */
-#define TWFF_BMP         2    /* Windows Bitmap               */
-#define TWFF_XBM         3    /* X-Windows Bitmap             */
-#define TWFF_JFIF        4    /* JPEG File Interchange Format */
-#define TWFF_FPX         5    /* Flash Pix                    */
-#define TWFF_TIFFMULTI   6    /* Multi-page tiff file         */
-#define TWFF_PNG         7
-#define TWFF_SPIFF       8
-#define TWFF_EXIF        9
-
-
-/* ICAP_FILTER values (FT_ means Filter Type) */
-#define TWFT_RED         0
-#define TWFT_GREEN       1
-#define TWFT_BLUE        2
-#define TWFT_NONE        3
-#define TWFT_WHITE       4
-#define TWFT_CYAN        5
-#define TWFT_MAGENTA     6
-#define TWFT_YELLOW      7
-#define TWFT_BLACK       8
-
-/* ICAP_LIGHTPATH values (LP_ means Light Path) */
-#define TWLP_REFLECTIVE   0
-#define TWLP_TRANSMISSIVE 1
-
-/* ICAP_LIGHTSOURCE values (LS_ means Light Source) */
-#define TWLS_RED         0
-#define TWLS_GREEN       1
-#define TWLS_BLUE        2
-#define TWLS_NONE        3
-#define TWLS_WHITE       4
-#define TWLS_UV          5
-#define TWLS_IR          6
-
-/* ICAP_ORIENTATION values (OR_ means ORientation) */
-#define TWOR_ROT0        0
-#define TWOR_ROT90       1
-#define TWOR_ROT180      2
-#define TWOR_ROT270      3
-#define TWOR_PORTRAIT    TWOR_ROT0
-#define TWOR_LANDSCAPE   TWOR_ROT270
-
-/* ICAP_PLANARCHUNKY values (PC_ means Planar/Chunky ) */
-#define TWPC_CHUNKY      0
-#define TWPC_PLANAR      1
-
-/* ICAP_PIXELFLAVOR values (PF_ means Pixel Flavor) */
-#define TWPF_CHOCOLATE   0  /* zero pixel represents darkest shade  */
-#define TWPF_VANILLA     1  /* zero pixel represents lightest shade */
-
-/* ICAP_PIXELTYPE values (PT_ means Pixel Type) */
-#define TWPT_BW          0 /* Black and White */
-#define TWPT_GRAY        1
-#define TWPT_RGB         2
-#define TWPT_PALETTE     3
-#define TWPT_CMY         4
-#define TWPT_CMYK        5
-#define TWPT_YUV         6
-#define TWPT_YUVK        7
-#define TWPT_CIEXYZ      8
-
-/* ICAP_SUPPORTEDSIZES values (SS_ means Supported Sizes) */
-#define TWSS_NONE        0
-#define TWSS_A4LETTER    1
-#define TWSS_B5LETTER    2
-#define TWSS_USLETTER    3
-#define TWSS_USLEGAL     4
-/* Added 1.5 */
-#define TWSS_A5          5
-#define TWSS_B4          6
-#define TWSS_B6          7
-//#define TWSS_B          8
-/* Added 1.7 */
-#define TWSS_USLEDGER    9
-#define TWSS_USEXECUTIVE 10
-#define TWSS_A3          11
-#define TWSS_B3          12
-#define TWSS_A6          13
-#define TWSS_C4          14
-#define TWSS_C5          15
-#define TWSS_C6          16
-/* Added 1.8 */
-#define TWSS_4A0          17
-#define TWSS_2A0          18
-#define TWSS_A0           19
-#define TWSS_A1           20
-#define TWSS_A2           21
-#define TWSS_A4           TWSS_A4LETTER
-#define TWSS_A7           22
-#define TWSS_A8           23
-#define TWSS_A9           24
-#define TWSS_A10          25
-#define TWSS_ISOB0        26
-#define TWSS_ISOB1        27
-#define TWSS_ISOB2        28
-#define TWSS_ISOB3        TWSS_B3
-#define TWSS_ISOB4        TWSS_B4
-#define TWSS_ISOB5        29
-#define TWSS_ISOB6        TWSS_B6
-#define TWSS_ISOB7        30
-#define TWSS_ISOB8        31
-#define TWSS_ISOB9        32
-#define TWSS_ISOB10       33
-#define TWSS_JISB0        34
-#define TWSS_JISB1        35
-#define TWSS_JISB2        36
-#define TWSS_JISB3        37
-#define TWSS_JISB4        38
-#define TWSS_JISB5        TWSS_B5LETTER
-#define TWSS_JISB6        39
-#define TWSS_JISB7        40
-#define TWSS_JISB8        41
-#define TWSS_JISB9        42
-#define TWSS_JISB10       43
-#define TWSS_C0           44
-#define TWSS_C1           45
-#define TWSS_C2           46
-#define TWSS_C3           47
-#define TWSS_C7           48
-#define TWSS_C8           49
-#define TWSS_C9           50
-#define TWSS_C10          51
-#define TWSS_USSTATEMENT  52
-#define TWSS_BUSINESSCARD 53
-
-/* ICAP_XFERMECH values (SX_ means Setup XFer) */
-#define TWSX_NATIVE      0
-#define TWSX_FILE        1
-#define TWSX_MEMORY      2
-#define TWSX_FILE2       3    /* added 1.9 */
-
-/* ICAP_UNITS values (UN_ means UNits) */
-#define TWUN_INCHES      0
-#define TWUN_CENTIMETERS 1
-#define TWUN_PICAS       2
-#define TWUN_POINTS      3
-#define TWUN_TWIPS       4
-#define TWUN_PIXELS      5
-
-/* Added 1.5 */
-/* ICAP_BITDEPTHREDUCTION values (BR_ means Bitdepth Reduction) */
-#define TWBR_THRESHOLD     0
-#define TWBR_HALFTONE      1
-#define TWBR_CUSTHALFTONE  2
-#define TWBR_DIFFUSION     3
-
-/* Added 1.7 */
-/* ICAP_DUPLEX values */
-#define TWDX_NONE         0
-#define TWDX_1PASSDUPLEX  1
-#define TWDX_2PASSDUPLEX  2
-
-/* Added 1.7 */
-/* TWEI_BARCODETYPE values */
-#define TWBT_3OF9                 0
-#define TWBT_2OF5INTERLEAVED      1
-#define TWBT_2OF5NONINTERLEAVED   2
-#define TWBT_CODE93               3
-#define TWBT_CODE128              4
-#define TWBT_UCC128               5
-#define TWBT_CODABAR              6
-#define TWBT_UPCA                 7
-#define TWBT_UPCE                 8
-#define TWBT_EAN8                 9
-#define TWBT_EAN13                10
-#define TWBT_POSTNET              11
-#define TWBT_PDF417               12
-/* Added 1.8 */
-#define TWBT_2OF5INDUSTRIAL       13
-#define TWBT_2OF5MATRIX           14
-#define TWBT_2OF5DATALOGIC        15
-#define TWBT_2OF5IATA             16
-#define TWBT_3OF9FULLASCII        17
-#define TWBT_CODABARWITHSTARTSTOP 18
-#define TWBT_MAXICODE             19
-
-/* Added 1.7 */
-/* TWEI_DESKEWSTATUS values */
-#define TWDSK_SUCCESS     0
-#define TWDSK_REPORTONLY  1
-#define TWDSK_FAIL        2
-#define TWDSK_DISABLED    3
-
-/* Added 1.7 */
-/* TWEI_PATCHCODE values */
-#define TWPCH_PATCH1      0
-#define TWPCH_PATCH2      1
-#define TWPCH_PATCH3      2
-#define TWPCH_PATCH4      3
-#define TWPCH_PATCH6      4
-#define TWPCH_PATCHT      5
-
-/* Added 1.7 */
-/* CAP_JOBCONTROL values */
-#define TWJC_NONE   0
-#define TWJC_JSIC   1
-#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
-#define TWBCOR_ROT90  1
-#define TWBCOR_ROT180 2
-#define TWBCOR_ROT270 3
-#define TWBCOR_ROTX   4
-
-/* Added 1.8 */
-/* ACAP_AUDIOFILEFORMAT values (AF_ means audio format) */
-#define TWAF_WAV      0
-#define TWAF_AIFF     1
-#define TWAF_AU       3
-#define TWAF_SND      4
-
-/* CAP_ALARMS values (AL_ means alarms) */
-#define TWAL_ALARM          0
-#define TWAL_FEEDERERROR    1
-#define TWAL_FEEDERWARNING  2
-#define TWAL_BARCODE        3
-#define TWAL_DOUBLEFEED     4
-#define TWAL_JAM            5
-#define TWAL_PATCHCODE      6
-#define TWAL_POWER          7
-#define TWAL_SKEW           8
-
-/* CAP_CLEARBUFFERS values (CB_ means clear buffers) */
-#define TWCB_AUTO           0
-#define TWCB_CLEAR          1
-#define TWCB_NOCLEAR        2
-
-/* CAP_DEVICEEVENT values (DE_ means device event) */
-#define TWDE_CUSTOMEVENTS           0x8000      
-#define TWDE_CHECKAUTOMATICCAPTURE  0
-#define TWDE_CHECKBATTERY           1
-#define TWDE_CHECKDEVICEONLINE      2
-#define TWDE_CHECKFLASH             3
-#define TWDE_CHECKPOWERSUPPLY       4
-#define TWDE_CHECKRESOLUTION        5
-#define TWDE_DEVICEADDED            6
-#define TWDE_DEVICEOFFLINE          7
-#define TWDE_DEVICEREADY            8
-#define TWDE_DEVICEREMOVED          9
-#define TWDE_IMAGECAPTURED          10
-#define TWDE_IMAGEDELETED           11
-#define TWDE_PAPERDOUBLEFEED        12
-#define TWDE_PAPERJAM               13
-#define TWDE_LAMPFAILURE            14
-#define TWDE_POWERSAVE              15
-#define TWDE_POWERSAVENOTIFY        16
-
-/* CAP_FEEDERALIGNMENT values (FA_ means feeder alignment) */
-#define TWFA_NONE   0
-#define TWFA_LEFT   1
-#define TWFA_CENTER 2
-#define TWFA_RIGHT  3
-
-/* CAP_FEEDERORDER values (FO_ means feeder order) */
-#define TWFO_FIRSTPAGEFIRST 0
-#define TWFO_LASTPAGEFIRST  1
-
-/* CAP_FILESYSTEM values (FS_ means file system) */
-#define TWFS_FILESYSTEM       0
-#define TWFS_RECURSIVEDELETE  1
-
-/* CAP_POWERSUPPLY values (PS_ means power supply) */
-#define TWPS_EXTERNAL 0
-#define TWPS_BATTERY  1
-
-/* CAP_PRINTER values (PR_ means printer) */
-#define TWPR_IMPRINTERTOPBEFORE     0
-#define TWPR_IMPRINTERTOPAFTER      1
-#define TWPR_IMPRINTERBOTTOMBEFORE  2
-#define TWPR_IMPRINTERBOTTOMAFTER   3
-#define TWPR_ENDORSERTOPBEFORE      4
-#define TWPR_ENDORSERTOPAFTER       5
-#define TWPR_ENDORSERBOTTOMBEFORE   6
-#define TWPR_ENDORSERBOTTOMAFTER    7
-
-/* CAP_PRINTERMODE values (PM_ means printer mode) */
-#define TWPM_SINGLESTRING     0
-#define TWPM_MULTISTRING      1
-#define TWPM_COMPOUNDSTRING   2
-
-/* ICAP_BARCODESEARCHMODE values (TWBD_ means search) */
-#define TWBD_HORZ     0
-#define TWBD_VERT     1
-#define TWBD_HORZVERT 2
-#define TWBD_VERTHORZ 3
-
-/* ICAP_FLASHUSED2 values (FL_ means flash) */
-#define TWFL_NONE     0
-#define TWFL_OFF      1
-#define TWFL_ON       2
-#define TWFL_AUTO     3
-#define TWFL_REDEYE   4
-
-/* ICAP_FLIPROTATION values (FR_ means flip rotation) */
-#define TWFR_BOOK     0
-#define TWFR_FANFOLD  1
-
-/* ICAP_IMAGEFILTER values (IF_ means image filter) */
-#define TWIF_NONE     0
-#define TWIF_AUTO     1
-#define TWIF_LOWPASS  2
-#define TWIF_BANDPASS 3
-#define TWIF_HIGHPASS 4
-#define TWIF_TEXT     TWIF_BANDPASS
-#define TWIF_FINELINE TWIF_HIGHPASS
-
-/* ICAP_NOISEFILTER values (NF_ means noise filter) */
-#define TWNF_NONE         0
-#define TWNF_AUTO         1
-#define TWNF_LONEPIXEL    2
-#define TWNF_MAJORITYRULE 3
-
-/* ICAP_OVERSCAN values (OV_ means overscan) */
-#define TWOV_NONE       0
-#define TWOV_AUTO       1
-#define TWOV_TOPBOTTOM  2
-#define TWOV_LEFTRIGHT  3
-#define TWOV_ALL        4
-
-/* TW_FILESYSTEM.FileType values (FT_ means file type) */
-#define TWFY_CAMERA         0
-#define TWFY_CAMERATOP      1
-#define TWFY_CAMERABOTTOM   2
-#define TWFY_CAMERAPREVIEW  3
-#define TWFY_DOMAIN         4
-#define TWFY_HOST           5
-#define TWFY_DIRECTORY      6
-#define TWFY_IMAGE          7
-#define TWFY_UNKNOWN        8
-
-/* ICAP_JPEGQUALITY values (JQ_ means jpeg quality) */
-#define TWJQ_UNKNOWN       -4 
-#define TWJQ_LOW           -3
-#define TWJQ_MEDIUM        -2
-#define TWJQ_HIGH          -1
-
-/****************************************************************************
- * Country Constants                                                        *
- ****************************************************************************/
-
-#define TWCY_AFGHANISTAN   1001
-#define TWCY_ALGERIA        213
-#define TWCY_AMERICANSAMOA  684
-#define TWCY_ANDORRA        033
-#define TWCY_ANGOLA        1002
-#define TWCY_ANGUILLA      8090
-#define TWCY_ANTIGUA       8091
-#define TWCY_ARGENTINA       54
-#define TWCY_ARUBA          297
-#define TWCY_ASCENSIONI     247
-#define TWCY_AUSTRALIA       61
-#define TWCY_AUSTRIA         43
-#define TWCY_BAHAMAS       8092
-#define TWCY_BAHRAIN        973
-#define TWCY_BANGLADESH     880
-#define TWCY_BARBADOS      8093
-#define TWCY_BELGIUM         32
-#define TWCY_BELIZE         501
-#define TWCY_BENIN          229
-#define TWCY_BERMUDA       8094
-#define TWCY_BHUTAN        1003
-#define TWCY_BOLIVIA        591
-#define TWCY_BOTSWANA       267
-#define TWCY_BRITAIN          6
-#define TWCY_BRITVIRGINIS  8095
-#define TWCY_BRAZIL          55
-#define TWCY_BRUNEI         673
-#define TWCY_BULGARIA       359
-#define TWCY_BURKINAFASO   1004
-#define TWCY_BURMA         1005
-#define TWCY_BURUNDI       1006
-#define TWCY_CAMAROON       237
-#define TWCY_CANADA           2
-#define TWCY_CAPEVERDEIS    238
-#define TWCY_CAYMANIS      8096
-#define TWCY_CENTRALAFREP  1007
-#define TWCY_CHAD          1008
-#define TWCY_CHILE           56
-#define TWCY_CHINA           86
-#define TWCY_CHRISTMASIS   1009
-#define TWCY_COCOSIS       1009
-#define TWCY_COLOMBIA        57
-#define TWCY_COMOROS       1010
-#define TWCY_CONGO         1011
-#define TWCY_COOKIS        1012
-#define TWCY_COSTARICA     506
-#define TWCY_CUBA           005
-#define TWCY_CYPRUS         357
-#define TWCY_CZECHOSLOVAKIA  42
-#define TWCY_DENMARK         45
-#define TWCY_DJIBOUTI      1013
-#define TWCY_DOMINICA      8097
-#define TWCY_DOMINCANREP   8098
-#define TWCY_EASTERIS      1014
-#define TWCY_ECUADOR        593
-#define TWCY_EGYPT           20
-#define TWCY_ELSALVADOR     503
-#define TWCY_EQGUINEA      1015
-#define TWCY_ETHIOPIA       251
-#define TWCY_FALKLANDIS    1016
-#define TWCY_FAEROEIS       298
-#define TWCY_FIJIISLANDS    679
-#define TWCY_FINLAND        358
-#define TWCY_FRANCE          33
-#define TWCY_FRANTILLES     596
-#define TWCY_FRGUIANA       594
-#define TWCY_FRPOLYNEISA    689
-#define TWCY_FUTANAIS      1043
-#define TWCY_GABON          241
-#define TWCY_GAMBIA         220
-#define TWCY_GERMANY         49
-#define TWCY_GHANA          233
-#define TWCY_GIBRALTER      350
-#define TWCY_GREECE          30
-#define TWCY_GREENLAND      299
-#define TWCY_GRENADA       8099
-#define TWCY_GRENEDINES    8015
-#define TWCY_GUADELOUPE     590
-#define TWCY_GUAM           671
-#define TWCY_GUANTANAMOBAY 5399
-#define TWCY_GUATEMALA      502
-#define TWCY_GUINEA         224
-#define TWCY_GUINEABISSAU  1017
-#define TWCY_GUYANA         592
-#define TWCY_HAITI          509
-#define TWCY_HONDURAS       504
-#define TWCY_HONGKONG      852
-#define TWCY_HUNGARY         36
-#define TWCY_ICELAND        354
-#define TWCY_INDIA           91
-#define TWCY_INDONESIA       62
-#define TWCY_IRAN            98
-#define TWCY_IRAQ           964
-#define TWCY_IRELAND        353
-#define TWCY_ISRAEL         972
-#define TWCY_ITALY           39
-#define TWCY_IVORYCOAST    225
-#define TWCY_JAMAICA       8010
-#define TWCY_JAPAN           81
-#define TWCY_JORDAN         962
-#define TWCY_KENYA          254
-#define TWCY_KIRIBATI      1018
-#define TWCY_KOREA           82
-#define TWCY_KUWAIT         965
-#define TWCY_LAOS          1019
-#define TWCY_LEBANON       1020
-#define TWCY_LIBERIA        231
-#define TWCY_LIBYA          218
-#define TWCY_LIECHTENSTEIN   41
-#define TWCY_LUXENBOURG     352
-#define TWCY_MACAO          853
-#define TWCY_MADAGASCAR    1021
-#define TWCY_MALAWI         265
-#define TWCY_MALAYSIA        60
-#define TWCY_MALDIVES       960
-#define TWCY_MALI          1022
-#define TWCY_MALTA          356
-#define TWCY_MARSHALLIS     692
-#define TWCY_MAURITANIA    1023
-#define TWCY_MAURITIUS      230
-#define TWCY_MEXICO           3
-#define TWCY_MICRONESIA     691
-#define TWCY_MIQUELON       508
-#define TWCY_MONACO          33
-#define TWCY_MONGOLIA      1024
-#define TWCY_MONTSERRAT    8011
-#define TWCY_MOROCCO        212
-#define TWCY_MOZAMBIQUE    1025
-#define TWCY_NAMIBIA        264
-#define TWCY_NAURU         1026
-#define TWCY_NEPAL          977
-#define TWCY_NETHERLANDS     31
-#define TWCY_NETHANTILLES   599
-#define TWCY_NEVIS         8012
-#define TWCY_NEWCALEDONIA   687
-#define TWCY_NEWZEALAND      64
-#define TWCY_NICARAGUA      505
-#define TWCY_NIGER          227
-#define TWCY_NIGERIA        234
-#define TWCY_NIUE          1027
-#define TWCY_NORFOLKI      1028
-#define TWCY_NORWAY          47
-#define TWCY_OMAN           968
-#define TWCY_PAKISTAN        92
-#define TWCY_PALAU         1029
-#define TWCY_PANAMA         507
-#define TWCY_PARAGUAY       595
-#define TWCY_PERU            51
-#define TWCY_PHILLIPPINES    63
-#define TWCY_PITCAIRNIS    1030
-#define TWCY_PNEWGUINEA     675
-#define TWCY_POLAND          48
-#define TWCY_PORTUGAL       351
-#define TWCY_QATAR          974
-#define TWCY_REUNIONI      1031
-#define TWCY_ROMANIA         40
-#define TWCY_RWANDA         250
-#define TWCY_SAIPAN         670
-#define TWCY_SANMARINO       39
-#define TWCY_SAOTOME       1033
-#define TWCY_SAUDIARABIA    966
-#define TWCY_SENEGAL        221
-#define TWCY_SEYCHELLESIS  1034
-#define TWCY_SIERRALEONE   1035
-#define TWCY_SINGAPORE       65
-#define TWCY_SOLOMONIS     1036
-#define TWCY_SOMALI        1037
-#define TWCY_SOUTHAFRICA    27
-#define TWCY_SPAIN           34
-#define TWCY_SRILANKA        94
-#define TWCY_STHELENA      1032
-#define TWCY_STKITTS       8013
-#define TWCY_STLUCIA       8014
-#define TWCY_STPIERRE       508
-#define TWCY_STVINCENT     8015
-#define TWCY_SUDAN         1038
-#define TWCY_SURINAME       597
-#define TWCY_SWAZILAND      268
-#define TWCY_SWEDEN          46
-#define TWCY_SWITZERLAND     41
-#define TWCY_SYRIA         1039
-#define TWCY_TAIWAN         886
-#define TWCY_TANZANIA       255
-#define TWCY_THAILAND        66
-#define TWCY_TOBAGO        8016
-#define TWCY_TOGO           228
-#define TWCY_TONGAIS        676
-#define TWCY_TRINIDAD      8016
-#define TWCY_TUNISIA        216
-#define TWCY_TURKEY          90
-#define TWCY_TURKSCAICOS   8017
-#define TWCY_TUVALU        1040
-#define TWCY_UGANDA         256
-#define TWCY_USSR             7
-#define TWCY_UAEMIRATES     971
-#define TWCY_UNITEDKINGDOM   44
-#define TWCY_USA              1
-#define TWCY_URUGUAY        598
-#define TWCY_VANUATU       1041
-#define TWCY_VATICANCITY     39
-#define TWCY_VENEZUELA       58
-#define TWCY_WAKE          1042
-#define TWCY_WALLISIS      1043
-#define TWCY_WESTERNSAHARA 1044
-#define TWCY_WESTERNSAMOA  1045
-#define TWCY_YEMEN         1046
-#define TWCY_YUGOSLAVIA      38
-#define TWCY_ZAIRE          243
-#define TWCY_ZAMBIA         260
-#define TWCY_ZIMBABWE       263
-/* Added for 1.8 */
-#define TWCY_ALBANIA        355
-#define TWCY_ARMENIA        374
-#define TWCY_AZERBAIJAN     994
-#define TWCY_BELARUS        375
-#define TWCY_BOSNIAHERZGO   387
-#define TWCY_CAMBODIA       855
-#define TWCY_CROATIA        385
-#define TWCY_CZECHREPUBLIC  420
-#define TWCY_DIEGOGARCIA    246
-#define TWCY_ERITREA        291
-#define TWCY_ESTONIA        372
-#define TWCY_GEORGIA        995
-#define TWCY_LATVIA         371
-#define TWCY_LESOTHO        266
-#define TWCY_LITHUANIA      370
-#define TWCY_MACEDONIA      389
-#define TWCY_MAYOTTEIS      269
-#define TWCY_MOLDOVA        373
-#define TWCY_MYANMAR        95
-#define TWCY_NORTHKOREA     850
-#define TWCY_PUERTORICO     787
-#define TWCY_RUSSIA         7
-#define TWCY_SERBIA         381
-#define TWCY_SLOVAKIA       421
-#define TWCY_SLOVENIA       386
-#define TWCY_SOUTHKOREA     82
-#define TWCY_UKRAINE        380
-#define TWCY_USVIRGINIS     340
-#define TWCY_VIETNAM        84
-
-/****************************************************************************
- * Language Constants                                                       *
- ****************************************************************************/
-
-#define TWLG_DAN              0 /* Danish                 */
-#define TWLG_DUT              1 /* Dutch                  */
-#define TWLG_ENG              2 /* International English  */
-#define TWLG_FCF              3 /* French Canadian        */
-#define TWLG_FIN              4 /* Finnish                */
-#define TWLG_FRN              5 /* French                 */
-#define TWLG_GER              6 /* German                 */
-#define TWLG_ICE              7 /* Icelandic              */
-#define TWLG_ITN              8 /* Italian                */
-#define TWLG_NOR              9 /* Norwegian              */
-#define TWLG_POR             10 /* Portuguese             */
-#define TWLG_SPA             11 /* Spanish                */
-#define TWLG_SWE             12 /* Swedish                */
-#define TWLG_USA             13 /* U.S. English           */
-/* Added for 1.8 */
-#define TWLG_USERLOCALE           -1
-#define TWLG_AFRIKAANS            14  
-#define TWLG_ALBANIA              15
-#define TWLG_ARABIC               16
-#define TWLG_ARABIC_ALGERIA       17
-#define TWLG_ARABIC_BAHRAIN       18
-#define TWLG_ARABIC_EGYPT         19
-#define TWLG_ARABIC_IRAQ          20
-#define TWLG_ARABIC_JORDAN        21
-#define TWLG_ARABIC_KUWAIT        22
-#define TWLG_ARABIC_LEBANON       23
-#define TWLG_ARABIC_LIBYA         24
-#define TWLG_ARABIC_MOROCCO       25
-#define TWLG_ARABIC_OMAN          26
-#define TWLG_ARABIC_QATAR         27
-#define TWLG_ARABIC_SAUDIARABIA   28
-#define TWLG_ARABIC_SYRIA         29
-#define TWLG_ARABIC_TUNISIA       30
-#define TWLG_ARABIC_UAE           31 /* United Arabic Emirates */
-#define TWLG_ARABIC_YEMEN         32
-#define TWLG_BASQUE               33
-#define TWLG_BYELORUSSIAN         34
-#define TWLG_BULGARIAN            35
-#define TWLG_CATALAN              36
-#define TWLG_CHINESE              37
-#define TWLG_CHINESE_HONGKONG     38
-#define TWLG_CHINESE_PRC          39 /* People's Republic of China */
-#define TWLG_CHINESE_SINGAPORE    40
-#define TWLG_CHINESE_SIMPLIFIED   41
-#define TWLG_CHINESE_TAIWAN       42
-#define TWLG_CHINESE_TRADITIONAL  43
-#define TWLG_CROATIA              44
-#define TWLG_CZECH                45
-#define TWLG_DANISH               TWLG_DAN
-#define TWLG_DUTCH                TWLG_DUT
-#define TWLG_DUTCH_BELGIAN        46
-#define TWLG_ENGLISH              TWLG_ENG
-#define TWLG_ENGLISH_AUSTRALIAN   47
-#define TWLG_ENGLISH_CANADIAN     48
-#define TWLG_ENGLISH_IRELAND      49
-#define TWLG_ENGLISH_NEWZEALAND   50
-#define TWLG_ENGLISH_SOUTHAFRICA  51
-#define TWLG_ENGLISH_UK           52
-#define TWLG_ENGLISH_USA          TWLG_USA
-#define TWLG_ESTONIAN             53
-#define TWLG_FAEROESE             54
-#define TWLG_FARSI                55
-#define TWLG_FINNISH              TWLG_FIN
-#define TWLG_FRENCH               TWLG_FRN
-#define TWLG_FRENCH_BELGIAN       56
-#define TWLG_FRENCH_CANADIAN      TWLG_FCF
-#define TWLG_FRENCH_LUXEMBOURG    57
-#define TWLG_FRENCH_SWISS         58
-#define TWLG_GERMAN               TWLG_GER
-#define TWLG_GERMAN_AUSTRIAN      59
-#define TWLG_GERMAN_LUXEMBOURG    60
-#define TWLG_GERMAN_LIECHTENSTEIN 61
-#define TWLG_GERMAN_SWISS         62
-#define TWLG_GREEK                63
-#define TWLG_HEBREW               64
-#define TWLG_HUNGARIAN            65
-#define TWLG_ICELANDIC            TWLG_ICE
-#define TWLG_INDONESIAN           66
-#define TWLG_ITALIAN              TWLG_ITN
-#define TWLG_ITALIAN_SWISS        67
-#define TWLG_JAPANESE             68
-#define TWLG_KOREAN               69
-#define TWLG_KOREAN_JOHAB         70
-#define TWLG_LATVIAN              71
-#define TWLG_LITHUANIAN           72
-#define TWLG_NORWEGIAN            TWLG_NOR
-#define TWLG_NORWEGIAN_BOKMAL     73
-#define TWLG_NORWEGIAN_NYNORSK    74
-#define TWLG_POLISH               75
-#define TWLG_PORTUGUESE           TWLG_POR
-#define TWLG_PORTUGUESE_BRAZIL    76
-#define TWLG_ROMANIAN             77
-#define TWLG_RUSSIAN              78
-#define TWLG_SERBIAN_LATIN        79
-#define TWLG_SLOVAK               80
-#define TWLG_SLOVENIAN            81
-#define TWLG_SPANISH              TWLG_SPA
-#define TWLG_SPANISH_MEXICAN      82
-#define TWLG_SPANISH_MODERN       83
-#define TWLG_SWEDISH              TWLG_SWE
-#define TWLG_THAI                 84
-#define TWLG_TURKISH              85
-#define TWLG_UKRANIAN             86
-/* More stuff added for 1.8 */
-#define TWLG_ASSAMESE             87
-#define TWLG_BENGALI              88
-#define TWLG_BIHARI               89
-#define TWLG_BODO                 90
-#define TWLG_DOGRI                91
-#define TWLG_GUJARATI             92
-#define TWLG_HARYANVI             93
-#define TWLG_HINDI                94
-#define TWLG_KANNADA              95
-#define TWLG_KASHMIRI             96
-#define TWLG_MALAYALAM            97
-#define TWLG_MARATHI              98
-#define TWLG_MARWARI              99
-#define TWLG_MEGHALAYAN          100
-#define TWLG_MIZO                101
-#define TWLG_NAGA                102
-#define TWLG_ORISSI              103
-#define TWLG_PUNJABI             104
-#define TWLG_PUSHTU              105
-#define TWLG_SERBIAN_CYRILLIC    106
-#define TWLG_SIKKIMI             107
-#define TWLG_SWEDISH_FINLAND     108
-#define TWLG_TAMIL               109
-#define TWLG_TELUGU              110
-#define TWLG_TRIPURI             111
-#define TWLG_URDU                112
-#define TWLG_VIETNAMESE          113
-
-/****************************************************************************
- * Data Groups                                                              *
- ****************************************************************************/
-
-/* More Data Groups may be added in the future.
- * Possible candidates include text, vector graphics, sound, etc.
- * NOTE: Data Group constants must be powers of 2 as they are used
- *       as bitflags when Application asks DSM to present a list of DSs.
- */
-
-#define DG_CONTROL          0x0001L /* data pertaining to control       */
-#define DG_IMAGE            0x0002L /* data pertaining to raster images */
-/* Added 1.8 */
-#define DG_AUDIO            0x0004L /* data pertaining to audio */
-
-/****************************************************************************
- * Data Argument Types                                                      *
- ****************************************************************************/
-
-/*  SDH - 03/23/95 - WATCH                                                  */
-/*  The thunker requires knowledge about size of data being passed in the   */
-/*  lpData parameter to DS_Entry (which is not readily available due to     */
-/*  type LPVOID.  Thus, we key off the DAT_ argument to determine the size. */
-/*  This has a couple implications:                                         */
-/*  1) Any additional DAT_ features require modifications to the thunk code */
-/*     for thunker support.                                                 */
-/*  2) Any applications which use the custom capabailites are not supported */
-/*     under thunking since we have no way of knowing what size data (if    */
-/*     any) is being passed.                                                */
-
-#define DAT_NULL            0x0000 /* No data or structure. */
-#define DAT_CUSTOMBASE      0x8000 /* Base of custom DATs.  */
-
-/* Data Argument Types for the DG_CONTROL Data Group. */
-#define DAT_CAPABILITY      0x0001 /* TW_CAPABILITY                        */
-#define DAT_EVENT           0x0002 /* TW_EVENT                             */
-#define DAT_IDENTITY        0x0003 /* TW_IDENTITY                          */
-#define DAT_PARENT          0x0004 /* TW_HANDLE, application win handle in Windows */
-#define DAT_PENDINGXFERS    0x0005 /* TW_PENDINGXFERS                      */
-#define DAT_SETUPMEMXFER    0x0006 /* TW_SETUPMEMXFER                      */
-#define DAT_SETUPFILEXFER   0x0007 /* TW_SETUPFILEXFER                     */
-#define DAT_STATUS          0x0008 /* TW_STATUS                            */
-#define DAT_USERINTERFACE   0x0009 /* TW_USERINTERFACE                     */
-#define DAT_XFERGROUP       0x000a /* TW_UINT32                            */
-/*  SDH - 03/21/95 - TWUNK                                         */
-/*  Additional message required for thunker to request the special */
-/*  identity information.                                          */
-#define DAT_TWUNKIDENTITY   0x000b /* TW_TWUNKIDENTITY                     */
-#define DAT_CUSTOMDSDATA    0x000c /* TW_CUSTOMDSDATA.                     */
-/* Added 1.8 */
-#define DAT_DEVICEEVENT     0x000d /* TW_DEVICEEVENT                       */
-#define DAT_FILESYSTEM      0x000e /* TW_FILESYSTEM                        */
-#define DAT_PASSTHRU        0x000f /* TW_PASSTHRU                          */
-
-/* Data Argument Types for the DG_IMAGE Data Group. */
-#define DAT_IMAGEINFO       0x0101 /* TW_IMAGEINFO                         */
-#define DAT_IMAGELAYOUT     0x0102 /* TW_IMAGELAYOUT                       */
-#define DAT_IMAGEMEMXFER    0x0103 /* TW_IMAGEMEMXFER                      */
-#define DAT_IMAGENATIVEXFER 0x0104 /* TW_UINT32 loword is hDIB, PICHandle  */
-#define DAT_IMAGEFILEXFER   0x0105 /* Null data                            */
-#define DAT_CIECOLOR        0x0106 /* TW_CIECOLOR                          */
-#define DAT_GRAYRESPONSE    0x0107 /* TW_GRAYRESPONSE                      */
-#define DAT_RGBRESPONSE     0x0108 /* TW_RGBRESPONSE                       */
-#define DAT_JPEGCOMPRESSION 0x0109 /* TW_JPEGCOMPRESSION                   */
-#define DAT_PALETTE8        0x010a /* TW_PALETTE8                          */
-#define DAT_EXTIMAGEINFO    0x010b /* TW_EXTIMAGEINFO -- for 1.7 Spec.     */
-
-/* Added 1.8 */
-/* Data Argument Types for the DG_AUDIO Data Group. */
-#define DAT_AUDIOFILEXFER   0x0201 /* Null data                            */
-#define DAT_AUDIOINFO       0x0202 /* TW_AUDIOINFO                         */
-#define DAT_AUDIONATIVEXFER 0x0203 /* TW_UINT32 handle to WAV, (AIFF Mac)  */
-
-/* Added 1.9 */
-#define DAT_ SETUPFILEXFER2 0x0301 /* New file xfer operation              */
-
-/****************************************************************************
- * Messages                                                                 *
- ****************************************************************************/
-
-/* All message constants are unique.
- * Messages are grouped according to which DATs they are used with.*/
-
-#define MSG_NULL         0x0000 /* Used in TW_EVENT structure               */
-#define MSG_CUSTOMBASE   0x8000 /* Base of custom messages                  */
-
-/* Generic messages may be used with any of several DATs.                   */
-#define MSG_GET          0x0001 /* Get one or more values                   */
-#define MSG_GETCURRENT   0x0002 /* Get current value                        */
-#define MSG_GETDEFAULT   0x0003 /* Get default (e.g. power up) value        */
-#define MSG_GETFIRST     0x0004 /* Get first of a series of items, e.g. DSs */
-#define MSG_GETNEXT      0x0005 /* Iterate through a series of items.       */
-#define MSG_SET          0x0006 /* Set one or more values                   */
-#define MSG_RESET        0x0007 /* Set current value to default value       */
-#define MSG_QUERYSUPPORT 0x0008 /* Get supported operations on the cap.     */
-
-/* Messages used with DAT_NULL                                              */
-#define MSG_XFERREADY    0x0101 /* The data source has data ready           */
-#define MSG_CLOSEDSREQ   0x0102 /* Request for Application. to close DS             */
-#define MSG_CLOSEDSOK    0x0103 /* Tell the Application. to save the state.         */
-/* Added 1.8 */
-#define MSG_DEVICEEVENT  0X0104 /* Some event has taken place               */
-
-/* Messages used with a pointer to a DAT_STATUS structure                   */
-#define MSG_CHECKSTATUS  0x0201 /* Get status information                   */
-
-/* Messages used with a pointer to DAT_PARENT data                          */
-#define MSG_OPENDSM      0x0301 /* Open the DSM                             */
-#define MSG_CLOSEDSM     0x0302 /* Close the DSM                            */
-
-/* Messages used with a pointer to a DAT_IDENTITY structure                 */
-#define MSG_OPENDS       0x0401 /* Open a data source                       */
-#define MSG_CLOSEDS      0x0402 /* Close a data source                      */
-#define MSG_USERSELECT   0x0403 /* Put up a dialog of all DS                */
-
-/* Messages used with a pointer to a DAT_USERINTERFACE structure            */
-#define MSG_DISABLEDS    0x0501 /* Disable data transfer in the DS          */
-#define MSG_ENABLEDS     0x0502 /* Enable data transfer in the DS           */
-#define MSG_ENABLEDSUIONLY  0x0503  /* Enable for saving DS state only.     */
-
-/* Messages used with a pointer to a DAT_EVENT structure                    */
-#define MSG_PROCESSEVENT 0x0601
-
-/* Messages used with a pointer to a DAT_PENDINGXFERS structure             */
-#define MSG_ENDXFER      0x0701
-#define MSG_STOPFEEDER   0x0702
-
-/* Added 1.8 */
-/* Messages used with a pointer to a DAT_FILESYSTEM structure               */
-#define MSG_CHANGEDIRECTORY   0x0801
-#define MSG_CREATEDIRECTORY   0x0802
-#define MSG_DELETE            0x0803
-#define MSG_FORMATMEDIA       0x0804 
-#define MSG_GETCLOSE          0x0805
-#define MSG_GETFIRSTFILE      0x0806
-#define MSG_GETINFO           0x0807
-#define MSG_GETNEXTFILE       0x0808
-#define MSG_RENAME            0x0809
-#define MSG_COPY              0x080A
-#define MSG_AUTOMATICCAPTUREDIRECTORY 0x080B
-
-
-/* Messages used with a pointer to a DAT_PASSTHRU structure                 */
-#define MSG_PASSTHRU          0x0901
-
-/****************************************************************************
- * Capabilities                                                             *
- ****************************************************************************/
-
-#define CAP_CUSTOMBASE          0x8000 /* Base of custom capabilities */
-
-/* all data sources are REQUIRED to support these caps */
-#define CAP_XFERCOUNT           0x0001
-
-/* image data sources are REQUIRED to support these caps */
-#define ICAP_COMPRESSION        0x0100
-#define ICAP_PIXELTYPE          0x0101
-#define ICAP_UNITS              0x0102 /* default is TWUN_INCHES */
-#define ICAP_XFERMECH           0x0103
-
-/* all data sources MAY support these caps */
-#define CAP_AUTHOR                  0x1000
-#define CAP_CAPTION                 0x1001
-#define CAP_FEEDERENABLED           0x1002
-#define CAP_FEEDERLOADED            0x1003
-#define CAP_TIMEDATE                0x1004
-#define CAP_SUPPORTEDCAPS           0x1005
-#define CAP_EXTENDEDCAPS            0x1006
-#define CAP_AUTOFEED                0x1007
-#define CAP_CLEARPAGE               0x1008
-#define CAP_FEEDPAGE                0x1009
-#define CAP_REWINDPAGE              0x100a
-#define CAP_INDICATORS              0x100b   /* Added 1.1 */
-#define CAP_SUPPORTEDCAPSEXT        0x100c   /* Added 1.6 */
-#define CAP_PAPERDETECTABLE         0x100d   /* Added 1.6 */
-#define CAP_UICONTROLLABLE          0x100e   /* Added 1.6 */
-#define CAP_DEVICEONLINE            0x100f   /* Added 1.6 */
-#define CAP_AUTOSCAN                0x1010   /* Added 1.6 */
-#define CAP_THUMBNAILSENABLED       0x1011   /* Added 1.7 */
-#define CAP_DUPLEX                  0x1012   /* Added 1.7 */
-#define CAP_DUPLEXENABLED           0x1013   /* Added 1.7 */
-#define CAP_ENABLEDSUIONLY          0x1014   /* Added 1.7 */
-#define CAP_CUSTOMDSDATA            0x1015   /* Added 1.7 */
-#define CAP_ENDORSER                0x1016   /* Added 1.7 */
-#define CAP_JOBCONTROL              0x1017   /* Added 1.7 */
-#define CAP_ALARMS                  0x1018   /* Added 1.8 */
-#define CAP_ALARMVOLUME             0x1019   /* Added 1.8 */
-#define CAP_AUTOMATICCAPTURE        0x101a   /* Added 1.8 */
-#define CAP_TIMEBEFOREFIRSTCAPTURE  0x101b   /* Added 1.8 */
-#define CAP_TIMEBETWEENCAPTURES     0x101c   /* Added 1.8 */
-#define CAP_CLEARBUFFERS            0x101d   /* Added 1.8 */
-#define CAP_MAXBATCHBUFFERS         0x101e   /* Added 1.8 */
-#define CAP_DEVICETIMEDATE          0x101f   /* Added 1.8 */
-#define CAP_POWERSUPPLY             0x1020   /* Added 1.8 */
-#define CAP_CAMERAPREVIEWUI         0x1021   /* Added 1.8 */
-#define CAP_DEVICEEVENT             0x1022   /* Added 1.8 */
-#define CAP_SERIALNUMBER            0x1024   /* Added 1.8 */
-#define CAP_PRINTER                 0x1026   /* Added 1.8 */
-#define CAP_PRINTERENABLED          0x1027   /* Added 1.8 */
-#define CAP_PRINTERINDEX            0x1028   /* Added 1.8 */
-#define CAP_PRINTERMODE             0x1029   /* Added 1.8 */
-#define CAP_PRINTERSTRING           0x102a   /* Added 1.8 */
-#define CAP_PRINTERSUFFIX           0x102b   /* Added 1.8 */
-#define CAP_LANGUAGE                0x102c   /* Added 1.8 */
-#define CAP_FEEDERALIGNMENT         0x102d   /* Added 1.8 */
-#define CAP_FEEDERORDER             0x102e   /* Added 1.8 */
-#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
-#define ICAP_CONTRAST                     0x1103
-#define ICAP_CUSTHALFTONE                 0x1104
-#define ICAP_EXPOSURETIME                 0x1105
-#define ICAP_FILTER                       0x1106
-#define ICAP_FLASHUSED                    0x1107
-#define ICAP_GAMMA                        0x1108
-#define ICAP_HALFTONES                    0x1109
-#define ICAP_HIGHLIGHT                    0x110a
-#define ICAP_IMAGEFILEFORMAT              0x110c
-#define ICAP_LAMPSTATE                    0x110d
-#define ICAP_LIGHTSOURCE                  0x110e
-#define ICAP_ORIENTATION                  0x1110
-#define ICAP_PHYSICALWIDTH                0x1111
-#define ICAP_PHYSICALHEIGHT               0x1112
-#define ICAP_SHADOW                       0x1113
-#define ICAP_FRAMES                       0x1114
-#define ICAP_XNATIVERESOLUTION            0x1116
-#define ICAP_YNATIVERESOLUTION            0x1117
-#define ICAP_XRESOLUTION                  0x1118
-#define ICAP_YRESOLUTION                  0x1119
-#define ICAP_MAXFRAMES                    0x111a
-#define ICAP_TILES                        0x111b
-#define ICAP_BITORDER                     0x111c
-#define ICAP_CCITTKFACTOR                 0x111d
-#define ICAP_LIGHTPATH                    0x111e
-#define ICAP_PIXELFLAVOR                  0x111f
-#define ICAP_PLANARCHUNKY                 0x1120
-#define ICAP_ROTATION                     0x1121
-#define ICAP_SUPPORTEDSIZES               0x1122
-#define ICAP_THRESHOLD                    0x1123
-#define ICAP_XSCALING                     0x1124
-#define ICAP_YSCALING                     0x1125
-#define ICAP_BITORDERCODES                0x1126
-#define ICAP_PIXELFLAVORCODES             0x1127
-#define ICAP_JPEGPIXELTYPE                0x1128
-#define ICAP_TIMEFILL                     0x112a
-#define ICAP_BITDEPTH                     0x112b
-#define ICAP_BITDEPTHREDUCTION            0x112c  /* Added 1.5 */
-#define ICAP_UNDEFINEDIMAGESIZE           0x112d  /* Added 1.6 */
-#define ICAP_IMAGEDATASET                 0x112e  /* Added 1.7 */
-#define ICAP_EXTIMAGEINFO                 0x112f  /* Added 1.7 */
-#define ICAP_MINIMUMHEIGHT                0x1130  /* Added 1.7 */
-#define ICAP_MINIMUMWIDTH                 0x1131  /* Added 1.7 */
-#define ICAP_FLIPROTATION                 0x1136  /* Added 1.8 */
-#define ICAP_BARCODEDETECTIONENABLED      0x1137  /* Added 1.8 */
-#define ICAP_SUPPORTEDBARCODETYPES        0x1138  /* Added 1.8 */
-#define ICAP_BARCODEMAXSEARCHPRIORITIES   0x1139  /* Added 1.8 */
-#define ICAP_BARCODESEARCHPRIORITIES      0x113a  /* Added 1.8 */
-#define ICAP_BARCODESEARCHMODE            0x113b  /* Added 1.8 */
-#define ICAP_BARCODEMAXRETRIES            0x113c  /* Added 1.8 */
-#define ICAP_BARCODETIMEOUT               0x113d  /* Added 1.8 */
-#define ICAP_ZOOMFACTOR                   0x113e  /* Added 1.8 */
-#define ICAP_PATCHCODEDETECTIONENABLED    0x113f  /* Added 1.8 */
-#define ICAP_SUPPORTEDPATCHCODETYPES      0x1140  /* Added 1.8 */
-#define ICAP_PATCHCODEMAXSEARCHPRIORITIES 0x1141  /* Added 1.8 */
-#define ICAP_PATCHCODESEARCHPRIORITIES    0x1142  /* Added 1.8 */
-#define ICAP_PATCHCODESEARCHMODE          0x1143  /* Added 1.8 */
-#define ICAP_PATCHCODEMAXRETRIES          0x1144  /* Added 1.8 */
-#define ICAP_PATCHCODETIMEOUT             0x1145  /* Added 1.8 */
-#define ICAP_FLASHUSED2                   0x1146  /* Added 1.8 */
-#define ICAP_IMAGEFILTER                  0x1147  /* Added 1.8 */
-#define ICAP_NOISEFILTER                  0x1148  /* Added 1.8 */
-#define ICAP_OVERSCAN                     0x1149  /* Added 1.8 */
-#define ICAP_AUTOMATICBORDERDETECTION     0x1150  /* Added 1.8 */
-#define ICAP_AUTOMATICDESKEW              0x1151  /* Added 1.8 */
-#define ICAP_AUTOMATICROTATE              0x1152  /* Added 1.8 */
-#define ICAP_JPEGQUALITY                  0x1153  /* Added 1.9 */
-
-/* image data sources MAY support these audio caps */
-#define ACAP_AUDIOFILEFORMAT    0x1201  /* Added 1.8 */
-#define ACAP_XFERMECH           0x1202  /* Added 1.8 */
-
-/* ----------------------------------------------------------------------- *\
-
-  Version 1.7:      Following is Extended Image Info Attributes.
-  July 1997         
-  KHL               
-
-\* ----------------------------------------------------------------------- */
-
-#define TWEI_BARCODEX               0x1200
-#define TWEI_BARCODEY               0x1201
-#define TWEI_BARCODETEXT            0x1202
-#define TWEI_BARCODETYPE            0x1203
-#define TWEI_DESHADETOP             0x1204
-#define TWEI_DESHADELEFT            0x1205
-#define TWEI_DESHADEHEIGHT          0x1206
-#define TWEI_DESHADEWIDTH           0x1207
-#define TWEI_DESHADESIZE            0x1208
-#define TWEI_SPECKLESREMOVED        0x1209
-#define TWEI_HORZLINEXCOORD         0x120A
-#define TWEI_HORZLINEYCOORD         0x120B
-#define TWEI_HORZLINELENGTH         0x120C
-#define TWEI_HORZLINETHICKNESS      0x120D
-#define TWEI_VERTLINEXCOORD         0x120E
-#define TWEI_VERTLINEYCOORD         0x120F
-#define TWEI_VERTLINELENGTH         0x1210
-#define TWEI_VERTLINETHICKNESS      0x1211
-#define TWEI_PATCHCODE              0x1212
-#define TWEI_ENDORSEDTEXT           0x1213
-#define TWEI_FORMCONFIDENCE         0x1214
-#define TWEI_FORMTEMPLATEMATCH      0x1215
-#define TWEI_FORMTEMPLATEPAGEMATCH  0x1216
-#define TWEI_FORMHORZDOCOFFSET      0x1217
-#define TWEI_FORMVERTDOCOFFSET      0x1218
-#define TWEI_BARCODECOUNT           0x1219
-#define TWEI_BARCODECONFIDENCE      0x121A
-#define TWEI_BARCODEROTATION        0x121B
-#define TWEI_BARCODETEXTLENGTH      0x121C
-#define TWEI_DESHADECOUNT           0x121D
-#define TWEI_DESHADEBLACKCOUNTOLD   0x121E
-#define TWEI_DESHADEBLACKCOUNTNEW   0x121F
-#define TWEI_DESHADEBLACKRLMIN      0x1220
-#define TWEI_DESHADEBLACKRLMAX      0x1221
-#define TWEI_DESHADEWHITECOUNTOLD   0x1222
-#define TWEI_DESHADEWHITECOUNTNEW   0x1223
-#define TWEI_DESHADEWHITERLMIN      0x1224
-#define TWEI_DESHADEWHITERLAVE      0x1225
-#define TWEI_DESHADEWHITERLMAX      0x1226
-#define TWEI_BLACKSPECKLESREMOVED   0x1227
-#define TWEI_WHITESPECKLESREMOVED   0x1228
-#define TWEI_HORZLINECOUNT          0x1229
-#define TWEI_VERTLINECOUNT          0x122A
-#define TWEI_DESKEWSTATUS           0x122B
-#define TWEI_SKEWORIGINALANGLE      0x122C
-#define TWEI_SKEWFINALANGLE         0x122D
-#define TWEI_SKEWCONFIDENCE         0x122E
-#define TWEI_SKEWWINDOWX1           0x122F
-#define TWEI_SKEWWINDOWY1           0x1230
-#define TWEI_SKEWWINDOWX2           0x1231
-#define TWEI_SKEWWINDOWY2           0x1232
-#define TWEI_SKEWWINDOWX3           0x1233
-#define TWEI_SKEWWINDOWY3           0x1234
-#define TWEI_SKEWWINDOWX4           0x1235
-#define TWEI_SKEWWINDOWY4           0x1236
-#define TWEI_BOOKNAME               0x1238  /* added 1.9 */
-#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_FRAMENUMBER            0x123D  /* added 1.9 */
-#define TWEI_FRAME	            0x123E  /* added 1.9 */
-#define TWEI_PIXELFLAVOR            0x123F  /* added 1.9 */
-
-#define TWEJ_NONE                   0x0000
-#define TWEJ_MIDSEPARATOR           0x0001
-#define TWEJ_PATCH1                 0x0002
-#define TWEJ_PATCH2                 0x0003
-#define TWEJ_PATCH3                 0x0004
-#define TWEJ_PATCH4                 0x0005
-#define TWEJ_PATCH6                 0x0006
-#define TWEJ_PATCHT                 0x0007
-
-/* Added 1.8 */
-/* TW_PASSTHRU.Direction values */
-#define TWDR_GET                1
-#define TWDR_SET                2   
-
-/***************************************************************************
- *            Return Codes and Condition Codes section                     *
- ***************************************************************************/
-
-/* Return Codes: DSM_Entry and DS_Entry may return any one of these values. */
-#define TWRC_CUSTOMBASE     0x8000
-
-#define TWRC_SUCCESS          0
-#define TWRC_FAILURE          1 /* Application may get TW_STATUS for info on failure */
-#define TWRC_CHECKSTATUS      2 /* "tried hard"; get status                  */
-#define TWRC_CANCEL           3
-#define TWRC_DSEVENT          4
-#define TWRC_NOTDSEVENT       5
-#define TWRC_XFERDONE         6
-#define TWRC_ENDOFLIST        7 /* After MSG_GETNEXT if nothing left         */
-#define TWRC_INFONOTSUPPORTED 8
-#define TWRC_DATANOTAVAILABLE 9
-
-/* Condition Codes: Application gets these by doing DG_CONTROL DAT_STATUS MSG_GET.  */
-#define TWCC_CUSTOMBASE         0x8000
-
-#define TWCC_SUCCESS            0 /* It worked!                                */
-#define TWCC_BUMMER             1 /* Failure due to unknown causes             */
-#define TWCC_LOWMEMORY          2 /* Not enough memory to perform operation    */
-#define TWCC_NODS               3 /* No Data Source                            */
-#define TWCC_MAXCONNECTIONS     4 /* DS is connected to max possible applications      */
-#define TWCC_OPERATIONERROR     5 /* DS or DSM reported error, application shouldn't   */
-#define TWCC_BADCAP             6 /* Unknown capability                        */
-#define TWCC_BADPROTOCOL        9 /* Unrecognized MSG DG DAT combination       */
-#define TWCC_BADVALUE           10 /* Data parameter out of range              */
-#define TWCC_SEQERROR           11 /* DG DAT MSG out of expected sequence      */
-#define TWCC_BADDEST            12 /* Unknown destination Application/Source in DSM_Entry */
-#define TWCC_CAPUNSUPPORTED     13 /* Capability not supported by source            */
-#define TWCC_CAPBADOPERATION    14 /* Operation not supported by capability         */
-#define TWCC_CAPSEQERROR        15 /* Capability has dependancy on other capability */
-/* Added 1.8 */
-#define TWCC_DENIED             16 /* File System operation is denied (file is protected) */
-#define TWCC_FILEEXISTS         17 /* Operation failed because file already exists. */
-#define TWCC_FILENOTFOUND       18 /* File not found */
-#define TWCC_NOTEMPTY           19 /* Operation failed because directory is not empty */
-#define TWCC_PAPERJAM           20  /* The feeder is jammed */
-#define TWCC_PAPERDOUBLEFEED    21  /* The feeder detected multiple pages */
-#define TWCC_FILEWRITEERROR     22  /* Error writing the file (meant for things like disk full conditions) */
-#define TWCC_CHECKDEVICEONLINE  23  /* The device went offline prior to or during this operation */
-
-
-/* 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_SET           0x0002
-#define TWQC_GETDEFAULT    0x0004
-#define TWQC_GETCURRENT    0x0008
-#define TWQC_RESET         0x0010
-
-
-/****************************************************************************
- * Entry Points                                                             *
- ****************************************************************************/
-
-/**********************************************************************
- * Function: DSM_Entry, the only entry point into the Data Source Manager.
- *
- * Parameters:
- *  pOrigin Identifies the source module of the message. This could
- *          identify an Application, a Source, or the Source Manager.
- *
- *  pDest   Identifies the destination module for the message.
- *          This could identify an application or a data source.
- *          If this is NULL, the message goes to the Source Manager.
- *
- *  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.  
- *          Example: MSG_GET.
- *
- *  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.
- *
- ********************************************************************/
-
-/* Don't mangle the name "DSM_Entry" if we're compiling in C++! */
-#ifdef  __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-#ifdef  _MSWIN_
-TW_UINT16 FAR PASCAL DSM_Entry( pTW_IDENTITY pOrigin,
-                                pTW_IDENTITY pDest,
-                                TW_UINT32    DG,
-                                TW_UINT16    DAT,
-                                TW_UINT16    MSG,
-                                TW_MEMREF    pData);
-
-typedef TW_UINT16 (FAR PASCAL *DSMENTRYPROC)(pTW_IDENTITY, pTW_IDENTITY,
-                                             TW_UINT32,    TW_UINT16,
-                                             TW_UINT16,    TW_MEMREF);
-#else   /* _MSWIN_ */
-
-FAR PASCAL TW_UINT16 DSM_Entry( pTW_IDENTITY pOrigin,
-                                pTW_IDENTITY pDest,
-                                TW_UINT32    DG,
-                                TW_UINT16    DAT,
-                                TW_UINT16    MSG,
-                                TW_MEMREF    pData);
-
-typedef TW_UINT16 (*DSMENTRYPROC)(pTW_IDENTITY, pTW_IDENTITY,
-                                  TW_UINT32,    TW_UINT16,
-                                  TW_UINT16,    TW_MEMREF);
-#endif  /* _MSWIN_ */
-
-#ifdef  __cplusplus
-}
-#endif  /* cplusplus */
-
-
-/**********************************************************************
- * Function: DS_Entry, the entry point provided by a Data Source.
- *
- * Parameters:
- *  pOrigin Identifies the source module of the message. This could
- *          identify an application or the Data Source Manager.
- *
- *  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 
- *          by the Data Attribute Type.
- *          Example: (TW_MEMREF)&ImageMemXfer
- *                   where ImageMemXfer is a TW_IMAGEMEMXFER structure.
- *                    
- * Returns:
- *  ReturnCode
- *          Example: TWRC_SUCCESS.
- *
- * Note:
- *  The DSPROC type is only used by an application when it calls
- *  a Data Source directly, bypassing the Data Source Manager.
- *
- ********************************************************************/
-/* Don't mangle the name "DS_Entry" if we're compiling in C++! */
-#ifdef  __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-#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_MEMREF    pData);
-  #else   /* _WIN32 */
-     TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
-                                    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_MEMREF    pData);
-#else   /* _MSWIN_ */
-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,
-                                  TW_UINT32,    TW_UINT16,
-                                  TW_UINT16,    TW_MEMREF);
-#endif  /* _MSWIN_ */
-
-#ifdef  __cplusplus
-}
-#endif  /* cplusplus */
-
-/*  SDH - 02/08/95 - TWUNK */
-/*  Force 32-bit twain to use same packing of twain structures as existing */
-/*  16-bit twain.  This allows 16/32-bit thunking. */
-#ifdef  WIN32
-    #ifdef __MINGW32__
-        #pragma pack (pop)
-    #elif __BORLANDC__ //(Mentor June 13, 1996) if we're using a Borland compiler
-        #pragma option -a.  //(Mentor October 30, 1996) switch back to original alignment
-    #else   //(Mentor June 13, 1996) if NOT using a Borland compiler
-        #pragma pack (pop, before_twain)
-    #endif  //(Mentor June 13, 1996)
-#else   /* WIN32 */
-#endif  /* WIN32 */
-
-#endif  /* TWAIN */
diff --git a/twain/prj/build.lst b/twain/prj/build.lst
deleted file mode 100644
index cfeab25..0000000
--- a/twain/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-tw	twain	:	solenv NULL
-tw	twain							usr1	-	all	tw_mkout NULL
-tw  twain\util nmake - n tw_util NULL
diff --git a/twain/prj/d.lst b/twain/prj/d.lst
deleted file mode 100644
index 0827b03..0000000
--- a/twain/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\twain
-..\%__SRC%\inc\twain.h %_DEST%\inc\external\twain\twain.h
diff --git a/twain/util/makefile.mk b/twain/util/makefile.mk
deleted file mode 100644
index 043de88..0000000
--- a/twain/util/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..
-PRJNAME := twain
-TARGET := twain
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
-ALLTAR: $(OUT)$/inc$/twain.h
-
-$(OUT)$/inc$/%: $(PRJ)$/inc$/%
-    - $(MKDIR) $(@:d)
-    $(COPY) $< $@
diff --git a/unixODBC/inc/sql.h b/unixODBC/inc/sql.h
deleted file mode 100644
index 7ff7a40..0000000
--- a/unixODBC/inc/sql.h
+++ /dev/null
@@ -1,824 +0,0 @@
-/**************************************************
- * sql.h
- *
- * These should be consistent with the MS version.
- *
- **************************************************/
-#ifndef __SQL_H
-#define __SQL_H
-
-
-/****************************
- * default to 3.51 declare something else before here and you get a whole new ball of wax
- ***************************/
-#ifndef ODBCVER
-#define ODBCVER 0x0351
-#endif
-
-#ifndef __SQLTYPES_H
-#include "odbc/sqltypes.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/****************************
- * some ret values
- ***************************/
-#define SQL_NULL_DATA             (-1)
-#define SQL_DATA_AT_EXEC          (-2)
-#define SQL_SUCCESS                0
-#define SQL_SUCCESS_WITH_INFO      1
-#if (ODBCVER >= 0x0300)
-#define SQL_NO_DATA              100
-#endif
-#define SQL_ERROR                 (-1)
-#define SQL_INVALID_HANDLE        (-2)
-#define SQL_STILL_EXECUTING        2
-#define SQL_NEED_DATA             99
-#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
-
-/****************************
- * use these to indicate string termination to some function
- ***************************/
-#define SQL_NTS                   (-3)
-#define SQL_NTSL                  (-3L)
-
-/* maximum message length */
-#define SQL_MAX_MESSAGE_LENGTH   512
-
-/* date/time length constants */
-#if (ODBCVER >= 0x0300)
-#define SQL_DATE_LEN           10
-#define SQL_TIME_LEN            8  /* add P+1 if precision is nonzero */
-#define SQL_TIMESTAMP_LEN      19  /* add P+1 if precision is nonzero */
-#endif
-
-/* handle type identifiers */
-#if (ODBCVER >= 0x0300)
-#define SQL_HANDLE_ENV             1
-#define SQL_HANDLE_DBC             2
-#define SQL_HANDLE_STMT            3
-#define SQL_HANDLE_DESC            4
-#endif
-
-/* environment attribute */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_OUTPUT_NTS    10001
-#endif
-
-/* connection attributes */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_AUTO_IPD      10001
-#define SQL_ATTR_METADATA_ID   10014
-#endif  /* ODBCVER >= 0x0300 */
-
-/* statement attributes */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_APP_ROW_DESC       10010
-#define SQL_ATTR_APP_PARAM_DESC     10011
-#define SQL_ATTR_IMP_ROW_DESC       10012
-#define SQL_ATTR_IMP_PARAM_DESC     10013
-#define SQL_ATTR_CURSOR_SCROLLABLE  (-1)
-#define SQL_ATTR_CURSOR_SENSITIVITY (-2)
-#endif
-
-/* SQL_ATTR_CURSOR_SCROLLABLE values */
-#if (ODBCVER >= 0x0300)
-#define SQL_NONSCROLLABLE			0
-#define SQL_SCROLLABLE				1
-#endif  /* ODBCVER >= 0x0300 */
-
-/* identifiers of fields in the SQL descriptor */
-#if (ODBCVER >= 0x0300)
-#define SQL_DESC_COUNT                  1001
-#define SQL_DESC_TYPE                   1002
-#define SQL_DESC_LENGTH                 1003
-#define SQL_DESC_OCTET_LENGTH_PTR       1004
-#define SQL_DESC_PRECISION              1005
-#define SQL_DESC_SCALE                  1006
-#define SQL_DESC_DATETIME_INTERVAL_CODE 1007
-#define SQL_DESC_NULLABLE               1008
-#define SQL_DESC_INDICATOR_PTR          1009
-#define SQL_DESC_DATA_PTR               1010
-#define SQL_DESC_NAME                   1011
-#define SQL_DESC_UNNAMED                1012
-#define SQL_DESC_OCTET_LENGTH           1013
-#define SQL_DESC_ALLOC_TYPE             1099
-#endif
-
-/* identifiers of fields in the diagnostics area */
-#if (ODBCVER >= 0x0300)
-#define SQL_DIAG_RETURNCODE        1
-#define SQL_DIAG_NUMBER            2
-#define SQL_DIAG_ROW_COUNT         3
-#define SQL_DIAG_SQLSTATE          4
-#define SQL_DIAG_NATIVE            5
-#define SQL_DIAG_MESSAGE_TEXT      6
-#define SQL_DIAG_DYNAMIC_FUNCTION  7
-#define SQL_DIAG_CLASS_ORIGIN      8
-#define SQL_DIAG_SUBCLASS_ORIGIN   9
-#define SQL_DIAG_CONNECTION_NAME  10
-#define SQL_DIAG_SERVER_NAME      11
-#define SQL_DIAG_DYNAMIC_FUNCTION_CODE 12
-#endif
-
-/* dynamic function codes */
-#if (ODBCVER >= 0x0300)
-#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_CREATE_INDEX          (-1)
-#define SQL_DIAG_CREATE_SCHEMA			64
-#define SQL_DIAG_CREATE_TABLE          77
-#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_INDEX            (-2)
-#define SQL_DIAG_DROP_SCHEMA			31
-#define SQL_DIAG_DROP_TABLE            32
-#define SQL_DIAG_DROP_TRANSLATION      33
-#define SQL_DIAG_DROP_VIEW             36
-#define SQL_DIAG_DYNAMIC_DELETE_CURSOR 38
-#define SQL_DIAG_DYNAMIC_UPDATE_CURSOR 81
-#define SQL_DIAG_GRANT                 48
-#define SQL_DIAG_INSERT                50
-#define SQL_DIAG_REVOKE                59
-#define SQL_DIAG_SELECT_CURSOR         85
-#define SQL_DIAG_UNKNOWN_STATEMENT      0
-#define SQL_DIAG_UPDATE_WHERE          82
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL data type codes */
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR            1
-#define SQL_NUMERIC         2
-#define SQL_DECIMAL         3
-#define SQL_INTEGER         4
-#define SQL_SMALLINT        5
-#define SQL_FLOAT           6
-#define SQL_REAL            7
-#define SQL_DOUBLE          8
-#if (ODBCVER >= 0x0300)
-#define SQL_DATETIME        9
-#endif
-#define SQL_VARCHAR        12
-
-/* One-parameter shortcuts for date/time data types */
-#if (ODBCVER >= 0x0300)
-#define SQL_TYPE_DATE      91
-#define SQL_TYPE_TIME      92
-#define SQL_TYPE_TIMESTAMP 93
-#endif
-
-/* Statement attribute values for cursor sensitivity */
-#if (ODBCVER >= 0x0300)
-#define SQL_UNSPECIFIED     0
-#define SQL_INSENSITIVE     1
-#define SQL_SENSITIVE       2
-#endif
-
-/* GetTypeInfo() request for all data types */
-#define SQL_ALL_TYPES       0
-
-/* Default conversion code for SQLBindCol(), SQLBindParam() and SQLGetData() */
-#if (ODBCVER >= 0x0300)
-#define SQL_DEFAULT        99
-#endif
-
-/* SQLGetData() code indicating that the application row descriptor
- * specifies the data type
- */
-#if (ODBCVER >= 0x0300)
-#define SQL_ARD_TYPE      (-99)
-#endif
-
-/* SQL date/time type subcodes */
-#if (ODBCVER >= 0x0300)
-#define SQL_CODE_DATE       1
-#define SQL_CODE_TIME       2
-#define SQL_CODE_TIMESTAMP  3
-#endif
-
-/* CLI option values */
-#if (ODBCVER >= 0x0300)
-#define SQL_FALSE           0
-#define SQL_TRUE            1
-#endif
-
-/* values of NULLABLE field in descriptor */
-#define SQL_NO_NULLS        0
-#define SQL_NULLABLE        1
-
-/* Value returned by SQLGetTypeInfo() to denote that it is
- * not known whether or not a data type supports null values.
- */
-#define SQL_NULLABLE_UNKNOWN  2
-
-/* Values returned by SQLGetTypeInfo() to show WHERE clause
- * supported
- */
-#if (ODBCVER >= 0x0300)
-#define SQL_PRED_NONE     0
-#define SQL_PRED_CHAR     1
-#define SQL_PRED_BASIC    2
-#endif
-
-/* values of UNNAMED field in descriptor */
-#if (ODBCVER >= 0x0300)
-#define SQL_NAMED           0
-#define SQL_UNNAMED         1
-#endif
-
-/* values of ALLOC_TYPE field in descriptor */
-#if (ODBCVER >= 0x0300)
-#define SQL_DESC_ALLOC_AUTO 1
-#define SQL_DESC_ALLOC_USER 2
-#endif
-
-/* FreeStmt() options */
-#define SQL_CLOSE           0
-#define SQL_DROP            1
-#define SQL_UNBIND          2
-#define SQL_RESET_PARAMS    3
-
-/* Codes used for FetchOrientation in SQLFetchScroll(),
-   and in SQLDataSources()
-*/
-#define SQL_FETCH_NEXT      1
-#define SQL_FETCH_FIRST     2
-
-/* Other codes used for FetchOrientation in SQLFetchScroll() */
-#define SQL_FETCH_LAST      3
-#define SQL_FETCH_PRIOR     4
-#define SQL_FETCH_ABSOLUTE  5
-#define SQL_FETCH_RELATIVE  6
-
-/* SQLEndTran() options */
-#define SQL_COMMIT          0
-#define SQL_ROLLBACK        1
-
-/* null handles returned by SQLAllocHandle() */
-#define SQL_NULL_HENV       0
-#define SQL_NULL_HDBC       0
-#define SQL_NULL_HSTMT      0
-#if (ODBCVER >= 0x0300)
-#define SQL_NULL_HDESC      0
-#define SQL_NULL_DESC       0
-#endif
-
-/* null handle used in place of parent handle when allocating HENV */
-#if (ODBCVER >= 0x0300)
-#define SQL_NULL_HANDLE     0L
-#endif
-
-/* Values that may appear in the result set of SQLSpecialColumns() */
-#define SQL_SCOPE_CURROW    0
-#define SQL_SCOPE_TRANSACTION 1
-#define SQL_SCOPE_SESSION   2
-
-#define SQL_PC_UNKNOWN      0
-#if (ODBCVER >= 0x0300)
-#define SQL_PC_NON_PSEUDO   1
-#endif
-#define SQL_PC_PSEUDO       2
-
-/* Reserved value for the IdentifierType argument of SQLSpecialColumns() */
-#if (ODBCVER >= 0x0300)
-#define SQL_ROW_IDENTIFIER  1
-#endif
-
-/* Reserved values for UNIQUE argument of SQLStatistics() */
-#define SQL_INDEX_UNIQUE    0
-#define SQL_INDEX_ALL       1
-
-/* Values that may appear in the result set of SQLStatistics() */
-#define SQL_INDEX_CLUSTERED 1
-#define SQL_INDEX_HASHED    2
-#define SQL_INDEX_OTHER     3
-
-/* SQLGetFunctions() values to identify ODBC APIs */
-#define SQL_API_SQLALLOCCONNECT         1
-#define SQL_API_SQLALLOCENV             2
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLALLOCHANDLE       1001
-#endif
-#define SQL_API_SQLALLOCSTMT            3
-#define SQL_API_SQLBINDCOL              4
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLBINDPARAM         1002
-#endif
-#define SQL_API_SQLCANCEL               5
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLCLOSECURSOR       1003
-#define SQL_API_SQLCOLATTRIBUTE         6
-#endif
-#define SQL_API_SQLCOLUMNS             40
-#define SQL_API_SQLCONNECT              7
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLCOPYDESC          1004
-#endif
-#define SQL_API_SQLDATASOURCES         57
-#define SQL_API_SQLDESCRIBECOL          8
-#define SQL_API_SQLDISCONNECT           9
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLENDTRAN           1005
-#endif
-#define SQL_API_SQLERROR               10
-#define SQL_API_SQLEXECDIRECT          11
-#define SQL_API_SQLEXECUTE             12
-#define SQL_API_SQLFETCH               13
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLFETCHSCROLL       1021
-#endif
-#define SQL_API_SQLFREECONNECT         14
-#define SQL_API_SQLFREEENV             15
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLFREEHANDLE        1006
-#endif
-#define SQL_API_SQLFREESTMT            16
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLGETCONNECTATTR    1007
-#endif
-#define SQL_API_SQLGETCONNECTOPTION    42
-#define SQL_API_SQLGETCURSORNAME       17
-#define SQL_API_SQLGETDATA             43
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLGETDESCFIELD      1008
-#define SQL_API_SQLGETDESCREC        1009
-#define SQL_API_SQLGETDIAGFIELD      1010
-#define SQL_API_SQLGETDIAGREC        1011
-#define SQL_API_SQLGETENVATTR        1012
-#endif
-#define SQL_API_SQLGETFUNCTIONS        44
-#define SQL_API_SQLGETINFO             45
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLGETSTMTATTR       1014
-#endif
-#define SQL_API_SQLGETSTMTOPTION       46
-#define SQL_API_SQLGETTYPEINFO         47
-#define SQL_API_SQLNUMRESULTCOLS       18
-#define SQL_API_SQLPARAMDATA           48
-#define SQL_API_SQLPREPARE             19
-#define SQL_API_SQLPUTDATA             49
-#define SQL_API_SQLROWCOUNT            20
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLSETCONNECTATTR    1016
-#endif
-#define SQL_API_SQLSETCONNECTOPTION    50
-#define SQL_API_SQLSETCURSORNAME       21
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLSETDESCFIELD      1017
-#define SQL_API_SQLSETDESCREC        1018
-#define SQL_API_SQLSETENVATTR        1019
-#endif
-#define SQL_API_SQLSETPARAM            22
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLSETSTMTATTR       1020
-#endif
-#define SQL_API_SQLSETSTMTOPTION       51
-#define SQL_API_SQLSPECIALCOLUMNS      52
-#define SQL_API_SQLSTATISTICS          53
-#define SQL_API_SQLTABLES              54
-#define SQL_API_SQLTRANSACT            23
-
-/* Information requested by SQLGetInfo() */
-#if (ODBCVER >= 0x0300)
-#define SQL_MAX_DRIVER_CONNECTIONS           0
-#define SQL_MAXIMUM_DRIVER_CONNECTIONS		SQL_MAX_DRIVER_CONNECTIONS
-#define SQL_MAX_CONCURRENT_ACTIVITIES        1
-#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES	SQL_MAX_CONCURRENT_ACTIVITIES
-#endif
-#define SQL_DATA_SOURCE_NAME                 2
-#define SQL_FETCH_DIRECTION                  8
-#define SQL_SERVER_NAME                     13
-#define SQL_SEARCH_PATTERN_ESCAPE           14
-#define SQL_DBMS_NAME                       17
-#define SQL_DBMS_VER                        18
-#define SQL_ACCESSIBLE_TABLES               19
-#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_MAX_CURSOR_NAME_LEN             31
-#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_MAX_CATALOG_NAME_LEN            34
-#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_USER_NAME                       47
-#define SQL_TXN_ISOLATION_OPTION            72
-#define SQL_TRANSACTION_ISOLATION_OPTION	SQL_TXN_ISOLATION_OPTION
-#define SQL_INTEGRITY                       73
-#define SQL_GETDATA_EXTENSIONS              81
-#define SQL_NULL_COLLATION                  85
-#define SQL_ALTER_TABLE                     86
-#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_MAX_COLUMNS_IN_INDEX            98
-#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_MAX_COLUMNS_IN_SELECT          100
-#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_MAX_ROW_SIZE                   104
-#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_MAX_TABLES_IN_SELECT           106
-#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
-#if (ODBCVER >= 0x0300)
-#define SQL_OJ_CAPABILITIES                115
-#define SQL_OUTER_JOIN_CAPABILITIES		   SQL_OJ_CAPABILITIES
-#endif /* ODBCVER >= 0x0300 */
-
-#if (ODBCVER >= 0x0300)
-#define SQL_XOPEN_CLI_YEAR               10000
-#define SQL_CURSOR_SENSITIVITY           10001
-#define SQL_DESCRIBE_PARAMETER           10002
-#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
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL_ALTER_TABLE bitmasks */
-#if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN                   	0x00000001L
-#define SQL_AT_DROP_COLUMN                  	0x00000002L
-#endif /* ODBCVER >= 0x0200 */
-
-#if (ODBCVER >= 0x0300)
-#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
-*/
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* SQL_ASYNC_MODE values */
-#if (ODBCVER >= 0x0300)
-#define SQL_AM_NONE                         0
-#define SQL_AM_CONNECTION                   1
-#define SQL_AM_STATEMENT                    2
-#endif
-
-/* SQL_CURSOR_COMMIT_BEHAVIOR values */
-#define SQL_CB_DELETE                       0
-#define SQL_CB_CLOSE                        1
-#define SQL_CB_PRESERVE                     2
-
-/* SQL_FETCH_DIRECTION bitmasks */
-#define SQL_FD_FETCH_NEXT                   0x00000001L
-#define SQL_FD_FETCH_FIRST                  0x00000002L
-#define SQL_FD_FETCH_LAST                   0x00000004L
-#define SQL_FD_FETCH_PRIOR                  0x00000008L
-#define SQL_FD_FETCH_ABSOLUTE               0x00000010L
-#define SQL_FD_FETCH_RELATIVE               0x00000020L
-
-/* SQL_GETDATA_EXTENSIONS bitmasks */
-#define SQL_GD_ANY_COLUMN                   0x00000001L
-#define SQL_GD_ANY_ORDER                    0x00000002L
-
-/* SQL_IDENTIFIER_CASE values */
-#define SQL_IC_UPPER                        1
-#define SQL_IC_LOWER                        2
-#define SQL_IC_SENSITIVE                    3
-#define SQL_IC_MIXED                        4
-
-/* SQL_OJ_CAPABILITIES bitmasks */
-/* NB: this means 'outer join', not what  you may be thinking */
-
-
-#if (ODBCVER >= 0x0201)
-#define SQL_OJ_LEFT                         0x00000001L
-#define SQL_OJ_RIGHT                        0x00000002L
-#define SQL_OJ_FULL                         0x00000004L
-#define SQL_OJ_NESTED                       0x00000008L
-#define SQL_OJ_NOT_ORDERED                  0x00000010L
-#define SQL_OJ_INNER                        0x00000020L
-#define SQL_OJ_ALL_COMPARISON_OPS           0x00000040L
-#endif
-
-/* SQL_SCROLL_CONCURRENCY bitmasks */
-#define SQL_SCCO_READ_ONLY                  0x00000001L
-#define SQL_SCCO_LOCK                       0x00000002L
-#define SQL_SCCO_OPT_ROWVER                 0x00000004L
-#define SQL_SCCO_OPT_VALUES                 0x00000008L
-
-/* SQL_TXN_CAPABLE values */
-#define SQL_TC_NONE                         0
-#define SQL_TC_DML                          1
-#define SQL_TC_ALL                          2
-#define SQL_TC_DDL_COMMIT                   3
-#define SQL_TC_DDL_IGNORE                   4
-
-/* SQL_TXN_ISOLATION_OPTION bitmasks */
-#define SQL_TXN_READ_UNCOMMITTED            0x00000001L
-#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_TXN_REPEATABLE_READ             0x00000004L
-#define SQL_TRANSACTION_REPEATABLE_READ		SQL_TXN_REPEATABLE_READ
-#define SQL_TXN_SERIALIZABLE                0x00000008L
-#define SQL_TRANSACTION_SERIALIZABLE		SQL_TXN_SERIALIZABLE
-
-/* SQL_NULL_COLLATION values */
-#define SQL_NC_HIGH                         0
-#define SQL_NC_LOW                          1
-
-    SQLRETURN  SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle,
-                                       SQLHDBC *ConnectionHandle);
-
-    SQLRETURN  SQL_API SQLAllocEnv(SQLHENV *EnvironmentHandle);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLAllocHandle(SQLSMALLINT HandleType,
-                                      SQLHANDLE InputHandle, SQLHANDLE *OutputHandle);
-#endif
-
-    SQLRETURN  SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle,
-                                    SQLHSTMT *StatementHandle);
-
-    SQLRETURN  SQL_API SQLBindCol(SQLHSTMT StatementHandle,
-                                  SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
-                                  SQLPOINTER TargetValue, SQLLEN BufferLength,
-                                  SQLLEN *StrLen_or_Ind);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLBindParam(SQLHSTMT StatementHandle,
-                                    SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
-                                    SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
-                                    SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
-                                    SQLLEN *StrLen_or_Ind);
-#endif
-
-    SQLRETURN  SQL_API SQLCancel(SQLHSTMT StatementHandle);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLCloseCursor(SQLHSTMT StatementHandle);
-
-    SQLRETURN  SQL_API SQLColAttribute(SQLHSTMT StatementHandle,
-                                        SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
-                                        SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
-                                        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
-
-
-    SQLRETURN  SQL_API SQLColumns(SQLHSTMT StatementHandle,
-                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
-                                  SQLCHAR *ColumnName, SQLSMALLINT NameLength4);
-
-
-    SQLRETURN  SQL_API SQLConnect(SQLHDBC ConnectionHandle,
-                                  SQLCHAR *ServerName, SQLSMALLINT NameLength1,
-                                  SQLCHAR *UserName, SQLSMALLINT NameLength2,
-                                  SQLCHAR *Authentication, SQLSMALLINT NameLength3);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,
-                                   SQLHDESC TargetDescHandle);
-#endif
-
-    SQLRETURN  SQL_API SQLDataSources(SQLHENV EnvironmentHandle,
-                                      SQLUSMALLINT Direction, SQLCHAR *ServerName,
-                                      SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
-                                      SQLCHAR *Description, SQLSMALLINT BufferLength2,
-                                      SQLSMALLINT *NameLength2);
-
-    SQLRETURN  SQL_API SQLDescribeCol(SQLHSTMT StatementHandle,
-                                      SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
-                                      SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
-                                      SQLSMALLINT *DataType, SQLULEN *ColumnSize,
-                                      SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
-
-    SQLRETURN  SQL_API SQLDisconnect(SQLHDBC ConnectionHandle);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                  SQLSMALLINT CompletionType);
-#endif
-
-    SQLRETURN  SQL_API SQLError(SQLHENV EnvironmentHandle,
-                                SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
-                                SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
-                                SQLCHAR *MessageText, SQLSMALLINT BufferLength,
-                                SQLSMALLINT *TextLength);
-
-    SQLRETURN  SQL_API SQLExecDirect(SQLHSTMT StatementHandle,
-                                     SQLCHAR *StatementText, SQLINTEGER TextLength);
-
-    SQLRETURN  SQL_API SQLExecute(SQLHSTMT StatementHandle);
-
-    SQLRETURN  SQL_API SQLFetch(SQLHSTMT StatementHandle);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLFetchScroll(SQLHSTMT StatementHandle,
-                                      SQLSMALLINT FetchOrientation, SQLLEN FetchOffset);
-#endif
-
-    SQLRETURN  SQL_API SQLFreeConnect(SQLHDBC ConnectionHandle);
-
-    SQLRETURN  SQL_API SQLFreeEnv(SQLHENV EnvironmentHandle);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
-#endif
-
-    SQLRETURN  SQL_API SQLFreeStmt(SQLHSTMT StatementHandle,
-                                   SQLUSMALLINT Option);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle,
-                                         SQLINTEGER Attribute, SQLPOINTER Value,
-                                         SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif
-
-    SQLRETURN  SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle,
-                                           SQLUSMALLINT Option, SQLPOINTER Value);
-
-    SQLRETURN  SQL_API SQLGetCursorName(SQLHSTMT StatementHandle,
-                                        SQLCHAR *CursorName, SQLSMALLINT BufferLength,
-                                        SQLSMALLINT *NameLength);
-
-    SQLRETURN  SQL_API SQLGetData(SQLHSTMT StatementHandle,
-                                  SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
-                                  SQLPOINTER TargetValue, SQLLEN BufferLength,
-                                  SQLLEN *StrLen_or_Ind);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN   SQLGetDescField(SQLHDESC DescriptorHandle,
-                                SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
-                                SQLPOINTER Value, SQLINTEGER BufferLength,
-                                SQLINTEGER *StringLength);
-
-    SQLRETURN  SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle,
-                                     SQLSMALLINT RecNumber, SQLCHAR *Name,
-                                     SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
-                                     SQLSMALLINT *Type, SQLSMALLINT *SubType,
-                                     SQLLEN *Length, SQLSMALLINT *Precision,
-                                     SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
-
-    SQLRETURN  SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                       SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
-                                       SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
-                                       SQLSMALLINT *StringLength);
-
-    SQLRETURN  SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
-                                     SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-                                     SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                                     SQLSMALLINT BufferLength, SQLSMALLINT *TextLength);
-
-    SQLRETURN  SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle,
-                                     SQLINTEGER Attribute, SQLPOINTER Value,
-                                     SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif  /* ODBCVER >= 0x0300 */
-
-    SQLRETURN  SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle,
-                                       SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
-
-    SQLRETURN  SQL_API SQLGetInfo(SQLHDBC ConnectionHandle,
-                                  SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
-                                  SQLSMALLINT BufferLength, SQLSMALLINT *StringLength);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle,
-                                      SQLINTEGER Attribute, SQLPOINTER Value,
-                                      SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif  /* ODBCVER >= 0x0300 */
-
-    SQLRETURN  SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle,
-                                        SQLUSMALLINT Option, SQLPOINTER Value);
-
-    SQLRETURN  SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle,
-                                      SQLSMALLINT DataType);
-
-    SQLRETURN  SQL_API SQLNumResultCols(SQLHSTMT StatementHandle,
-                                        SQLSMALLINT *ColumnCount);
-
-    SQLRETURN  SQL_API SQLParamData(SQLHSTMT StatementHandle,
-                                    SQLPOINTER *Value);
-
-    SQLRETURN  SQL_API SQLPrepare(SQLHSTMT StatementHandle,
-                                  SQLCHAR *StatementText, SQLINTEGER TextLength);
-
-    SQLRETURN  SQL_API SQLPutData(SQLHSTMT StatementHandle,
-                                  SQLPOINTER Data, SQLLEN StrLen_or_Ind);
-
-    SQLRETURN  SQL_API SQLRowCount(SQLHSTMT StatementHandle,
-                                   SQLLEN *RowCount);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle,
-                                         SQLINTEGER Attribute, SQLPOINTER Value,
-                                         SQLINTEGER StringLength);
-#endif /* ODBCVER >= 0x0300 */
-
-    SQLRETURN  SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle,
-                                           SQLUSMALLINT Option, SQLULEN Value);
-
-    SQLRETURN  SQL_API SQLSetCursorName(SQLHSTMT StatementHandle,
-                                        SQLCHAR *CursorName, SQLSMALLINT NameLength);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLSetDescField(SQLHDESC DescriptorHandle,
-                                       SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
-                                       SQLPOINTER Value, SQLINTEGER BufferLength);
-
-    SQLRETURN  SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle,
-                                     SQLSMALLINT RecNumber, SQLSMALLINT Type,
-                                     SQLSMALLINT SubType, SQLLEN Length,
-                                     SQLSMALLINT Precision, SQLSMALLINT Scale,
-                                     SQLPOINTER Data, SQLLEN *StringLength,
-                                     SQLLEN *Indicator);
-
-    SQLRETURN  SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle,
-                                     SQLINTEGER Attribute, SQLPOINTER Value,
-                                     SQLINTEGER StringLength);
-#endif /* ODBCVER >= 0x0300 */
-
-    SQLRETURN  SQL_API SQLSetParam(SQLHSTMT StatementHandle,
-                                   SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
-                                   SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
-                                   SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
-                                   SQLLEN *StrLen_or_Ind);
-
-#if (ODBCVER >= 0x0300)
-    SQLRETURN  SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle,
-                                      SQLINTEGER Attribute, SQLPOINTER Value,
-                                      SQLINTEGER StringLength);
-#endif
-
-    SQLRETURN  SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle,
-                                        SQLUSMALLINT Option, SQLULEN Value);
-
-    SQLRETURN  SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle,
-                                         SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
-                                         SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
-                                         SQLSMALLINT NameLength2, SQLCHAR *TableName,
-                                         SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
-                                         SQLUSMALLINT Nullable);
-
-    SQLRETURN  SQL_API SQLStatistics(SQLHSTMT StatementHandle,
-                                     SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-                                     SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-                                     SQLCHAR *TableName, SQLSMALLINT NameLength3,
-                                     SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
-
-    SQLRETURN   SQL_API SQLTables(SQLHSTMT StatementHandle,
-                                  SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-                                  SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-                                  SQLCHAR *TableName, SQLSMALLINT NameLength3,
-                                  SQLCHAR *TableType, SQLSMALLINT NameLength4);
-
-    SQLRETURN  SQL_API SQLTransact(SQLHENV EnvironmentHandle,
-                                   SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
-
-#ifdef __cplusplus
-}
-#endif
-#endif	
diff --git a/unixODBC/inc/sqlext.h b/unixODBC/inc/sqlext.h
deleted file mode 100644
index f31c479..0000000
--- a/unixODBC/inc/sqlext.h
+++ /dev/null
@@ -1,2122 +0,0 @@
-/*****************************************************
- * sqlext.h
- *
- * These should be consistent with the MS version.
- *
- *****************************************************/
-#ifndef __SQLEXT_H
-#define __SQLEXT_H
-
-
-/* BEGIN - unixODBC ONLY (programs like ODBCConfig and DataManager use these) */
-
-/* COLUMNS IN SQLTables() RESULT SET */
-#define SQLTables_TABLE_CATALOG 1
-#define SQLTables_TABLE_SCHEM 2
-#define SQLTables_TABLE_NAME 3
-#define SQLTables_TABLE_TYPE 4
-#define SQLTables_REMARKS 5
-
-/* COLUMNS IN SQLColumns() RESULT SET */                     
-#define SQLColumns_TABLE_CAT 1
-#define SQLColumns_TABLE_SCHEM 2
-#define SQLColumns_TABLE_NAME 3
-#define SQLColumns_COLUMN_NAME 4
-#define SQLColumns_DATA_TYPE 5
-#define SQLColumns_TYPE_NAME 6
-#define SQLColumns_COLUMN_SIZE 7
-#define SQLColumns_BUFFER_LENGTH 8
-#define SQLColumns_DECIMAL_DIGITS 9
-#define SQLColumns_NUM_PREC_RADIX 10
-#define SQLColumns_NULLABLE 11
-#define SQLColumns_REMARKS 12
-#define SQLColumns_COLUMN_DEF 13
-#define SQLColumns_SQL_DATA_TYPE 14
-#define SQLColumns_SQL_DATETIME_SUB 15
-#define SQLColumns_CHAR_OCTET_LENGTH 16
-#define SQLColumns_ORDINAL_POSITION 17
-#define SQLColumns_IS_NULLABLE 18
-
-/* END - unixODBC ONLY */
-
-#ifndef __SQL_H
-#include "odbc/sql.h"
-#endif
-
-#ifdef __cplusplus
-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_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
-#else
-#define SQL_NO_DATA_FOUND	SQL_NO_DATA
-#endif
-
-/* an end handle type */
-#if (ODBCVER >= 0x0300)
-#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
-
-/* unixODBC additions */
-#define SQL_ATTR_UNIXODBC_SYSPATH           65001
-#define SQL_ATTR_UNIXODBC_VERSION           65002
-#define SQL_ATTR_UNIXODBC_ENVATTR           65003
-#endif  /* ODBCVER >= 0x0300 */
-
-#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
-
-/* 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		
-
-/* values for SQL_ATTR_ODBC_VERSION */
-#define SQL_OV_ODBC2						2UL
-#define	SQL_OV_ODBC3						3UL
-#endif  /* ODBCVER >= 0x0300 */
-
-/* connection attributes */
-#define SQL_ACCESS_MODE                 101
-#define SQL_AUTOCOMMIT                  102
-#define SQL_LOGIN_TIMEOUT               103
-#define SQL_OPT_TRACE                   104
-#define SQL_OPT_TRACEFILE               105
-#define SQL_TRANSLATE_DLL               106
-#define SQL_TRANSLATE_OPTION            107
-#define SQL_TXN_ISOLATION               108
-#define SQL_CURRENT_QUALIFIER           109
-#define SQL_ODBC_CURSORS                110
-#define SQL_QUIET_MODE                  111
-#define SQL_PACKET_SIZE                 112
-
-/* 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
-#endif  /* ODBCVER >= 0x0300 */
-
-#define SQL_ATTR_CONNECTION_DEAD	1209	/* GetConnectAttr only */
-
-#define SQL_ATTR_DRIVER_THREADING	1028	/* Driver threading level */
-
-#if (ODBCVER >= 0x0351)
-/*	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
-    This attribute was introduced because some unicode driver's some APIs may
-    need to behave differently on ANSI or Unicode applications. A unicode
-    driver, which  has same behavior for both ANSI or Unicode applications,
-    should return SQL_ERROR when the driver manager sets this connection
-    attribute. When a unicode driver returns SQL_SUCCESS on this attribute,
-    the driver manager treates ANSI and Unicode connections differently in
-    connection pooling.
-*/
-#define SQL_ATTR_ANSI_APP			115
-#endif
-
-/* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */
-#if (ODBCVER < 0x0300)
-#define SQL_CONNECT_OPT_DRVR_START      1000
-#endif  /* ODBCVER < 0x0300 */
-
-#if (ODBCVER < 0x0300)
-#define SQL_CONN_OPT_MAX                SQL_PACKET_SIZE
-#define SQL_CONN_OPT_MIN                SQL_ACCESS_MODE
-#endif /* ODBCVER < 0x0300 */
-
-/* SQL_ACCESS_MODE options */
-#define SQL_MODE_READ_WRITE             0UL
-#define SQL_MODE_READ_ONLY              1UL
-#define SQL_MODE_DEFAULT                SQL_MODE_READ_WRITE
-
-/* SQL_AUTOCOMMIT options */
-#define SQL_AUTOCOMMIT_OFF              0UL
-#define SQL_AUTOCOMMIT_ON               1UL
-#define SQL_AUTOCOMMIT_DEFAULT          SQL_AUTOCOMMIT_ON
-
-/* SQL_LOGIN_TIMEOUT options */
-#define SQL_LOGIN_TIMEOUT_DEFAULT       15UL
-
-/* SQL_OPT_TRACE options */
-#define SQL_OPT_TRACE_OFF               0UL
-#define SQL_OPT_TRACE_ON                1UL
-#define SQL_OPT_TRACE_DEFAULT           SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT      "/tmp/SQL.LOG"
-
-/* SQL_ODBC_CURSORS options */
-#define SQL_CUR_USE_IF_NEEDED           0UL
-#define SQL_CUR_USE_ODBC                1UL
-#define SQL_CUR_USE_DRIVER              2UL
-#define SQL_CUR_DEFAULT                 SQL_CUR_USE_DRIVER
-
-#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
-
-/* values for SQL_ATTR_ENLIST_IN_DTC */
-#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 */
-
-/* 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 */
-#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 */
-
-/* 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	
-
-#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 */
-
-/* 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
-#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)
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_QUERY_TIMEOUT options */
-#define SQL_QUERY_TIMEOUT_DEFAULT       0UL
-
-/* SQL_MAX_ROWS options */
-#define SQL_MAX_ROWS_DEFAULT            0UL
-
-/* SQL_NOSCAN options */
-#define SQL_NOSCAN_OFF                  0UL     /*      1.0 FALSE */
-#define SQL_NOSCAN_ON                   1UL     /*      1.0 TRUE */
-#define SQL_NOSCAN_DEFAULT              SQL_NOSCAN_OFF
-
-/* SQL_MAX_LENGTH options */
-#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_DEFAULT        SQL_ASYNC_ENABLE_OFF
-
-/* SQL_BIND_TYPE options */
-#define SQL_BIND_BY_COLUMN              0UL
-#define SQL_BIND_TYPE_DEFAULT           SQL_BIND_BY_COLUMN  /* Default value */
-
-/* SQL_CONCURRENCY options */
-#define SQL_CONCUR_READ_ONLY            1
-#define SQL_CONCUR_LOCK                 2
-#define SQL_CONCUR_ROWVER               3
-#define SQL_CONCUR_VALUES               4
-#define SQL_CONCUR_DEFAULT              SQL_CONCUR_READ_ONLY /* Default value */
-
-/* SQL_CURSOR_TYPE options */
-#define SQL_CURSOR_FORWARD_ONLY         0UL
-#define SQL_CURSOR_KEYSET_DRIVEN        1UL
-#define SQL_CURSOR_DYNAMIC              2UL
-#define SQL_CURSOR_STATIC               3UL
-#define SQL_CURSOR_TYPE_DEFAULT         SQL_CURSOR_FORWARD_ONLY /* Default value */
-
-/* SQL_ROWSET_SIZE options */
-#define SQL_ROWSET_SIZE_DEFAULT         1UL
-
-/* SQL_KEYSET_SIZE options */
-#define SQL_KEYSET_SIZE_DEFAULT         0UL
-
-/* SQL_SIMULATE_CURSOR options */
-#define SQL_SC_NON_UNIQUE               0UL
-#define SQL_SC_TRY_UNIQUE               1UL
-#define SQL_SC_UNIQUE                   2UL
-
-/* SQL_RETRIEVE_DATA options */
-#define SQL_RD_OFF                      0UL
-#define SQL_RD_ON                       1UL
-#define SQL_RD_DEFAULT                  SQL_RD_ON
-
-/* SQL_USE_BOOKMARKS options */
-#define SQL_UB_OFF                      0UL
-#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
-#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
-#if (ODBCVER >= 0x0350)
-#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
-#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)	
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL extended datatypes */
-#define SQL_DATE                                9
-#if (ODBCVER >= 0x0300)
-#define SQL_INTERVAL							10
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_TIME                                10
-#define SQL_TIMESTAMP                           11
-#define SQL_LONGVARCHAR                         (-1)
-#define SQL_BINARY                              (-2)
-#define SQL_VARBINARY                           (-3)
-#define SQL_LONGVARBINARY                       (-4)
-#define SQL_BIGINT                              (-5)
-#define SQL_TINYINT                             (-6)
-#define SQL_BIT                                 (-7)
-#if (ODBCVER >= 0x0350)
-#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)
-
-#else
-#define SQL_INTERVAL_YEAR                       (-80)
-#define SQL_INTERVAL_MONTH                      (-81)
-#define SQL_INTERVAL_YEAR_TO_MONTH              (-82)
-#define SQL_INTERVAL_DAY                        (-83)
-#define SQL_INTERVAL_HOUR                       (-84)
-#define SQL_INTERVAL_MINUTE                     (-85)
-#define SQL_INTERVAL_SECOND                     (-86)
-#define SQL_INTERVAL_DAY_TO_HOUR                (-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE              (-88)
-#define SQL_INTERVAL_DAY_TO_SECOND              (-89)
-#define SQL_INTERVAL_HOUR_TO_MINUTE             (-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND             (-91)
-#define SQL_INTERVAL_MINUTE_TO_SECOND           (-92)
-#endif  /* ODBCVER >= 0x0300 */
-
-
-#if (ODBCVER <= 0x0300)
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-#define SQL_UNICODE_CHAR                        SQL_UNICODE
-#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
-#endif
-
-#if (ODBCVER < 0x0300)
-#define SQL_TYPE_DRIVER_START                   SQL_INTERVAL_YEAR
-#define SQL_TYPE_DRIVER_END                     SQL_UNICODE_LONGVARCHAR
-#endif  /* ODBCVER < 0x0300 */
-
-/* C datatype to SQL datatype mapping      SQL types
-                                           ------------------- */
-#define SQL_C_CHAR    SQL_CHAR             /* CHAR, VARCHAR, DECIMAL, NUMERIC */
-#define SQL_C_LONG    SQL_INTEGER          /* INTEGER                      */
-#define SQL_C_SHORT   SQL_SMALLINT         /* SMALLINT                     */
-#define SQL_C_FLOAT   SQL_REAL             /* REAL                         */
-#define SQL_C_DOUBLE  SQL_DOUBLE           /* FLOAT, DOUBLE                */
-#if (ODBCVER >= 0x0300)
-#define	SQL_C_NUMERIC		SQL_NUMERIC
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_C_DEFAULT 99
-
-#define SQL_SIGNED_OFFSET       (-20)
-#define SQL_UNSIGNED_OFFSET     (-22)
-
-/* C datatype to SQL datatype mapping */
-#define SQL_C_DATE       SQL_DATE
-#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
-#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 */
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_C_TINYINT    SQL_TINYINT
-#define SQL_C_SLONG      (SQL_C_LONG+SQL_SIGNED_OFFSET)    /* SIGNED INTEGER  */
-#define SQL_C_SSHORT     (SQL_C_SHORT+SQL_SIGNED_OFFSET)   /* SIGNED SMALLINT */
-#define SQL_C_STINYINT   (SQL_TINYINT+SQL_SIGNED_OFFSET)   /* SIGNED TINYINT  */
-#define SQL_C_ULONG      (SQL_C_LONG+SQL_UNSIGNED_OFFSET)  /* UNSIGNED INTEGER*/
-#define SQL_C_USHORT     (SQL_C_SHORT+SQL_UNSIGNED_OFFSET) /* UNSIGNED SMALLINT*/
-#define SQL_C_UTINYINT   (SQL_TINYINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED TINYINT*/
-
-#if (ODBCVER >= 0x0300) && (SIZEOF_LONG_INT == 8) && !defined(BUILD_LEGACY_64_BIT_MODE)
-#define SQL_C_BOOKMARK   SQL_C_UBIGINT                     /* BOOKMARK        */
-#else
-#define SQL_C_BOOKMARK   SQL_C_ULONG                       /* BOOKMARK        */
-#endif
-
-#if (ODBCVER >= 0x0350)
-#define SQL_C_GUID	SQL_GUID
-#endif  /* ODBCVER >= 0x0350 */
-
-#define SQL_TYPE_NULL                   0
-#if (ODBCVER < 0x0300)
-#define SQL_TYPE_MIN                    SQL_BIT
-#define SQL_TYPE_MAX                    SQL_VARCHAR
-#endif
-
-#if (ODBCVER >= 0x0300)
-#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)
-#endif
-
-/* SQLBindParameter extensions */
-#define SQL_DEFAULT_PARAM            (-5)
-#define SQL_IGNORE                   (-6)
-#if (ODBCVER >= 0x0300)
-#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)
-
-/* Defines used by Driver Manager when mapping SQLSetParam to SQLBindParameter
-*/
-#define SQL_PARAM_TYPE_DEFAULT           SQL_PARAM_INPUT_OUTPUT
-#define SQL_SETPARAM_VALUE_MAX           (-1L)
-
-/* SQLColAttributes defines */
-#define SQL_COLUMN_COUNT                0
-#define SQL_COLUMN_NAME                 1
-#define SQL_COLUMN_TYPE                 2
-#define SQL_COLUMN_LENGTH               3
-#define SQL_COLUMN_PRECISION            4
-#define SQL_COLUMN_SCALE                5
-#define SQL_COLUMN_DISPLAY_SIZE         6
-#define SQL_COLUMN_NULLABLE             7
-#define SQL_COLUMN_UNSIGNED             8
-#define SQL_COLUMN_MONEY                9
-#define SQL_COLUMN_UPDATABLE            10
-#define SQL_COLUMN_AUTO_INCREMENT       11
-#define SQL_COLUMN_CASE_SENSITIVE       12
-#define SQL_COLUMN_SEARCHABLE           13
-#define SQL_COLUMN_TYPE_NAME            14
-#define SQL_COLUMN_TABLE_NAME           15
-#define SQL_COLUMN_OWNER_NAME           16
-#define SQL_COLUMN_QUALIFIER_NAME       17
-#define SQL_COLUMN_LABEL                18
-#define SQL_COLATT_OPT_MAX              SQL_COLUMN_LABEL
-#if (ODBCVER < 0x0300)
-#define SQL_COLUMN_DRIVER_START         1000
-#endif  /* ODBCVER < 0x0300 */
-
-#define SQL_COLATT_OPT_MIN              SQL_COLUMN_COUNT
-
-/* SQLColAttributes subdefines for SQL_COLUMN_UPDATABLE */
-#define SQL_ATTR_READONLY               0
-#define SQL_ATTR_WRITE                  1
-#define SQL_ATTR_READWRITE_UNKNOWN      2
-
-/* SQLColAttributes subdefines for SQL_COLUMN_SEARCHABLE */
-/* These are also used by SQLGetInfo                     */
-#define SQL_UNSEARCHABLE                0
-#define SQL_LIKE_ONLY                   1
-#define SQL_ALL_EXCEPT_LIKE             2
-#define SQL_SEARCHABLE                  3
-#define SQL_PRED_SEARCHABLE				SQL_SEARCHABLE
-
-
-/* Special return values for SQLGetData */
-#define SQL_NO_TOTAL                    (-4)
-
-/********************************************/
-/* SQLGetFunctions: additional values for   */
-/* fFunction to represent functions that    */
-/* are not in the X/Open spec.				*/
-/********************************************/
-
-#if (ODBCVER >= 0x0300)
-#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_SQLDRIVERS          71
-#define SQL_API_SQLEXTENDEDFETCH    59
-#define SQL_API_SQLFOREIGNKEYS      60
-#define SQL_API_SQLMORERESULTS      61
-#define SQL_API_SQLNATIVESQL        62
-#define SQL_API_SQLNUMPARAMS        63
-#define SQL_API_SQLPARAMOPTIONS     64
-#define SQL_API_SQLPRIMARYKEYS      65
-#define SQL_API_SQLPROCEDURECOLUMNS 66
-#define SQL_API_SQLPROCEDURES       67
-#define SQL_API_SQLSETPOS           68
-#define SQL_API_SQLSETSCROLLOPTIONS 69
-#define SQL_API_SQLTABLEPRIVILEGES  70
-
-/*-------------------------------------------*/
-/* SQL_EXT_API_LAST is not useful with ODBC  */
-/* version 3.0 because some of the values    */
-/* from X/Open are in the 10000 range.       */
-/*-------------------------------------------*/
-
-#if (ODBCVER < 0x0300)
-#define SQL_EXT_API_LAST            SQL_API_SQLBINDPARAMETER
-#define SQL_NUM_FUNCTIONS           23
-#define SQL_EXT_API_START           40
-#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
-#endif
-
-/*--------------------------------------------*/
-/* SQL_API_ALL_FUNCTIONS returns an array     */
-/* of 'booleans' representing whether a       */
-/* function is implemented by the driver.     */
-/*                                            */
-/* CAUTION: Only functions defined in ODBC    */
-/* version 2.0 and earlier are returned, the  */
-/* new high-range function numbers defined by */
-/* X/Open break this scheme.   See the new    */
-/* method -- SQL_API_ODBC3_ALL_FUNCTIONS      */
-/*--------------------------------------------*/
-
-#define SQL_API_ALL_FUNCTIONS       0		/* See CAUTION above */
-
-/*----------------------------------------------*/
-/* 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.			*/
-/*----------------------------------------------*/
-
-#define SQL_API_LOADBYORDINAL       199		/* See CAUTION above */	
-
-/*----------------------------------------------*/
-/* SQL_API_ODBC3_ALL_FUNCTIONS                  */
-/* This returns a bitmap, which allows us to    */
-/* handle the higher-valued function numbers.   */
-/* Use  SQL_FUNC_EXISTS(bitmap,function_number) */
-/* to determine if the function exists.         */
-/*----------------------------------------------*/
-
-
-#if (ODBCVER >= 0x0300)
-#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 )
-
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/************************************************/
-/* Extended definitions for SQLGetInfo			*/
-/************************************************/
-
-/*---------------------------------*/
-/* Values in ODBC 2.0 that are not */
-/* 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_DRIVER_HDBC                      3
-#define SQL_DRIVER_HENV                      4
-#define SQL_DRIVER_HSTMT                     5
-#define SQL_DRIVER_NAME                      6
-#define SQL_DRIVER_VER                       7
-#define SQL_ODBC_API_CONFORMANCE             9
-#define SQL_ODBC_VER                        10
-#define SQL_ROW_UPDATES                     11
-#define SQL_ODBC_SAG_CLI_CONFORMANCE        12
-#define SQL_ODBC_SQL_CONFORMANCE            15
-#define SQL_PROCEDURES                      21
-#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_PROCEDURE_NAME_LEN          33
-#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
-#define SQL_OWNER_TERM                      39
-#define SQL_PROCEDURE_TERM                  40
-#define SQL_QUALIFIER_NAME_SEPARATOR        41
-#define SQL_QUALIFIER_TERM                  42
-#define SQL_SCROLL_OPTIONS                  44
-#define SQL_TABLE_TERM                      45
-#define SQL_CONVERT_FUNCTIONS               48
-#define SQL_NUMERIC_FUNCTIONS               49
-#define SQL_STRING_FUNCTIONS                50
-#define SQL_SYSTEM_FUNCTIONS                51
-#define SQL_TIMEDATE_FUNCTIONS              52
-#define SQL_CONVERT_BIGINT                  53
-#define SQL_CONVERT_BINARY                  54
-#define SQL_CONVERT_BIT                     55
-#define SQL_CONVERT_CHAR                    56
-#define SQL_CONVERT_DATE                    57
-#define SQL_CONVERT_DECIMAL                 58
-#define SQL_CONVERT_DOUBLE                  59
-#define SQL_CONVERT_FLOAT                   60
-#define SQL_CONVERT_INTEGER                 61
-#define SQL_CONVERT_LONGVARCHAR             62
-#define SQL_CONVERT_NUMERIC                 63
-#define SQL_CONVERT_REAL                    64
-#define SQL_CONVERT_SMALLINT                65
-#define SQL_CONVERT_TIME                    66
-#define SQL_CONVERT_TIMESTAMP               67
-#define SQL_CONVERT_TINYINT                 68
-#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_CORRELATION_NAME                74
-#define SQL_NON_NULLABLE_COLUMNS            75
-#define SQL_DRIVER_HLIB                     76
-#define SQL_DRIVER_ODBC_VER                 77
-#define SQL_LOCK_TYPES                      78
-#define SQL_POS_OPERATIONS                  79
-#define SQL_POSITIONED_STATEMENTS           80
-#define SQL_BOOKMARK_PERSISTENCE            82
-#define SQL_STATIC_SENSITIVITY              83
-#define SQL_FILE_USAGE                      84
-#define SQL_COLUMN_ALIAS                    87
-#define SQL_GROUP_BY                        88
-#define SQL_KEYWORDS                        89
-#define SQL_OWNER_USAGE                     91
-#define SQL_QUALIFIER_USAGE                 92
-#define SQL_QUOTED_IDENTIFIER_CASE          93
-#define SQL_SUBQUERIES                      95
-#define SQL_UNION                           96
-#define SQL_MAX_ROW_SIZE_INCLUDES_LONG      103
-#define SQL_MAX_CHAR_LITERAL_LEN            108
-#define SQL_TIMEDATE_ADD_INTERVALS          109
-#define SQL_TIMEDATE_DIFF_INTERVALS         110
-#define SQL_NEED_LONG_DATA_LEN              111
-#define SQL_MAX_BINARY_LITERAL_LEN          112
-#define SQL_LIKE_ESCAPE_CLAUSE              113
-#define SQL_QUALIFIER_LOCATION              114
-
-#if (ODBCVER >= 0x0201 && ODBCVER < 0x0300)
-#ifndef SQL_OJ_CAPABILITIES
-#define SQL_OJ_CAPABILITIES         65003  /* Temp value until ODBC 3.0 */
-#endif
-#endif  /* ODBCVER >= 0x0201 && ODBCVER < 0x0300 */
-
-/*----------------------------------------------*/
-/* 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.	    */
-/*----------------------------------------------*/
-
-#if (ODBCVER < 0x0300)
-#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.				 */
-/*-----------------------------------------------*/
-
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-#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_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 */
-
-#define SQL_CVT_CHAR                        0x00000001L
-#define SQL_CVT_NUMERIC                     0x00000002L
-#define SQL_CVT_DECIMAL                     0x00000004L
-#define SQL_CVT_INTEGER                     0x00000008L
-#define SQL_CVT_SMALLINT                    0x00000010L
-#define SQL_CVT_FLOAT                       0x00000020L
-#define SQL_CVT_REAL                        0x00000040L
-#define SQL_CVT_DOUBLE                      0x00000080L
-#define SQL_CVT_VARCHAR                     0x00000100L
-#define SQL_CVT_LONGVARCHAR                 0x00000200L
-#define SQL_CVT_BINARY                      0x00000400L
-#define SQL_CVT_VARBINARY                   0x00000800L
-#define SQL_CVT_BIT                         0x00001000L
-#define SQL_CVT_TINYINT                     0x00002000L
-#define SQL_CVT_BIGINT                      0x00004000L
-#define SQL_CVT_DATE                        0x00008000L
-#define SQL_CVT_TIME                        0x00010000L
-#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
-
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* SQL_CONVERT_FUNCTIONS functions */
-#define SQL_FN_CVT_CONVERT                  0x00000001L
-#if (ODBCVER >= 0x0300)
-#define SQL_FN_CVT_CAST						0x00000002L
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* SQL_STRING_FUNCTIONS functions */
-
-#define SQL_FN_STR_CONCAT                   0x00000001L
-#define SQL_FN_STR_INSERT                   0x00000002L
-#define SQL_FN_STR_LEFT                     0x00000004L
-#define SQL_FN_STR_LTRIM                    0x00000008L
-#define SQL_FN_STR_LENGTH                   0x00000010L
-#define SQL_FN_STR_LOCATE                   0x00000020L
-#define SQL_FN_STR_LCASE                    0x00000040L
-#define SQL_FN_STR_REPEAT                   0x00000080L
-#define SQL_FN_STR_REPLACE                  0x00000100L
-#define SQL_FN_STR_RIGHT                    0x00000200L
-#define SQL_FN_STR_RTRIM                    0x00000400L
-#define SQL_FN_STR_SUBSTRING                0x00000800L
-#define SQL_FN_STR_UCASE                    0x00001000L
-#define SQL_FN_STR_ASCII                    0x00002000L
-#define SQL_FN_STR_CHAR                     0x00004000L
-#define SQL_FN_STR_DIFFERENCE               0x00008000L
-#define SQL_FN_STR_LOCATE_2                 0x00010000L
-#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
-#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
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL_NUMERIC_FUNCTIONS functions */
-
-#define SQL_FN_NUM_ABS                      0x00000001L
-#define SQL_FN_NUM_ACOS                     0x00000002L
-#define SQL_FN_NUM_ASIN                     0x00000004L
-#define SQL_FN_NUM_ATAN                     0x00000008L
-#define SQL_FN_NUM_ATAN2                    0x00000010L
-#define SQL_FN_NUM_CEILING                  0x00000020L
-#define SQL_FN_NUM_COS                      0x00000040L
-#define SQL_FN_NUM_COT                      0x00000080L
-#define SQL_FN_NUM_EXP                      0x00000100L
-#define SQL_FN_NUM_FLOOR                    0x00000200L
-#define SQL_FN_NUM_LOG                      0x00000400L
-#define SQL_FN_NUM_MOD                      0x00000800L
-#define SQL_FN_NUM_SIGN                     0x00001000L
-#define SQL_FN_NUM_SIN                      0x00002000L
-#define SQL_FN_NUM_SQRT                     0x00004000L
-#define SQL_FN_NUM_TAN                      0x00008000L
-#define SQL_FN_NUM_PI                       0x00010000L
-#define SQL_FN_NUM_RAND                     0x00020000L
-#define SQL_FN_NUM_DEGREES                  0x00040000L
-#define SQL_FN_NUM_LOG10                    0x00080000L
-#define SQL_FN_NUM_POWER                    0x00100000L
-#define SQL_FN_NUM_RADIANS                  0x00200000L
-#define SQL_FN_NUM_ROUND                    0x00400000L
-#define SQL_FN_NUM_TRUNCATE                 0x00800000L
-
-/* 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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_TIMEDATE_FUNCTIONS functions */
-
-#define SQL_FN_TD_NOW                       0x00000001L
-#define SQL_FN_TD_CURDATE                   0x00000002L
-#define SQL_FN_TD_DAYOFMONTH                0x00000004L
-#define SQL_FN_TD_DAYOFWEEK                 0x00000008L
-#define SQL_FN_TD_DAYOFYEAR                 0x00000010L
-#define SQL_FN_TD_MONTH                     0x00000020L
-#define SQL_FN_TD_QUARTER                   0x00000040L
-#define SQL_FN_TD_WEEK                      0x00000080L
-#define SQL_FN_TD_YEAR                      0x00000100L
-#define SQL_FN_TD_CURTIME                   0x00000200L
-#define SQL_FN_TD_HOUR                      0x00000400L
-#define SQL_FN_TD_MINUTE                    0x00000800L
-#define SQL_FN_TD_SECOND                    0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD              0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF             0x00004000L
-#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
-#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
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL_SYSTEM_FUNCTIONS functions */
-
-#define SQL_FN_SYS_USERNAME                 0x00000001L
-#define SQL_FN_SYS_DBNAME                   0x00000002L
-#define SQL_FN_SYS_IFNULL                   0x00000004L
-
-/* SQL_TIMEDATE_ADD_INTERVALS and SQL_TIMEDATE_DIFF_INTERVALS functions */
-
-#define SQL_FN_TSI_FRAC_SECOND              0x00000001L
-#define SQL_FN_TSI_SECOND                   0x00000002L
-#define SQL_FN_TSI_MINUTE                   0x00000004L
-#define SQL_FN_TSI_HOUR                     0x00000008L
-#define SQL_FN_TSI_DAY                      0x00000010L
-#define SQL_FN_TSI_WEEK                     0x00000020L
-#define SQL_FN_TSI_MONTH                    0x00000040L
-#define SQL_FN_TSI_QUARTER                  0x00000080L
-#define SQL_FN_TSI_YEAR                     0x00000100L
-
-/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES1,
- * SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1,
- * SQL_KEYSET_CURSOR_ATTRIBUTES1, and SQL_STATIC_CURSOR_ATTRIBUTES1
- */
-#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
-
-/* supported SQLSetPos LockType's */
-#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
-
-/* positioned updates and deletes */
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES2,
- * SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2,
- * SQL_KEYSET_CURSOR_ATTRIBUTES2, and SQL_STATIC_CURSOR_ATTRIBUTES2
- */
-#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
-
-/* 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
-
-/* 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)
-
-/* semantics of SQL_DIAG_CURSOR_ROW_COUNT */
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_ODBC_API_CONFORMANCE values */
-
-#define SQL_OAC_NONE                        0x0000
-#define SQL_OAC_LEVEL1                      0x0001
-#define SQL_OAC_LEVEL2                      0x0002
-
-/* SQL_ODBC_SAG_CLI_CONFORMANCE values */
-
-#define SQL_OSCC_NOT_COMPLIANT              0x0000
-#define SQL_OSCC_COMPLIANT                  0x0001
-
-/* SQL_ODBC_SQL_CONFORMANCE values */
-
-#define SQL_OSC_MINIMUM                     0x0000
-#define SQL_OSC_CORE                        0x0001
-#define SQL_OSC_EXTENDED                    0x0002
-
-
-/* SQL_CONCAT_NULL_BEHAVIOR values */
-
-#define SQL_CB_NULL                         0x0000
-#define SQL_CB_NON_NULL                     0x0001
-
-/* SQL_SCROLL_OPTIONS masks */
-
-#define SQL_SO_FORWARD_ONLY                 0x00000001L
-#define SQL_SO_KEYSET_DRIVEN                0x00000002L
-#define SQL_SO_DYNAMIC                      0x00000004L
-#define SQL_SO_MIXED                        0x00000008L
-#define SQL_SO_STATIC                       0x00000010L
-
-/* SQL_FETCH_DIRECTION masks */
-
-/* SQL_FETCH_RESUME is no longer supported
-#define SQL_FD_FETCH_RESUME                 0x00000040L
-*/
-#define SQL_FD_FETCH_BOOKMARK               0x00000080L
-
-/* SQL_TXN_ISOLATION_OPTION masks */
-/* SQL_TXN_VERSIONING is no longer supported
-#define SQL_TXN_VERSIONING                  0x00000010L
-*/
-
-/* SQL_CORRELATION_NAME values */
-
-#define SQL_CN_NONE                         0x0000
-#define SQL_CN_DIFFERENT                    0x0001
-#define SQL_CN_ANY                          0x0002
-
-/* SQL_NON_NULLABLE_COLUMNS values */
-
-#define SQL_NNC_NULL                        0x0000
-#define SQL_NNC_NON_NULL                    0x0001
-
-/* SQL_NULL_COLLATION values */
-
-#define SQL_NC_START                        0x0002
-#define SQL_NC_END                          0x0004
-
-/* SQL_FILE_USAGE values */
-
-#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 */
-
-
-/* SQL_GETDATA_EXTENSIONS values */
-
-#define SQL_GD_BLOCK                        0x00000004L
-#define SQL_GD_BOUND                        0x00000008L
-
-/* SQL_POSITIONED_STATEMENTS masks */
-
-#define SQL_PS_POSITIONED_DELETE            0x00000001L
-#define SQL_PS_POSITIONED_UPDATE            0x00000002L
-#define SQL_PS_SELECT_FOR_UPDATE            0x00000004L
-
-/* SQL_GROUP_BY values */
-
-#define SQL_GB_NOT_SUPPORTED                0x0000
-#define SQL_GB_GROUP_BY_EQUALS_SELECT       0x0001
-#define SQL_GB_GROUP_BY_CONTAINS_SELECT     0x0002
-#define SQL_GB_NO_RELATION                  0x0003
-#if (ODBCVER >= 0x0300)
-#define	SQL_GB_COLLATE						0x0004
-
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_OWNER_USAGE masks */
-
-#define SQL_OU_DML_STATEMENTS               0x00000001L
-#define SQL_OU_PROCEDURE_INVOCATION         0x00000002L
-#define SQL_OU_TABLE_DEFINITION             0x00000004L
-#define SQL_OU_INDEX_DEFINITION             0x00000008L
-#define SQL_OU_PRIVILEGE_DEFINITION         0x00000010L
-
-/* 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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_QUALIFIER_USAGE masks */
-
-#define SQL_QU_DML_STATEMENTS               0x00000001L
-#define SQL_QU_PROCEDURE_INVOCATION         0x00000002L
-#define SQL_QU_TABLE_DEFINITION             0x00000004L
-#define SQL_QU_INDEX_DEFINITION             0x00000008L
-#define SQL_QU_PRIVILEGE_DEFINITION         0x00000010L
-
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_SUBQUERIES masks */
-
-#define SQL_SQ_COMPARISON                   0x00000001L
-#define SQL_SQ_EXISTS                       0x00000002L
-#define SQL_SQ_IN                           0x00000004L
-#define SQL_SQ_QUANTIFIED                   0x00000008L
-#define SQL_SQ_CORRELATED_SUBQUERIES        0x00000010L
-
-/* SQL_UNION masks */
-
-#define SQL_U_UNION                         0x00000001L
-#define SQL_U_UNION_ALL                     0x00000002L
-
-/* SQL_BOOKMARK_PERSISTENCE values */
-
-#define SQL_BP_CLOSE                        0x00000001L
-#define SQL_BP_DELETE                       0x00000002L
-#define SQL_BP_DROP                         0x00000004L
-#define SQL_BP_TRANSACTION                  0x00000008L
-#define SQL_BP_UPDATE                       0x00000010L
-#define SQL_BP_OTHER_HSTMT                  0x00000020L
-#define SQL_BP_SCROLL                       0x00000040L
-
-/* SQL_STATIC_SENSITIVITY values */
-
-#define SQL_SS_ADDITIONS                    0x00000001L
-#define SQL_SS_DELETIONS                    0x00000002L
-#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
-
-/* SQL_LOCK_TYPES masks */
-
-#define SQL_LCK_NO_CHANGE                   0x00000001L
-#define SQL_LCK_EXCLUSIVE                   0x00000002L
-#define SQL_LCK_UNLOCK                      0x00000004L
-
-/* SQL_POS_OPERATIONS masks */
-
-#define SQL_POS_POSITION                    0x00000001L
-#define SQL_POS_REFRESH                     0x00000002L
-#define SQL_POS_UPDATE                      0x00000004L
-#define SQL_POS_DELETE                      0x00000008L
-#define SQL_POS_ADD                         0x00000010L
-
-/* SQL_QUALIFIER_LOCATION values */
-
-#define SQL_QL_START                        0x0001
-#define SQL_QL_END                          0x0002
-
-/* Here start return values for ODBC 3.0 SQLGetInfo */
-
-#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
-
-/* 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
-
-/* 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
-
-/* SQL_CATALOG_LOCATION values */
-#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
-
-/* 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
-
-/* Values for SQL_PARAM_ARRAY_ROW_COUNTS getinfo */
-#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
-
-/* 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)
-
-/* 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
-
-/* Bitmasks for SQL_ASYNC_MODE */
-
-#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
-
-
-/* SQL_CREATE_SCHEMA bitmasks */
-#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
-
-/* 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
-
-/* SQL_CREATE_CHARACTER_SET bitmasks */
-#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
-
-/* 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
-
-/* 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
-
-/* SQL_DDL_INDEX bitmasks */
-#define SQL_DI_CREATE_INDEX						0x00000001L
-#define SQL_DI_DROP_INDEX						0x00000002L
-
-/* SQL_DROP_COLLATION bitmasks */
-#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
-
-/* SQL_DROP_SCHEMA bitmasks */
-#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
-
-/* SQL_DROP_ASSERTION bitmasks */
-#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
-
-/* SQL_DROP_TRANSLATION bitmasks */
-#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
-
-/* SQL_INSERT_STATEMENT bitmasks */
-#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
-
-/* 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
-
-/* 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	
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* 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
-
-/* SQL_STANDARD_CLI_CONFORMANCE bitmasks */
-#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
-
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_DTC_TRANSITION_COST bitmasks */
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* Defines for SQLSetPos */
-#define SQL_ENTIRE_ROWSET            0
-
-/* Operations in SQLSetPos */
-#define SQL_POSITION                 0               /*      1.0 FALSE */
-#define SQL_REFRESH                  1               /*      1.0 TRUE */
-#define SQL_UPDATE                   2
-#define SQL_DELETE                   3
-
-/* Operations in SQLBulkOperations */
-#define SQL_ADD                      4
-#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
-
-#endif /*  ODBCVER >= 0x0300 */
-
-/* Lock options in SQLSetPos */
-#define SQL_LOCK_NO_CHANGE           0               /*      1.0 FALSE */
-#define SQL_LOCK_EXCLUSIVE           1               /*      1.0 TRUE */
-#define SQL_LOCK_UNLOCK              2
-
-#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)
-#define SQL_LOCK_RECORD(hstmt,irow,fLock) SQLSetPos(hstmt,irow,SQL_POSITION,fLock)
-#define SQL_REFRESH_RECORD(hstmt,irow,fLock) SQLSetPos(hstmt,irow,SQL_REFRESH,fLock)
-#define SQL_UPDATE_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
-#define SQL_DELETE_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_DELETE,SQL_LOCK_NO_CHANGE)
-#define SQL_ADD_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_ADD,SQL_LOCK_NO_CHANGE)
-
-/* Column types and scopes in SQLSpecialColumns.  */
-#define SQL_BEST_ROWID                  1
-#define SQL_ROWVER                      2
-
-/* Defines for SQLSpecialColumns (returned in the result set)
-   SQL_PC_UNKNOWN and SQL_PC_PSEUDO are defined in sql.h */
-#define SQL_PC_NOT_PSEUDO               1
-
-/* Defines for SQLStatistics */
-#define SQL_QUICK                       0
-#define SQL_ENSURE                      1
-
-/* Defines for SQLStatistics (returned in the result set)
-   SQL_INDEX_CLUSTERED, SQL_INDEX_HASHED, and SQL_INDEX_OTHER are
-   defined in sql.h */
-#define SQL_TABLE_STAT                  0
-
-
-/* Defines for SQLTables */
-#if (ODBCVER >= 0x0300)
-#define SQL_ALL_CATALOGS				"%"
-#define SQL_ALL_SCHEMAS					"%"
-#define SQL_ALL_TABLE_TYPES				"%"
-#endif  /* ODBCVER >= 0x0300 */
-
-/* Options for SQLDriverConnect */
-#define SQL_DRIVER_NOPROMPT             0
-#define SQL_DRIVER_COMPLETE             1
-#define SQL_DRIVER_PROMPT               2
-#define SQL_DRIVER_COMPLETE_REQUIRED    3
-
-SQLRETURN SQL_API SQLDriverConnect(
-    SQLHDBC            hdbc,
-    SQLHWND            hwnd,
-    SQLCHAR 		  *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLCHAR           *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT 	  *pcbConnStrOut,
-    SQLUSMALLINT       fDriverCompletion);
-
-/* Level 2 Functions                             */
-
-/* SQLExtendedFetch "fFetchType" values */
-#define SQL_FETCH_BOOKMARK               8
-
-/* SQLExtendedFetch "rgfRowStatus" element values */
-#define SQL_ROW_SUCCESS                  0
-#define SQL_ROW_DELETED                  1
-#define SQL_ROW_UPDATED                  2
-#define SQL_ROW_NOROW                    3
-#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
-#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
-#endif  /* ODBCVER >= 0x0300 */
-
-/* Defines for SQLForeignKeys (UPDATE_RULE and DELETE_RULE) */
-#define SQL_CASCADE                      0
-#define SQL_RESTRICT                     1
-#define SQL_SET_NULL                     2
-#if (ODBCVER >= 0x0250)
-#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
-
-#endif  /* ODBCVER >= 0x0300 */
-
-/* Defines for SQLBindParameter and
-                           SQLProcedureColumns (returned in the result set) */
-#define SQL_PARAM_TYPE_UNKNOWN           0
-#define SQL_PARAM_INPUT                  1
-#define SQL_PARAM_INPUT_OUTPUT           2
-#define SQL_RESULT_COL                   3
-#define SQL_PARAM_OUTPUT                 4
-#define SQL_RETURN_VALUE                 5
-
-/* Defines for SQLProcedures (returned in the result set) */
-#define SQL_PT_UNKNOWN                   0
-#define SQL_PT_PROCEDURE                 1
-#define SQL_PT_FUNCTION                  2
-
-/*      This define is too large for RC */
-#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
-"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
-"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
-"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-"COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
-"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
-"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
-"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
-"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
-"DISTINCT,DOMAIN,DOUBLE,DROP,"\
-"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
-"EXISTS,EXTERNAL,EXTRACT,"\
-"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
-"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
-"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
-"INPUT,INSENSITIVE,INSERT,INT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
-"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
-"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,"\
-"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
-"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
-"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
-"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
-"READ,REAL,REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS"\
-"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SESSION,SESSION_USER,SET,SIZE,"\
-"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
-"SUBSTRING,SUM,SYSTEM_USER,"\
-"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
-"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
-"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
-"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
-"YEAR,ZONE"
-
-SQLRETURN SQL_API SQLBrowseConnect(
-    SQLHDBC            hdbc,
-    SQLCHAR 		  *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLCHAR 		  *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT       *pcbConnStrOut);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN	SQL_API SQLBulkOperations(
-    SQLHSTMT			StatementHandle,
-    SQLSMALLINT			Operation);
-#endif  /* ODBCVER >= 0x0300 */
-
-SQLRETURN SQL_API SQLColAttributes(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       icol,
-    SQLUSMALLINT       fDescType,
-    SQLPOINTER         rgbDesc,
-    SQLSMALLINT        cbDescMax,
-    SQLSMALLINT 	  *pcbDesc,
-    SQLLEN 		      *pfDesc);
-
-SQLRETURN SQL_API SQLColumnPrivileges(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLCHAR 		  *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLDescribeParam(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       ipar,
-    SQLSMALLINT 	  *pfSqlType,
-    SQLULEN 	      *pcbParamDef,
-    SQLSMALLINT 	  *pibScale,
-    SQLSMALLINT 	  *pfNullable);
-
-SQLRETURN SQL_API SQLExtendedFetch(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fFetchType,
-    SQLLEN             irow,
-    SQLULEN 	  	   *pcrow,
-    SQLUSMALLINT 	   *rgfRowStatus);
-
-SQLRETURN SQL_API SQLForeignKeys(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szPkCatalogName,
-    SQLSMALLINT        cbPkCatalogName,
-    SQLCHAR 		  *szPkSchemaName,
-    SQLSMALLINT        cbPkSchemaName,
-    SQLCHAR 		  *szPkTableName,
-    SQLSMALLINT        cbPkTableName,
-    SQLCHAR 		  *szFkCatalogName,
-    SQLSMALLINT        cbFkCatalogName,
-    SQLCHAR 		  *szFkSchemaName,
-    SQLSMALLINT        cbFkSchemaName,
-    SQLCHAR 		  *szFkTableName,
-    SQLSMALLINT        cbFkTableName);
-
-SQLRETURN SQL_API SQLMoreResults(
-    SQLHSTMT           hstmt);
-
-SQLRETURN SQL_API SQLNativeSql(
-    SQLHDBC            hdbc,
-    SQLCHAR 		  *szSqlStrIn,
-    SQLINTEGER         cbSqlStrIn,
-    SQLCHAR 		  *szSqlStr,
-    SQLINTEGER         cbSqlStrMax,
-    SQLINTEGER 		  *pcbSqlStr);
-
-SQLRETURN SQL_API SQLNumParams(
-    SQLHSTMT           hstmt,
-    SQLSMALLINT 	  *pcpar);
-
-SQLRETURN SQL_API SQLParamOptions(
-    SQLHSTMT           hstmt,
-    SQLULEN        	   crow,
-    SQLULEN 	  	   *pirow);
-
-SQLRETURN SQL_API SQLPrimaryKeys(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLProcedureColumns(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szProcName,
-    SQLSMALLINT        cbProcName,
-    SQLCHAR 		  *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLProcedures(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szProcName,
-    SQLSMALLINT        cbProcName);
-
-SQLRETURN SQL_API SQLSetPos(
-    SQLHSTMT           hstmt,
-    SQLSETPOSIROW      irow,
-    SQLUSMALLINT       fOption,
-    SQLUSMALLINT       fLock);
-
-SQLRETURN SQL_API SQLTablePrivileges(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLDrivers(
-    SQLHENV            henv,
-    SQLUSMALLINT       fDirection,
-    SQLCHAR 		  *szDriverDesc,
-    SQLSMALLINT        cbDriverDescMax,
-    SQLSMALLINT 	  *pcbDriverDesc,
-    SQLCHAR 		  *szDriverAttributes,
-    SQLSMALLINT        cbDrvrAttrMax,
-    SQLSMALLINT 	  *pcbDrvrAttr);
-
-SQLRETURN SQL_API SQLBindParameter(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       ipar,
-    SQLSMALLINT        fParamType,
-    SQLSMALLINT        fCType,
-    SQLSMALLINT        fSqlType,
-    SQLULEN            cbColDef,
-    SQLSMALLINT        ibScale,
-    SQLPOINTER         rgbValue,
-    SQLLEN             cbValueMax,
-    SQLLEN 		      *pcbValue);
-
-/*---------------------------------------------------------*/
-/* SQLAllocHandleStd is implemented to make SQLAllocHandle */
-/* 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
-#endif /* ODBC_STD */
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN SQL_API SQLAllocHandleStd(
-    SQLSMALLINT		fHandleType,
-    SQLHANDLE		hInput,
-    SQLHANDLE	   *phOutput);
-#endif
-
-/*      Deprecated defines from prior versions of ODBC */
-#define SQL_DATABASE_NAME               16    /* Use SQLGetConnectOption/SQL_CURRENT_QUALIFIER */
-#define SQL_FD_FETCH_PREV               SQL_FD_FETCH_PRIOR
-#define SQL_FETCH_PREV                  SQL_FETCH_PRIOR
-#define SQL_CONCUR_TIMESTAMP            SQL_CONCUR_ROWVER
-#define SQL_SCCO_OPT_TIMESTAMP          SQL_SCCO_OPT_ROWVER
-#define SQL_CC_DELETE                   SQL_CB_DELETE
-#define SQL_CR_DELETE                   SQL_CB_DELETE
-#define SQL_CC_CLOSE                    SQL_CB_CLOSE
-#define SQL_CR_CLOSE                    SQL_CB_CLOSE
-#define SQL_CC_PRESERVE                 SQL_CB_PRESERVE
-#define SQL_CR_PRESERVE                 SQL_CB_PRESERVE
-/* SQL_FETCH_RESUME is not supported by 2.0+ drivers
-#define SQL_FETCH_RESUME                7
-*/
-#define SQL_SCROLL_FORWARD_ONLY         0L    /*-SQL_CURSOR_FORWARD_ONLY */
-#define SQL_SCROLL_KEYSET_DRIVEN        (-1L) /*-SQL_CURSOR_KEYSET_DRIVEN */
-#define SQL_SCROLL_DYNAMIC              (-2L) /*-SQL_CURSOR_DYNAMIC */
-#define SQL_SCROLL_STATIC               (-3L) /*-SQL_CURSOR_STATIC */
-
-/*      Deprecated functions from prior versions of ODBC */
-SQLRETURN SQL_API SQLSetScrollOptions(    /*      Use SQLSetStmtOptions */
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fConcurrency,
-    SQLLEN             crowKeyset,
-    SQLUSMALLINT       crowRowset);
-
-/*!
- * \defgroup    Tracing.
- *
- *              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 
- *              - 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 
- *              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 
- *              driver using the 'trace' helper library.
- *
- *              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 
- *              portable. On MS platforms - this compliments traditional tracing (mostly
- *              just used by the Driver Manager).
- *
- * \sa          trace
- *              odbctxt
- *              odbctrac
- */
-/*@{*/
-#define	TRACE_VERSION 1000                                  /*!< Version of trace API                               */
-#ifdef UNICODE
-RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); 	/*!< open a trace log file				                */
-#else
-RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); 	/*!< open a trace log file				                */
-#endif
-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			                */
-#else
-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	
-
-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 */
-
-typedef struct tagODBC_VS_ARGS {
-#ifdef GUID_DEFINED
-    const GUID	*pguidEvent;	/* the GUID for event */
-#else
-    const void	*pguidEvent;	/* the GUID for event */
-#endif
-    DWORD	dwFlags;		/* flags for the call */
-    union {
-        WCHAR	*wszArg;	
-        CHAR	*szArg;
-    }u1;
-    union {
-        WCHAR	*wszCorrelation;
-        CHAR	*szCorrelation;
-    }u2;				
-    RETCODE	RetCode;
-} ODBC_VS_ARGS, *PODBC_VS_ARGS;
-
-VOID	FireVSDebugEvent(PODBC_VS_ARGS);
-/*@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * connection pooling retry times
- */
-
-int ODBCSetTryWaitValue ( DWORD dwValue );
-#ifdef __cplusplus
-DWORD ODBCGetTryWaitValue ( );
-#else
-DWORD ODBCGetTryWaitValue ( VOID );
-#endif
-
-#ifndef __SQLUCODE_H
-#include "odbc/sqlucode.h"
-#endif
-
-#endif
diff --git a/unixODBC/inc/sqltypes.h b/unixODBC/inc/sqltypes.h
deleted file mode 100644
index 5bee0d6..0000000
--- a/unixODBC/inc/sqltypes.h
+++ /dev/null
@@ -1,474 +0,0 @@
-/*************************************************************
- * sqltypes.h
- *
- * This is the lowest level include in unixODBC. It defines
- * the basic types required by unixODBC and is heavily based
- * upon the MS include of the same name (it has to be for
- * binary compatability between drivers developed under different
- * packages).
- *
- * You can include this file directly but it is almost always
- * included indirectly, by including.. for example sqlext.h
- *
- * This include makes no effort to be usefull on any platforms other
- * than Linux (with some exceptions for UNIX in general).
- *
- * !!!DO NOT CONTAMINATE THIS FILE WITH NON-Linux CODE!!!
- *
- *************************************************************/
-#ifndef __SQLTYPES_H
-#define __SQLTYPES_H
-
-/****************************
- * default to the 3.51 definitions. should define ODBCVER before here if you want an older set of defines
- ***************************/
-#ifndef ODBCVER
-#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  
-/* 
- * 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.
- */
-#include <wchar.h>
-#endif
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef SIZEOF_LONG_INT
-# define SIZEOF_LONG_INT SAL_TYPES_SIZEOFLONG
-#endif
-#ifndef ODBCINT64
-# define ODBCINT64 sal_Int64
-#endif
-#ifndef UODBCINT64
-# define UODBCINT64 sal_uInt64
-#endif
-
-/*
- * this is defined by configure, but will not be on a normal application build
- * the install creates a unixodbc_conf.h file that contains the current build settings
- */
-
-#ifndef SIZEOF_LONG_INT
-#include <unixodbc_conf.h>
-#endif
-
-#ifndef SIZEOF_LONG_INT
-#error "Needs to know how big a long int is to continue!!!"
-#endif
-
-/****************************
- * These make up for having no windows.h
- ***************************/
-#ifndef ALLREADY_HAVE_WINDOWS_TYPE
-
-#define FAR
-#define CALLBACK
-#define SQL_API
-#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 
- *  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.
- */
-#ifdef SQL_WCHART_CONVERT
-typedef wchar_t             TCHAR;
-#else
-typedef signed short        TCHAR;
-#endif
-
-#else
-typedef char				TCHAR;
-#endif
-
-#ifndef DONT_TD_VOID
-typedef void				VOID;
-#endif
-
-typedef unsigned short		WORD;
-#if (SIZEOF_LONG_INT == 4)
-typedef unsigned long		DWORD;
-#else
-typedef unsigned int		DWORD;
-#endif
-typedef unsigned char		BYTE;
-
-#ifdef SQL_WCHART_CONVERT
-typedef wchar_t             WCHAR;
-#else
-typedef unsigned short 		WCHAR;
-#endif
-
-typedef WCHAR* 	            LPWSTR;
-typedef const char*         LPCSTR;
-typedef const WCHAR*        LPCWSTR;
-typedef TCHAR*              LPTSTR;
-typedef char*               LPSTR;
-typedef DWORD*           	LPDWORD;
-
-typedef void*               HINSTANCE;
-
-#endif
-
-
-/****************************
- * standard SQL* data types. use these as much as possible when using ODBC calls/vars
- ***************************/
-typedef unsigned char   SQLCHAR;
-
-#if (ODBCVER >= 0x0300)
-typedef unsigned char   SQLDATE;
-typedef unsigned char   SQLDECIMAL;
-typedef double          SQLDOUBLE;
-typedef double          SQLFLOAT;
-#endif
-
-/*
- * can't use a long it fails on 64 platforms
- */
-
-/*
- * 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)
-#ifdef BUILD_LEGACY_64_BIT_MODE
-typedef int             SQLINTEGER;
-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;
- typedef SQLULEN         SQLROWSETSIZE;
- typedef SQLULEN         SQLTRANSID;
- typedef SQLLEN          SQLROWOFFSET;
-*/
-#else
-typedef int             SQLINTEGER;
-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         SQLROWCOUNT;
-typedef SQLULEN         SQLROWSETSIZE;
-typedef SQLULEN         SQLTRANSID;
-typedef SQLLEN          SQLROWOFFSET;
-#endif
-#else
-typedef long            SQLINTEGER;
-typedef unsigned long   SQLUINTEGER;
-#define SQLLEN          SQLINTEGER
-#define SQLULEN         SQLUINTEGER
-#define SQLSETPOSIROW   SQLUSMALLINT
-typedef SQLULEN         SQLROWCOUNT;
-typedef SQLULEN         SQLROWSETSIZE;
-typedef SQLULEN         SQLTRANSID;
-typedef SQLLEN          SQLROWOFFSET;
-#endif
-
-#if (ODBCVER >= 0x0300)
-typedef unsigned char   SQLNUMERIC;
-#endif
-
-typedef void *          SQLPOINTER;
-
-#if (ODBCVER >= 0x0300)
-typedef float           SQLREAL;
-#endif
-
-typedef signed short int   SQLSMALLINT;
-typedef unsigned short  SQLUSMALLINT;
-
-#if (ODBCVER >= 0x0300)
-typedef unsigned char   SQLTIME;
-typedef unsigned char   SQLTIMESTAMP;
-typedef unsigned char   SQLVARCHAR;
-#endif
-
-typedef SQLSMALLINT     SQLRETURN;
-
-#if (ODBCVER >= 0x0300)
-typedef void * 			        SQLHANDLE; 
-typedef SQLHANDLE               SQLHENV;
-typedef SQLHANDLE               SQLHDBC;
-typedef SQLHANDLE               SQLHSTMT;
-typedef SQLHANDLE               SQLHDESC;
-#else
-typedef void *                  SQLHENV;
-typedef void *                  SQLHDBC;
-typedef void *                  SQLHSTMT;
-/*
- * some things like PHP won't build without this
- */
-typedef void * 			        SQLHANDLE; 
-#endif
-
-/****************************
- * These are cast into the actual struct that is being passed around. The
- * DriverManager knows what its structs look like and the Driver knows about its
- * structs... the app knows nothing about them... just void*
- * These are deprecated in favour of SQLHENV, SQLHDBC, SQLHSTMT
- ***************************/
-
-#if (ODBCVER >= 0x0300)
-typedef SQLHANDLE          		HENV;
-typedef SQLHANDLE          		HDBC;
-typedef SQLHANDLE          		HSTMT;
-#else
-typedef void *          	    HENV;
-typedef void *          	    HDBC;
-typedef void *          	    HSTMT;
-#endif
-
-
-/****************************
- * more basic data types to augment what windows.h provides
- ***************************/
-#ifndef ALLREADY_HAVE_WINDOWS_TYPE
-
-typedef unsigned char           UCHAR;
-typedef signed char             SCHAR;
-typedef SCHAR                   SQLSCHAR;
-#if (SIZEOF_LONG_INT == 4)
-typedef long int                SDWORD;
-typedef unsigned long int       UDWORD;
-#else
-typedef int                     SDWORD;
-typedef unsigned int            UDWORD;
-#endif
-typedef signed short int        SWORD;
-typedef unsigned short int      UWORD;
-typedef unsigned int            UINT;
-typedef signed long             SLONG;
-typedef signed short            SSHORT;
-typedef unsigned long           ULONG;
-typedef unsigned short          USHORT;
-typedef double                  SDOUBLE;
-typedef double            		LDOUBLE;
-typedef float                   SFLOAT;
-typedef void*              		PTR;
-typedef signed short            RETCODE;
-typedef void*                   SQLHWND;
-
-#endif
-
-/****************************
- * standard structs for working with date/times
- ***************************/
-#ifndef	__SQLDATE
-#define	__SQLDATE
-typedef struct tagDATE_STRUCT
-{
-        SQLSMALLINT    year;
-        SQLUSMALLINT   month;
-        SQLUSMALLINT   day;
-} DATE_STRUCT;
-
-#if (ODBCVER >= 0x0300)
-typedef DATE_STRUCT	SQL_DATE_STRUCT;
-#endif
-
-typedef struct tagTIME_STRUCT
-{
-        SQLUSMALLINT   hour;
-        SQLUSMALLINT   minute;
-        SQLUSMALLINT   second;
-} TIME_STRUCT;
-
-#if (ODBCVER >= 0x0300)
-typedef TIME_STRUCT	SQL_TIME_STRUCT;
-#endif
-
-typedef struct tagTIMESTAMP_STRUCT
-{
-        SQLSMALLINT    year;
-        SQLUSMALLINT   month;
-        SQLUSMALLINT   day;
-        SQLUSMALLINT   hour;
-        SQLUSMALLINT   minute;
-        SQLUSMALLINT   second;
-        SQLUINTEGER    fraction;
-} TIMESTAMP_STRUCT;
-
-#if (ODBCVER >= 0x0300)
-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
-} SQLINTERVAL;
-
-#endif
-
-#if (ODBCVER >= 0x0300)
-typedef struct tagSQL_YEAR_MONTH
-{
-        SQLUINTEGER		year;
-        SQLUINTEGER		month;
-} SQL_YEAR_MONTH_STRUCT;
-
-typedef struct tagSQL_DAY_SECOND
-{
-        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;
-    union {
-        SQL_YEAR_MONTH_STRUCT		year_month;
-        SQL_DAY_SECOND_STRUCT		day_second;
-    } intval;
-
-} SQL_INTERVAL_STRUCT;
-
-#endif
-
-#endif
-
-/****************************
- *
- ***************************/
-#ifndef ODBCINT64
-# if (ODBCVER >= 0x0300)
-# if (SIZEOF_LONG_INT == 8)
-#   define ODBCINT64	    long
-#   define UODBCINT64	unsigned long
-# else
-#  ifdef HAVE_LONG_LONG
-#   define ODBCINT64	    long long
-#   define UODBCINT64	unsigned long long
-#  else
-/*
- * may fail in some cases, but what else can we do ?
- */
-struct __bigint_struct
-{
-    int             hiword;
-    unsigned int    loword;
-};
-struct __bigint_struct_u
-{
-    unsigned int    hiword;
-    unsigned int    loword;
-};
-#   define ODBCINT64	    struct __bigint_struct
-#   define UODBCINT64	struct __bigint_struct_u
-#  endif
-# endif
-#endif
-#endif
-
-#ifdef ODBCINT64
-typedef ODBCINT64	SQLBIGINT;
-#endif
-#ifdef UODBCINT64
-typedef UODBCINT64	SQLUBIGINT;
-#endif
-
-
-/****************************
- * cursor and bookmark
- ***************************/
-#if (ODBCVER >= 0x0300)
-#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];
-} SQL_NUMERIC_STRUCT;
-#endif
-
-#if (ODBCVER >= 0x0350)
-#ifdef GUID_DEFINED
-#ifndef ALLREADY_HAVE_WINDOWS_TYPE
-typedef GUID	SQLGUID;
-#else
-typedef struct  tagSQLGUID
-{
-    DWORD Data1;
-    WORD Data2;
-    WORD Data3;
-    BYTE Data4[ 8 ];
-} SQLGUID;
-#endif
-#else
-typedef struct  tagSQLGUID
-{
-    DWORD Data1;
-    WORD Data2;
-    WORD Data3;
-    BYTE Data4[ 8 ];
-} SQLGUID;
-#endif
-#endif
-
-typedef SQLULEN         BOOKMARK;
-
-typedef  WCHAR         SQLWCHAR;
-
-#ifdef UNICODE
-typedef SQLWCHAR        SQLTCHAR;
-#else
-typedef SQLCHAR         SQLTCHAR;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-
diff --git a/unixODBC/inc/sqlucode.h b/unixODBC/inc/sqlucode.h
deleted file mode 100644
index 14ea0b4..0000000
--- a/unixODBC/inc/sqlucode.h
+++ /dev/null
@@ -1,789 +0,0 @@
-/**************************************************
- * sqlucode.h
- *
- * These should be consistent with the MS version.
- *
- **************************************************/
-#ifndef __SQLUCODE_H
-#define __SQLUCODE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#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
-#else
-#define SQL_C_TCHAR		SQL_C_CHAR
-#endif 
-
-#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);	
-
-SQLRETURN SQL_API SQLColAttributesW(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       icol,
-    SQLUSMALLINT       fDescType,
-    SQLPOINTER         rgbDesc,
-    SQLSMALLINT        cbDescMax,
-    SQLSMALLINT        *pcbDesc,
-    SQLLEN             *pfDesc);
-
-SQLRETURN SQL_API SQLConnectW(
-    SQLHDBC            hdbc,
-    SQLWCHAR        *szDSN,
-    SQLSMALLINT        cbDSN,
-    SQLWCHAR        *szUID,
-    SQLSMALLINT        cbUID,
-    SQLWCHAR        *szAuthStr,
-    SQLSMALLINT        cbAuthStr);
-
-
-SQLRETURN SQL_API SQLDescribeColW(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       icol,
-    SQLWCHAR        *szColName,
-    SQLSMALLINT        cbColNameMax,
-    SQLSMALLINT    *pcbColName,
-    SQLSMALLINT    *pfSqlType,
-    SQLULEN       *pcbColDef,
-    SQLSMALLINT    *pibScale,
-    SQLSMALLINT    *pfNullable);
-
-
-SQLRETURN SQL_API SQLErrorW(
-    SQLHENV            henv,
-    SQLHDBC            hdbc,
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szSqlState,
-    SQLINTEGER     *pfNativeError,
-    SQLWCHAR        *szErrorMsg,
-    SQLSMALLINT        cbErrorMsgMax,
-    SQLSMALLINT    *pcbErrorMsg);
-
-SQLRETURN SQL_API SQLExecDirectW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szSqlStr,
-    SQLINTEGER         cbSqlStr);
-
-SQLRETURN SQL_API SQLGetConnectAttrW(
-    SQLHDBC            hdbc,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER     *pcbValue);
-
-SQLRETURN SQL_API SQLGetCursorNameW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCursor,
-    SQLSMALLINT        cbCursorMax,
-    SQLSMALLINT    *pcbCursor);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLSetDescFieldW(SQLHDESC DescriptorHandle,
-                                      SQLSMALLINT RecNumber, 
-                                   SQLSMALLINT FieldIdentifier,
-                                      SQLPOINTER Value, 
-                                   SQLINTEGER BufferLength);
-
-
-
-SQLRETURN SQL_API SQLGetDescFieldW(
-    SQLHDESC           hdesc,
-    SQLSMALLINT        iRecord,
-    SQLSMALLINT        iField,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER		   cbValueMax,
-    SQLINTEGER     *pcbValue);
-
-SQLRETURN SQL_API SQLGetDescRecW(
-    SQLHDESC           hdesc,
-    SQLSMALLINT        iRecord,
-    SQLWCHAR        *szName,
-    SQLSMALLINT        cbNameMax,
-    SQLSMALLINT    *pcbName,
-    SQLSMALLINT    *pfType,
-    SQLSMALLINT    *pfSubType,
-    SQLLEN         *pLength,
-    SQLSMALLINT    *pPrecision, 
-    SQLSMALLINT    *pScale,
-    SQLSMALLINT    *pNullable);
-
-SQLRETURN SQL_API SQLGetDiagFieldW(
-    SQLSMALLINT        fHandleType,
-    SQLHANDLE          handle,
-    SQLSMALLINT        iRecord,
-    SQLSMALLINT        fDiagField,
-    SQLPOINTER         rgbDiagInfo,
-    SQLSMALLINT        cbDiagInfoMax,
-    SQLSMALLINT    *pcbDiagInfo);
-
-SQLRETURN SQL_API SQLGetDiagRecW(
-    SQLSMALLINT        fHandleType,
-    SQLHANDLE          handle,
-    SQLSMALLINT        iRecord,
-    SQLWCHAR        *szSqlState,
-    SQLINTEGER     *pfNativeError,
-    SQLWCHAR        *szErrorMsg,
-    SQLSMALLINT        cbErrorMsgMax,
-    SQLSMALLINT    *pcbErrorMsg);
-
-
-#endif
-
-
-SQLRETURN SQL_API SQLPrepareW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szSqlStr,
-    SQLINTEGER         cbSqlStr);
-
-SQLRETURN SQL_API SQLSetConnectAttrW(
-    SQLHDBC            hdbc,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValue);
-
-SQLRETURN SQL_API SQLSetCursorNameW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCursor,
-    SQLSMALLINT        cbCursor);
-
-
-
-    
-
-
-
-SQLRETURN SQL_API SQLColumnsW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLWCHAR        *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLGetConnectOptionW(
-    SQLHDBC            hdbc,
-    SQLUSMALLINT       fOption,
-    SQLPOINTER         pvParam);
-
-
-
-SQLRETURN SQL_API SQLGetInfoW(
-    SQLHDBC            hdbc,
-    SQLUSMALLINT       fInfoType,
-    SQLPOINTER         rgbInfoValue,
-    SQLSMALLINT        cbInfoValueMax,
-    SQLSMALLINT    *pcbInfoValue);
-
-SQLRETURN SQL_API	SQLGetTypeInfoW(
-    SQLHSTMT			StatementHandle,
-    SQLSMALLINT			DataType);
-
-
-SQLRETURN SQL_API SQLSetConnectOptionW(
-    SQLHDBC            hdbc,
-    SQLUSMALLINT       fOption,
-    SQLULEN            vParam);
-
-
-SQLRETURN SQL_API SQLSpecialColumnsW(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fColType,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLUSMALLINT       fScope,
-    SQLUSMALLINT       fNullable);
-
-SQLRETURN SQL_API SQLStatisticsW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLUSMALLINT       fUnique,
-    SQLUSMALLINT       fAccuracy);
-
-SQLRETURN SQL_API SQLTablesW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLWCHAR        *szTableType,
-    SQLSMALLINT        cbTableType);
-
-
-
-SQLRETURN SQL_API SQLDataSourcesW(
-    SQLHENV            henv,
-    SQLUSMALLINT       fDirection,
-    SQLWCHAR        *szDSN,
-    SQLSMALLINT        cbDSNMax,
-    SQLSMALLINT    *pcbDSN,
-    SQLWCHAR        *szDescription,
-    SQLSMALLINT        cbDescriptionMax,
-    SQLSMALLINT    *pcbDescription);
-
-
-
-
-SQLRETURN SQL_API SQLDriverConnectW(
-    SQLHDBC            hdbc,
-    SQLHWND            hwnd,
-    SQLWCHAR        *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLWCHAR        *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT    *pcbConnStrOut,
-    SQLUSMALLINT       fDriverCompletion);
-
-
-SQLRETURN SQL_API SQLBrowseConnectW(
-    SQLHDBC            hdbc,
-    SQLWCHAR        *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLWCHAR        *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT    *pcbConnStrOut);
-
-SQLRETURN SQL_API SQLColumnPrivilegesW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLWCHAR        *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLGetStmtAttrW(
-    SQLHSTMT           hstmt,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER     *pcbValue);
-
-SQLRETURN SQL_API SQLSetStmtAttrW(
-    SQLHSTMT           hstmt,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax);
-
-SQLRETURN SQL_API SQLForeignKeysW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szPkCatalogName,
-    SQLSMALLINT        cbPkCatalogName,
-    SQLWCHAR        *szPkSchemaName,
-    SQLSMALLINT        cbPkSchemaName,
-    SQLWCHAR        *szPkTableName,
-    SQLSMALLINT        cbPkTableName,
-    SQLWCHAR        *szFkCatalogName,
-    SQLSMALLINT        cbFkCatalogName,
-    SQLWCHAR        *szFkSchemaName,
-    SQLSMALLINT        cbFkSchemaName,
-    SQLWCHAR        *szFkTableName,
-    SQLSMALLINT        cbFkTableName);
-
-
-SQLRETURN SQL_API SQLNativeSqlW(
-    SQLHDBC            hdbc,
-    SQLWCHAR        *szSqlStrIn,
-    SQLINTEGER         cbSqlStrIn,
-    SQLWCHAR        *szSqlStr,
-    SQLINTEGER         cbSqlStrMax,
-    SQLINTEGER     *pcbSqlStr);
-
-
-SQLRETURN SQL_API SQLPrimaryKeysW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLProcedureColumnsW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szProcName,
-    SQLSMALLINT        cbProcName,
-    SQLWCHAR        *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLProceduresW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szProcName,
-    SQLSMALLINT        cbProcName);
-
-
-SQLRETURN SQL_API SQLTablePrivilegesW(
-    SQLHSTMT           hstmt,
-    SQLWCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLWCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLWCHAR        *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLDriversW(
-    SQLHENV            henv,
-    SQLUSMALLINT       fDirection,
-    SQLWCHAR        *szDriverDesc,
-    SQLSMALLINT        cbDriverDescMax,
-    SQLSMALLINT    *pcbDriverDesc,
-    SQLWCHAR        *szDriverAttributes,
-    SQLSMALLINT        cbDrvrAttrMax,
-    SQLSMALLINT    *pcbDrvrAttr);
-
-
-/* ANSI versions */
-
-SQLRETURN SQL_API SQLColAttributeA(
-    SQLHSTMT		hstmt,
-    SQLSMALLINT		iCol,
-    SQLSMALLINT		iField,
-    SQLPOINTER		pCharAttr,
-    SQLSMALLINT		cbCharAttrMax,	
-    SQLSMALLINT  	        *pcbCharAttr,
-    SQLLEN              	*pNumAttr);	
-
-SQLRETURN SQL_API SQLColAttributesA(
-    SQLHSTMT        hstmt,
-    SQLUSMALLINT    icol,
-    SQLUSMALLINT    fDescType,
-    SQLPOINTER      rgbDesc,
-    SQLSMALLINT     cbDescMax,
-    SQLSMALLINT    	*pcbDesc,
-    SQLLEN     		*pfDesc);
-
-SQLRETURN SQL_API SQLConnectA(
-    SQLHDBC         hdbc,
-    SQLCHAR         *szDSN,
-    SQLSMALLINT     cbDSN,
-    SQLCHAR         *szUID,
-    SQLSMALLINT     cbUID,
-    SQLCHAR         *szAuthStr,
-    SQLSMALLINT     cbAuthStr);
-
-
-SQLRETURN SQL_API SQLDescribeColA(
-    SQLHSTMT        hstmt,
-    SQLUSMALLINT    icol,
-    SQLCHAR         *szColName,
-    SQLSMALLINT     cbColNameMax,
-    SQLSMALLINT    	*pcbColName,
-    SQLSMALLINT    	*pfSqlType,
-    SQLULEN    		*pcbColDef,
-    SQLSMALLINT    	*pibScale,
-    SQLSMALLINT    	*pfNullable);
-
-
-SQLRETURN SQL_API SQLErrorA(
-    SQLHENV            henv,
-    SQLHDBC            hdbc,
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szSqlState,
-    SQLINTEGER     *pfNativeError,
-    SQLCHAR        *szErrorMsg,
-    SQLSMALLINT        cbErrorMsgMax,
-    SQLSMALLINT    *pcbErrorMsg);
-
-SQLRETURN SQL_API SQLExecDirectA(
-    SQLHSTMT           hstmt,
-    SQLCHAR           *szSqlStr,
-    SQLINTEGER         cbSqlStr);
-
-SQLRETURN SQL_API SQLGetConnectAttrA(
-    SQLHDBC            hdbc,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER     *pcbValue);
-
-SQLRETURN SQL_API SQLGetCursorNameA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        	*szCursor,
-    SQLSMALLINT        cbCursorMax,
-    SQLSMALLINT    *pcbCursor);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN SQL_API SQLGetDescFieldA(
-    SQLHDESC           hdesc,
-    SQLSMALLINT        iRecord,
-    SQLSMALLINT        iField,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER		   cbValueMax,
-    SQLINTEGER     *pcbValue);
-
-SQLRETURN SQL_API SQLGetDescRecA(
-    SQLHDESC           hdesc,
-    SQLSMALLINT        iRecord,
-    SQLCHAR        *szName,
-    SQLSMALLINT        cbNameMax,
-    SQLSMALLINT    *pcbName,
-    SQLSMALLINT    *pfType,
-    SQLSMALLINT    *pfSubType,
-    SQLLEN     *pLength,
-    SQLSMALLINT    *pPrecision, 
-    SQLSMALLINT    *pScale,
-    SQLSMALLINT    *pNullable);
-
-SQLRETURN SQL_API SQLGetDiagFieldA(
-    SQLSMALLINT        fHandleType,
-    SQLHANDLE          handle,
-    SQLSMALLINT        iRecord,
-    SQLSMALLINT        fDiagField,
-    SQLPOINTER         rgbDiagInfo,
-    SQLSMALLINT        cbDiagInfoMax,
-    SQLSMALLINT    *pcbDiagInfo);
-
-SQLRETURN SQL_API SQLGetDiagRecA(
-    SQLSMALLINT        fHandleType,
-    SQLHANDLE          handle,
-    SQLSMALLINT        iRecord,
-    SQLCHAR        *szSqlState,
-    SQLINTEGER     *pfNativeError,
-    SQLCHAR        *szErrorMsg,
-    SQLSMALLINT        cbErrorMsgMax,
-    SQLSMALLINT    *pcbErrorMsg);
-
-
-SQLRETURN SQL_API SQLGetStmtAttrA(
-    SQLHSTMT           hstmt,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValueMax,
-    SQLINTEGER     *pcbValue);
-
-#endif
-
-SQLRETURN SQL_API	SQLGetTypeInfoA(
-    SQLHSTMT			StatementHandle,
-    SQLSMALLINT			DataTyoe);
-
-SQLRETURN SQL_API SQLPrepareA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        	*szSqlStr,
-    SQLINTEGER         cbSqlStr);
-
-SQLRETURN SQL_API SQLSetConnectAttrA(
-    SQLHDBC            hdbc,
-    SQLINTEGER         fAttribute,
-    SQLPOINTER         rgbValue,
-    SQLINTEGER         cbValue);
-
-SQLRETURN SQL_API SQLSetCursorNameA(
-    SQLHSTMT           hstmt,
-    SQLCHAR           *szCursor,
-    SQLSMALLINT        cbCursor);
-
-
-
-    
-
-
-
-SQLRETURN SQL_API SQLColumnsA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        	*szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        	*szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        	*szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLCHAR        	*szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLGetConnectOptionA(
-    SQLHDBC            hdbc,
-    SQLUSMALLINT       fOption,
-    SQLPOINTER         pvParam);
-
-
-
-SQLRETURN SQL_API SQLGetInfoA(
-    SQLHDBC            hdbc,
-    SQLUSMALLINT       fInfoType,
-    SQLPOINTER         rgbInfoValue,
-    SQLSMALLINT        cbInfoValueMax,
-    SQLSMALLINT*       pcbInfoValue);
-
-SQLRETURN SQL_API SQLGetStmtOptionA(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fOption,
-    SQLPOINTER         pvParam);
-
-SQLRETURN SQL_API SQLSetConnectOptionA(
-    SQLHDBC            hdbc,
-    SQLUSMALLINT       fOption,
-    SQLULEN            vParam);
-
-SQLRETURN SQL_API SQLSetStmtOptionA(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fOption,
-    SQLULEN            vParam);
-
-SQLRETURN SQL_API SQLSpecialColumnsA(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fColType,
-    SQLCHAR        	*szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        	*szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        	*szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLUSMALLINT       fScope,
-    SQLUSMALLINT       fNullable);
-
-SQLRETURN SQL_API SQLStatisticsA(
-    SQLHSTMT           hstmt,
-
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLUSMALLINT       fUnique,
-    SQLUSMALLINT       fAccuracy);
-
-SQLRETURN SQL_API SQLTablesA(
-    SQLHSTMT           hstmt,
-
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLCHAR        *szTableType,
-
-    SQLSMALLINT        cbTableType);
-
-
-
-SQLRETURN SQL_API SQLDataSourcesA(
-    SQLHENV            henv,
-    SQLUSMALLINT       fDirection,
-    SQLCHAR        *szDSN,
-    SQLSMALLINT        cbDSNMax,
-    SQLSMALLINT    *pcbDSN,
-    SQLCHAR        *szDescription,
-    SQLSMALLINT        cbDescriptionMax,
-    SQLSMALLINT    *pcbDescription);
-
-
-
-
-SQLRETURN SQL_API SQLDriverConnectA(
-    SQLHDBC            hdbc,
-    SQLHWND            hwnd,
-    SQLCHAR        *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLCHAR        *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT    *pcbConnStrOut,
-    SQLUSMALLINT       fDriverCompletion);
-
-
-SQLRETURN SQL_API SQLBrowseConnectA(
-    SQLHDBC            hdbc,
-    SQLCHAR        *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLCHAR        *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT    *pcbConnStrOut);
-
-SQLRETURN SQL_API SQLColumnPrivilegesA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLCHAR        *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLDescribeParamA(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       ipar,
-    SQLSMALLINT    *pfSqlType,
-    SQLUINTEGER    *pcbParamDef,
-    SQLSMALLINT    *pibScale,
-    SQLSMALLINT    *pfNullable);
-
-
-SQLRETURN SQL_API SQLForeignKeysA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szPkCatalogName,
-    SQLSMALLINT        cbPkCatalogName,
-    SQLCHAR        *szPkSchemaName,
-    SQLSMALLINT        cbPkSchemaName,
-    SQLCHAR        *szPkTableName,
-    SQLSMALLINT        cbPkTableName,
-    SQLCHAR        *szFkCatalogName,
-    SQLSMALLINT        cbFkCatalogName,
-    SQLCHAR        *szFkSchemaName,
-    SQLSMALLINT        cbFkSchemaName,
-    SQLCHAR        *szFkTableName,
-    SQLSMALLINT        cbFkTableName);
-
-
-SQLRETURN SQL_API SQLNativeSqlA(
-    SQLHDBC            hdbc,
-    SQLCHAR        *szSqlStrIn,
-    SQLINTEGER         cbSqlStrIn,
-    SQLCHAR        *szSqlStr,
-    SQLINTEGER         cbSqlStrMax,
-    SQLINTEGER     *pcbSqlStr);
-
-
-SQLRETURN SQL_API SQLPrimaryKeysA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLProcedureColumnsA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szProcName,
-    SQLSMALLINT        cbProcName,
-    SQLCHAR        *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLProceduresA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szProcName,
-    SQLSMALLINT        cbProcName);
-
-
-SQLRETURN SQL_API SQLTablePrivilegesA(
-    SQLHSTMT           hstmt,
-    SQLCHAR        *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR        *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR        *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLDriversA(
-    SQLHENV            henv,
-    SQLUSMALLINT       fDirection,
-    SQLCHAR        *szDriverDesc,
-    SQLSMALLINT        cbDriverDescMax,
-    SQLSMALLINT    *pcbDriverDesc,
-    SQLCHAR        *szDriverAttributes,
-    SQLSMALLINT        cbDrvrAttrMax,
-    SQLSMALLINT    *pcbDrvrAttr);
-
-
-
-
-
-/*---------------------------------------------*/
-/* 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	*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifndef __SQLEXT_H
-#include <odbx/sqlext.h>
-
-#endif
-
-
-#endif
diff --git a/unixODBC/prj/build.lst b/unixODBC/prj/build.lst
deleted file mode 100644
index 2adf385..0000000
--- a/unixODBC/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-uo	unixODBC	:	solenv NULL
-uo	unixODBC							usr1	-	all	uo_mkout NULL
-uo	unixODBC\prj						get		-	all	uo_prj NULL
diff --git a/unixODBC/prj/d.lst b/unixODBC/prj/d.lst
deleted file mode 100644
index 6b3fa94..0000000
--- a/unixODBC/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\odbc
-..\inc\*.h %_DEST%\inc\external\odbc\*.h
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
deleted file mode 100644
index db08373..0000000
--- a/vigra/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# dmake create_clean -- just unpacks
-# dmake patch -- unpacks and applies patch file
-# dmake create_patch -- creates a patch file
-
-PRJ=.
-
-PRJNAME=vigra
-TARGET=vigra
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_VIGRA)" == "YES"
-all:
-    @echo "An already available installation of vigra should exist on your system."        
-    @echo "Therefore the version provided here does not need to be built in addition."
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=vigra1.4.0
-TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a
-PATCH_FILES=$(TARFILE_NAME).patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ENDIF
diff --git a/vigra/prj/build.lst b/vigra/prj/build.lst
deleted file mode 100644
index 47f7eee..0000000
--- a/vigra/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-vi      vigra : solenv NULL
-vi      vigra           usr1    -       all     vi_mkout NULL
-vi      vigra           nmake   -       all     vi_vigra NULL
diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst
deleted file mode 100644
index ddf8faf..0000000
--- a/vigra/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\vigra
-
-..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx
diff --git a/vigra/vigra1.4.0.patch b/vigra/vigra1.4.0.patch
deleted file mode 100644
index 431b021..0000000
--- a/vigra/vigra1.4.0.patch
+++ /dev/null
@@ -1,1713 +0,0 @@
-diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure
---- misc/vigra1.4.0/configure	Tue Dec 20 23:53:28 2005
-+++ misc/build/vigra1.4.0/configure	Wed Apr  4 20:35:48 2007
-@@ -7259,7 +7259,7 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -10961,7 +10961,7 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -14110,7 +14110,7 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -16461,7 +16461,7 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx
---- misc/vigra1.4.0/include/vigra/array_vector.hxx	2005-12-21 05:53:30.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx	2006-08-31 12:08:15.172679000 +0200
-@@ -196,7 +196,38 @@ public:
-     iterator insert(iterator p, size_type n, value_type const & v);
- 
-     template <class InputIterator>
--    iterator insert(iterator p, InputIterator i, InputIterator iend);
-+    iterator insert(iterator p, InputIterator i, InputIterator iend)
-+    {
-+        difference_type n = iend - i;
-+        difference_type pos = p - begin();
-+        size_type new_size = size() + n;
-+        if(new_size >= capacity_)
-+        {
-+            pointer new_data = reserve_raw(new_size);
-+            std::uninitialized_copy(begin(), p, new_data);
-+            std::uninitialized_copy(i, iend, new_data + pos);
-+            std::uninitialized_copy(p, end(), new_data + pos + n);
-+            deallocate(data_, size_);
-+            capacity_ = new_size;
-+            data_ = new_data;
-+        }
-+        else if(pos + n >= size_)
-+        {
-+            size_type diff = pos + n - size_;
-+            std::uninitialized_copy(p, end(), end() + diff);
-+            std::uninitialized_copy(iend - diff, iend, end());
-+            std::copy(i, iend - diff, p);
-+        }
-+        else
-+        {
-+            size_type diff = size_ - (pos + n);
-+            std::uninitialized_copy(end() - n, end(), end());
-+            std::copy_backward(p, p + diff, end());
-+            std::copy(i, iend, p);
-+        }
-+        size_ = new_size;
-+        return begin() + pos;
-+    }
- 
-     iterator erase(iterator p);
- 
-@@ -260,23 +291,23 @@ ArrayVector<T, Alloc>::ArrayVector(Alloc
- {}
- 
- template <class T, class Alloc>
--ArrayVector<T, Alloc>::ArrayVector( size_type size, Alloc const & alloc)
-+ArrayVector<T, Alloc>::ArrayVector( size_type sz, Alloc const & alloc)
- : alloc_(alloc),
--  size_(size),
--  capacity_(size),
--  data_(reserve_raw(size))
-+  size_(sz),
-+  capacity_(sz),
-+  data_(reserve_raw(sz))
- {
-     if(size_ > 0)
-         std::uninitialized_fill(data_, data_+size_, value_type());
- }
- 
- template <class T, class Alloc>
--ArrayVector<T, Alloc>::ArrayVector( size_type size, 
-+ArrayVector<T, Alloc>::ArrayVector( size_type sz, 
-                          value_type const & initial, Alloc const & alloc)
- : alloc_(alloc),
--  size_(size),
--  capacity_(size),
--  data_(reserve_raw(size))
-+  size_(sz),
-+  capacity_(sz),
-+  data_(reserve_raw(sz))
- {
-     if(size_ > 0)
-         std::uninitialized_fill(data_, data_+size_, initial);
-@@ -295,24 +326,24 @@ ArrayVector<T, Alloc>::ArrayVector( this
- 
- template <class T, class Alloc>
- template <class InputIterator>
--ArrayVector<T, Alloc>::ArrayVector(InputIterator i, InputIterator end)
-+ArrayVector<T, Alloc>::ArrayVector(InputIterator i, InputIterator iend)
- : alloc_(),
--  size_(std::distance(i, end)),
-+  size_(std::distance(i, iend)),
-   capacity_(size_),
-   data_(reserve_raw(size_))
- {
--    std::uninitialized_copy(i, end, data_);
-+    std::uninitialized_copy(i, iend, data_);
- }
- 
- template <class T, class Alloc>
- template <class InputIterator>
--ArrayVector<T, Alloc>::ArrayVector(InputIterator i, InputIterator end, Alloc const & alloc)
-+ArrayVector<T, Alloc>::ArrayVector(InputIterator i, InputIterator iend, Alloc const & alloc)
- : alloc_(alloc),
--  size_(std::distance(i, end)),
-+  size_(std::distance(i, iend)),
-   capacity_(size_),
-   data_(reserve_raw(size_))
- {
--    std::uninitialized_copy(i, end, data_);
-+    std::uninitialized_copy(i, iend, data_);
- }
- 
- 
-@@ -409,42 +440,6 @@ ArrayVector<T, Alloc>::insert(iterator p
- }
- 
- template <class T, class Alloc>
--template <class InputIterator>
--typename ArrayVector<T, Alloc>::iterator
--ArrayVector<T, Alloc>::insert(iterator p, InputIterator i, InputIterator iend)
--{
--    difference_type n = iend - i;
--    difference_type pos = p - begin();
--    size_type new_size = size() + n;
--    if(new_size >= capacity_)
--    {
--        pointer new_data = reserve_raw(new_size);
--        std::uninitialized_copy(begin(), p, new_data);
--        std::uninitialized_copy(i, iend, new_data + pos);
--        std::uninitialized_copy(p, end(), new_data + pos + n);
--        deallocate(data_, size_);
--        capacity_ = new_size;
--        data_ = new_data;
--    }
--    else if(pos + n >= size_)
--    {
--        size_type diff = pos + n - size_;
--        std::uninitialized_copy(p, end(), end() + diff);
--        std::uninitialized_copy(iend - diff, iend, end());
--        std::copy(i, iend - diff, p);
--    }
--    else
--    {
--        size_type diff = size_ - (pos + n);
--        std::uninitialized_copy(end() - n, end(), end());
--        std::copy_backward(p, p + diff, end());
--        std::copy(i, iend, p);
--    }
--    size_ = new_size;
--    return begin() + pos;
--}
--
--template <class T, class Alloc>
- typename ArrayVector<T, Alloc>::iterator
- ArrayVector<T, Alloc>::erase(iterator p)
- {
-@@ -504,25 +499,25 @@ void ArrayVector<T, Alloc>::swap(this_ty
- }
- 
- template <class T, class Alloc>
--void ArrayVector<T, Alloc>::deallocate(pointer data, size_type size)
-+void ArrayVector<T, Alloc>::deallocate(pointer target_data, size_type sz)
- {
-     if(data)
-     {
--        detail::destroy_n(data, size);
--        alloc_.deallocate(data, size);
-+        detail::destroy_n(target_data, sz);
-+        alloc_.deallocate(target_data, sz);
-     }
- }
- 
- template <class T, class Alloc>
- typename ArrayVector<T, Alloc>::pointer
--ArrayVector<T, Alloc>::reserve_raw(size_type capacity)
-+ArrayVector<T, Alloc>::reserve_raw(size_type cap)
- {
--    pointer data = 0;
--    if(capacity)
-+    pointer new_data = 0;
-+    if(cap)
-     {
--        data = alloc_.allocate(capacity);
-+        new_data = alloc_.allocate(cap);
-     }
--    return data;
-+    return new_data;
- }
- 
- } // namespace vigra
-diff -uprN misc/vigra1.4.0/include/vigra/basicimage.hxx misc/build/vigra1.4.0/include/vigra/basicimage.hxx
---- misc/vigra1.4.0/include/vigra/basicimage.hxx	2005-12-21 05:53:30.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/basicimage.hxx	2006-08-31 12:08:15.194050000 +0200
-@@ -552,7 +552,11 @@ class BasicImage
-     typedef Alloc allocator_type;
- 
-     typedef Alloc Allocator;
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-     typedef typename Alloc::template rebind<PIXELTYPE *>::other LineAllocator;
-+#else
-+    typedef std::allocator<PIXELTYPE*> LineAllocator;
-+#endif
- 
-         /** construct image of size 0x0
-         */
-@@ -569,39 +573,51 @@ class BasicImage
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
-+#else
-+      pallocator_()
-+#endif
-     {}
- 
-         /** construct image of size width x height, use the specified allocator.
-         */
--    BasicImage(int width, int height, Alloc const & alloc = Alloc())
-+    BasicImage(int w, int h, Alloc const & alloc = Alloc())
-     : data_(0),
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
-+#else
-+      pallocator_()
-+#endif
-     {
--        vigra_precondition((width >= 0) && (height >= 0),
--             "BasicImage::BasicImage(int width, int height): "
-+        vigra_precondition((w >= 0) && (h >= 0),
-+             "BasicImage::BasicImage(int w, int h): "
-              "width and height must be >= 0.\n");
- 
--        resize(width, height, value_type());
-+        resize(w, h, value_type());
-     }
- 
-         /** construct image of size size.x x size.y, use the specified allocator.
-         */
--    explicit BasicImage(difference_type const & size, Alloc const & alloc = Alloc())
-+    explicit BasicImage(difference_type const & sz, Alloc const & alloc = Alloc())
-     : data_(0),
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
--    {
--        vigra_precondition((size.x >= 0) && (size.y >= 0),
--             "BasicImage::BasicImage(Diff2D size): "
--             "size.x and size.y must be >= 0.\n");
-+#else
-+      pallocator_()
-+#endif
-+    {
-+        vigra_precondition((sz.x >= 0) && (sz.y >= 0),
-+             "BasicImage::BasicImage(Diff2D sz): "
-+             "sz.x and sz.y must be >= 0.\n");
- 
--        resize(size.x, size.y, value_type());
-+        resize(sz.x, sz.y, value_type());
-     }
- 
-         /** construct image of size width*height and initialize every
-@@ -609,71 +625,87 @@ class BasicImage
-         value_type doesn't have a default constructor). 
-         Use the specified allocator.
-         */
--    BasicImage(int width, int height, value_type const & d, Alloc const & alloc = Alloc())
-+    BasicImage(int w, int h, value_type const & d, Alloc const & alloc = Alloc())
-     : data_(0),
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
-+#else
-+      pallocator_()
-+#endif
-     {
--        vigra_precondition((width >= 0) && (height >= 0),
--             "BasicImage::BasicImage(int width, int height, value_type const & ): "
-+        vigra_precondition((w >= 0) && (h >= 0),
-+             "BasicImage::BasicImage(int w, int h, value_type const & ): "
-              "width and height must be >= 0.\n");
- 
--        resize(width, height, d);
-+        resize(w, h, d);
-     }
- 
-         /** construct image of size size.x x size.y and initialize
-         every pixel with given data (use this constructor, if
-         value_type doesn't have a default constructor). Use the specified allocator.
-         */
--    explicit BasicImage(difference_type const & size, value_type const & d, Alloc const & alloc = Alloc())
-+    explicit BasicImage(difference_type const & sz, value_type const & d, Alloc const & alloc = Alloc())
-     : data_(0),
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
--    {
--        vigra_precondition((size.x >= 0) && (size.y >= 0),
--             "BasicImage::BasicImage(Diff2D const & size, value_type const & v): "
--             "size.x and size.y must be >= 0.\n");
-+#else
-+      pallocator_()
-+#endif
-+    {
-+        vigra_precondition((sz.x >= 0) && (sz.y >= 0),
-+             "BasicImage::BasicImage(Diff2D const & sz, value_type const & v): "
-+             "sz.x and sz.y must be >= 0.\n");
- 
--        resize(size.x, size.y, d);
-+        resize(sz.x, sz.y, d);
-     }
- 
- 
-         /** construct image of size width*height and copy the data from the
-             given C-style array \a d. Use the specified allocator.
-         */
--    BasicImage(int width, int height, const_pointer d, Alloc const & alloc = Alloc())
-+    BasicImage(int w, int h, const_pointer d, Alloc const & alloc = Alloc())
-     : data_(0),
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
-+#else
-+      pallocator_()
-+#endif
-     {
--        vigra_precondition((width >= 0) && (height >= 0),
--             "BasicImage::BasicImage(int width, int height, const_pointer ): "
-+        vigra_precondition((w >= 0) && (h >= 0),
-+             "BasicImage::BasicImage(int w, int h, const_pointer ): "
-              "width and height must be >= 0.\n");
- 
--        resizeCopy(width, height, d);
-+        resizeCopy(w, h, d);
-     }
- 
-         /** construct image of size size.x x size.y  and copy the data from the
-             given C-style array. Use the specified allocator.
-         */
--    explicit BasicImage(difference_type const & size, const_pointer d, Alloc const & alloc = Alloc())
-+    explicit BasicImage(difference_type const & sz, const_pointer d, Alloc const & alloc = Alloc())
-     : data_(0),
-       width_(0),
-       height_(0),
-       allocator_(alloc),
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       pallocator_(alloc)
--    {
--        vigra_precondition((size.x >= 0) && (size.y >= 0),
--             "BasicImage::BasicImage(Diff2D const & size, const_pointer): "
--             "size.x and size.y must be >= 0.\n");
-+#else
-+      pallocator_()
-+#endif
-+    {
-+        vigra_precondition((sz.x >= 0) && (sz.y >= 0),
-+             "BasicImage::BasicImage(Diff2D const & sz, const_pointer): "
-+             "sz.x and sz.y must be >= 0.\n");
- 
--        resizeCopy(size.x, size.y, d);
-+        resizeCopy(sz.x, sz.y, d);
-     }
- 
-         /** copy rhs image
-@@ -710,20 +742,20 @@ class BasicImage
-         /** reset image to specified size (dimensions must not be negative)
-             (old data are kept if new size matches old size)
-         */
--    void resize(int width, int height)
-+    void resize(int w, int h)
-     {
--        if(width != width_ || height != height_)
--            resize(width, height, value_type());
-+        if(w != width_ || h != height_)
-+            resize(w, h, value_type());
-     }
- 
-         /** reset image to specified size (dimensions must not be negative)
-             (old data are kept if new size matches old size)
-         */
--    void resize(difference_type const & size)
-+    void resize(difference_type const & sz)
-     {
--        if(size.x != width_ || size.y != height_)
-+        if(sz.x != width_ || sz.y != height_)
-         {
--            resize(size.x, size.y, value_type());
-+            resize(sz.x, sz.y, value_type());
-         }
-     }
- 
-@@ -732,12 +764,12 @@ class BasicImage
-             constructor, dimensions must not be negative,
-             old data are kept if new size matches old size)
-         */
--    void resize(int width, int height, value_type const & d);
-+    void resize(int w, int h, value_type const & d);
- 
-         /** resize image to given size and initialize by copying data
-             from the C-style arra \a data.
-         */
--    void resizeCopy(int width, int height, const_pointer data);
-+    void resizeCopy(int w, int h, const_pointer data);
- 
-         /** resize image to size of other image and copy it's data
-         */
-@@ -1046,30 +1078,30 @@ BasicImage<PIXELTYPE, Alloc>::init(value
- 
- template <class PIXELTYPE, class Alloc>
- void
--BasicImage<PIXELTYPE, Alloc>::resize(int width, int height, value_type const & d)
-+BasicImage<PIXELTYPE, Alloc>::resize(int w, int h, value_type const & d)
- {
--    vigra_precondition((width >= 0) && (height >= 0),
--         "BasicImage::resize(int width, int height, value_type const &): "
-+    vigra_precondition((w >= 0) && (h >= 0),
-+         "BasicImage::resize(int w, int h, value_type const &): "
-          "width and height must be >= 0.\n");
- 
--    if (width_ != width || height_ != height)  // change size?
-+    if (width_ != w || height_ != h)  // change size?
-     {
-         value_type * newdata = 0;
-         value_type ** newlines = 0;
--        if(width*height > 0)
-+        if(w*h > 0)
-         {
--            if (width*height != width_*height_) // different sizes, must reallocate
-+            if (w*h != width_*height_) // different sizes, must reallocate
-             {
--                newdata = allocator_.allocate(width*height);
--                std::uninitialized_fill_n(newdata, width*height, d);
--                newlines = initLineStartArray(newdata, width, height);
-+                newdata = allocator_.allocate(w*h);
-+                std::uninitialized_fill_n(newdata, w*h, d);
-+                newlines = initLineStartArray(newdata, w, h);
-                 deallocate();
-             }
-             else // need only to reshape
-             {
-                 newdata = data_;
--                std::fill_n(newdata, width*height, d);
--                newlines = initLineStartArray(newdata, width, height);
-+                std::fill_n(newdata, w*h, d);
-+                newlines = initLineStartArray(newdata, w, h);
-                 pallocator_.deallocate(lines_, height_);
-             }
-         }
-@@ -1080,22 +1112,22 @@ BasicImage<PIXELTYPE, Alloc>::resize(int
- 
-         data_ = newdata;
-         lines_ = newlines;
--        width_ = width;
--        height_ = height;
-+        width_ = w;
-+        height_ = h;
-     }
--    else if(width*height > 0) // keep size, re-init data
-+    else if(w*h > 0) // keep size, re-init data
-     {
--        std::fill_n(data_, width*height, d);
-+        std::fill_n(data_, w*h, d);
-     }
- }
- 
- 
- template <class PIXELTYPE, class Alloc>
- void
--BasicImage<PIXELTYPE, Alloc>::resizeCopy(int width, int height, const_pointer data)
-+BasicImage<PIXELTYPE, Alloc>::resizeCopy(int w, int h, const_pointer src_data)
- {
--    int newsize = width*height;
--    if (width_ != width || height_ != height)  // change size?
-+    int newsize = w*h;
-+    if (width_ != w || height_ != h)  // change size?
-     {
-         value_type * newdata = 0;
-         value_type ** newlines = 0;
-@@ -1104,15 +1136,15 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
-             if (newsize != width_*height_) // different sizes, must reallocate
-             {
-                 newdata = allocator_.allocate(newsize);
--                std::uninitialized_copy(data, data + newsize, newdata);
--                newlines = initLineStartArray(newdata, width, height);
-+                std::uninitialized_copy(src_data, src_data + newsize, newdata);
-+                newlines = initLineStartArray(newdata, w, h);
-                 deallocate();
-             }
-             else // need only to reshape
-             {
-                 newdata = data_;
--                std::copy(data, data + newsize, newdata);
--                newlines = initLineStartArray(newdata, width, height);
-+                std::copy(src_data, src_data + newsize, newdata);
-+                newlines = initLineStartArray(newdata, w, h);
-                 pallocator_.deallocate(lines_, height_);
-             }
-         }
-@@ -1123,12 +1155,12 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
- 
-         data_ = newdata;
-         lines_ = newlines;
--        width_ = width;
--        height_ = height;
-+        width_ = w;
-+        height_ = h;
-     }
-     else if(newsize > 0) // keep size, copy data
-     {
--        std::copy(data, data + newsize, data_);
-+        std::copy(src_data, src_data + newsize, data_);
-     }
- }
- 
-@@ -1163,11 +1195,11 @@ BasicImage<PIXELTYPE, Alloc>::deallocate
- 
- template <class PIXELTYPE, class Alloc>
- PIXELTYPE **
--BasicImage<PIXELTYPE, Alloc>::initLineStartArray(value_type * data, int width, int height)
-+BasicImage<PIXELTYPE, Alloc>::initLineStartArray(value_type * src_data, int w, int h)
- {
--    value_type ** lines = pallocator_.allocate(height);
--    for(int y=0; y<height; ++y)
--         lines[y] = data + y*width;
-+    value_type ** lines = pallocator_.allocate(h);
-+    for(int y=0; y<h; ++y)
-+         lines[y] = src_data + y*w;
-     return lines;
- }
- 
-diff -uprN misc/vigra1.4.0/include/vigra/basicimageview.hxx misc/build/vigra1.4.0/include/vigra/basicimageview.hxx
---- misc/vigra1.4.0/include/vigra/basicimageview.hxx	2005-12-21 05:53:30.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/basicimageview.hxx	2006-08-31 12:08:15.219210000 +0200
-@@ -176,20 +176,20 @@ class BasicImageView
- 
-         /** construct view of size w x h
-         */
--    BasicImageView(const_pointer data, int w, int h, int stride = 0)
--    : data_(const_cast<pointer>(data)),
-+    BasicImageView(const_pointer src_data, int w, int h, int data_stride = 0)
-+    : data_(const_cast<pointer>(src_data)),
-       width_(w),
-       height_(h),
--      stride_(stride == 0 ? w : stride)
-+      stride_(data_stride == 0 ? w : data_stride)
-     {}
- 
-         /** construct view of size size.x x size.y
-         */
--    BasicImageView(const_pointer data, difference_type const & size, int stride = 0)
--    : data_(const_cast<pointer>(data)),
--      width_(size.x),
--      height_(size.y),
--      stride_(stride == 0 ? size.x : stride)
-+    BasicImageView(const_pointer src_data, difference_type const & sz, int data_stride = 0)
-+    : data_(const_cast<pointer>(src_data)),
-+      width_(sz.x),
-+      height_(sz.y),
-+      stride_(data_stride == 0 ? sz.x : data_stride)
-     {}
- 
-         /** set Image with const value
-diff -uprN misc/vigra1.4.0/include/vigra/boundarytensor.hxx misc/build/vigra1.4.0/include/vigra/boundarytensor.hxx
---- misc/vigra1.4.0/include/vigra/boundarytensor.hxx	2005-12-21 05:53:31.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/boundarytensor.hxx	2006-08-31 12:08:15.240695000 +0200
-@@ -71,8 +71,8 @@ initGaussianPolarFilters1(double std_dev
-     int radius = (int)(4.0*std_dev + 0.5);
-     std_dev *= 1.08179074376;
-     double f = 1.0 / VIGRA_CSTD::sqrt(2.0 * M_PI) / std_dev;  // norm
--    double a = 0.558868151788 / VIGRA_CSTD::pow(std_dev, 5);
--    double b = -2.04251639729 / VIGRA_CSTD::pow(std_dev, 3);
-+    double a = 0.558868151788 / VIGRA_CSTD::pow(std_dev, 5.0);
-+    double b = -2.04251639729 / VIGRA_CSTD::pow(std_dev, 3.0);
-     double sigma22 = -0.5 / std_dev / std_dev;
- 
- 
-@@ -175,7 +175,7 @@ initGaussianPolarFilters3(double std_dev
-     std_dev *= 1.15470053838;
-     double sigma22 = -0.5 / std_dev / std_dev;
-     double f = 1.0 / VIGRA_CSTD::sqrt(2.0 * M_PI) / std_dev;  // norm
--    double a = 0.883887052922 / VIGRA_CSTD::pow(std_dev, 5);
-+    double a = 0.883887052922 / VIGRA_CSTD::pow(std_dev, 5.0);
- 
-     for(unsigned int i=0; i<k.size(); ++i)
-     {
-@@ -183,7 +183,7 @@ initGaussianPolarFilters3(double std_dev
-         k[i].setBorderTreatment(BORDER_TREATMENT_REFLECT);
-     }
-         
--    double b = -1.3786348292 / VIGRA_CSTD::pow(std_dev, 3);
-+    double b = -1.3786348292 / VIGRA_CSTD::pow(std_dev, 3.0);
- 
-     int ix;
-     iterator c = k[0].center();
-diff -uprN misc/vigra1.4.0/include/vigra/config.hxx misc/build/vigra1.4.0/include/vigra/config.hxx
---- misc/vigra1.4.0/include/vigra/config.hxx	2005-12-21 05:53:31.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/config.hxx	2006-08-31 12:08:15.261488000 +0200
-@@ -84,6 +84,12 @@
- 		#endif // VIGRA_NO_STD_MINMAX
- 	#endif // (_MSC_VER < 1300)
- 
-+    #if _MSC_VER <= 1310
-+	    #ifndef CMATH_NOT_IN_STD
-+	        #define CMATH_NOT_IN_STD
-+        #endif
-+    #endif // _MSC_VER < 1310
-+
-     #if _MSC_VER < 1310
-         #define NO_PARTIAL_TEMPLATE_SPECIALIZATION
-         #define NO_OUT_OF_LINE_MEMBER_TEMPLATES
-diff -uprN misc/vigra1.4.0/include/vigra/diff2d.hxx misc/build/vigra1.4.0/include/vigra/diff2d.hxx
---- misc/vigra1.4.0/include/vigra/diff2d.hxx	2005-12-21 05:53:33.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/diff2d.hxx	2006-08-31 12:08:15.282334000 +0200
-@@ -490,8 +490,8 @@ public:
- 
-         /** Construct point at given position.
-         */
--    Size2D(int width, int height)
--    : Diff2D(width, height)
-+    Size2D(int w, int h)
-+    : Diff2D(w, h)
-     {}
- 
-         /** Copy Constructor.
-@@ -606,8 +606,8 @@ public:
- 
-         /** Construct point at given position.
-         */
--    Point2D(int x, int y)
--    : Diff2D(x, y)
-+    Point2D(int x_, int y_)
-+    : Diff2D(x_, y_)
-     {}
- 
-         /** Copy Constructor.
-@@ -870,26 +870,26 @@ public:
-          * (lowerRight is considered to be outside the rectangle as
-          * usual in the VIGRA)
-          */
--    Rect2D(Point2D const &upperLeft, Point2D const &lowerRight)
--    : upperLeft_(upperLeft), lowerRight_(lowerRight)
-+    Rect2D(Point2D const &ul, Point2D const &lr)
-+    : upperLeft_(ul), lowerRight_(lr)
-     {}
- 
-         /** Construct a rectangle representing the given range
-          */
--    Rect2D(int left, int top, int right, int bottom)
--    : upperLeft_(left, top), lowerRight_(right, bottom)
-+    Rect2D(int l, int t, int r, int b)
-+        : upperLeft_(l,t), lowerRight_(r,b)
-     {}
- 
-         /** Construct a rectangle of given position and size
-          */
--    Rect2D(Point2D const &upperLeft, Size2D const &size)
--    : upperLeft_(upperLeft), lowerRight_(upperLeft + size)
-+    Rect2D(Point2D const &ul, Size2D const &sz)
-+    : upperLeft_(ul), lowerRight_(ul + sz)
-     {}
- 
-         /** Construct a rectangle of given size at position (0,0)
-          */
--    explicit Rect2D(Size2D const &size)
--    : lowerRight_(Point2D(size))
-+    explicit Rect2D(Size2D const &sz)
-+    : lowerRight_(Point2D(sz))
-     {}
- 
-         /** Return the first point (scan-order wise) which is
-@@ -936,9 +936,9 @@ public:
-         /** Move the whole rectangle so that upperLeft() will become
-          * Point2D(left, top) afterwards.
-          */
--    void moveTo(int left, int top)
-+    void moveTo(int l, int t)
-     {
--        moveTo(Point2D(left, top));
-+        moveTo(Point2D(l, t));
-     }
- 
-         /** Move the whole rectangle by the given 2D offset.
-@@ -1023,17 +1023,17 @@ public:
-         /** Resize this rectangle to the given extents. This will move
-          * the lower right corner only.
-          */
--    void setSize(Size2D const &size)
-+    void setSize(Size2D const &sz)
-     {
--        lowerRight_ = upperLeft_ + size;
-+        lowerRight_ = upperLeft_ + sz;
-     }
- 
-         /** Resize this rectangle to the given extents. This will move
-          * the lower right corner only.
-          */
--    void setSize(int width, int height)
-+    void setSize(int w, int h)
-     {
--        lowerRight_ = upperLeft_ + Size2D(width, height);
-+        lowerRight_ = upperLeft_ + Size2D(w, h);
-     }
- 
-         /** Increase the size of the rectangle by the given offset. This
-diff -uprN misc/vigra1.4.0/include/vigra/fftw.hxx misc/build/vigra1.4.0/include/vigra/fftw.hxx
---- misc/vigra1.4.0/include/vigra/fftw.hxx	2005-12-21 05:53:34.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/fftw.hxx	2006-08-31 12:08:15.308081000 +0200
-@@ -399,8 +399,6 @@ inline FFTWComplex operator /(FFTWComple
-     return a;
- }
- 
--using VIGRA_CSTD::abs;
--
- inline FFTWComplex::value_type abs(const FFTWComplex &a)
- {
-     return a.magnitude();
-diff -uprN misc/vigra1.4.0/include/vigra/fftw3.hxx misc/build/vigra1.4.0/include/vigra/fftw3.hxx
---- misc/vigra1.4.0/include/vigra/fftw3.hxx	2005-12-21 05:53:34.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/fftw3.hxx	2006-08-31 12:08:15.337248000 +0200
-@@ -572,8 +572,6 @@ inline FFTWComplex operator /(FFTWComple
-     return a;
- }
- 
--using VIGRA_CSTD::abs;
--
-     /// absolute value (= magnitude)
- inline FFTWComplex::value_type abs(const FFTWComplex &a)
- {
-diff -uprN misc/vigra1.4.0/include/vigra/fixedpoint.hxx misc/build/vigra1.4.0/include/vigra/fixedpoint.hxx
---- misc/vigra1.4.0/include/vigra/fixedpoint.hxx	2005-12-21 05:53:34.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/fixedpoint.hxx	2006-08-31 12:08:15.367651000 +0200
-@@ -118,20 +118,18 @@ enum FixedPointNoShift { FPNoShift };
- 
- namespace detail {
- 
--template <bool MustRound>
-+template <bool MustRound, int N>
- struct FPAssignWithRound;
- 
--template <>
--struct FPAssignWithRound<false>
-+template <int N>
-+struct FPAssignWithRound<false, N>
- {
--    template <int N>
-     static inline int exec(int v) { return v << (-N); }
- };
- 
--template <>
--struct FPAssignWithRound<true>
-+template <int N>
-+struct FPAssignWithRound<true, N>
- {
--    template <int N>
-     static inline int exec(int const v)
-     {
-         return (v + (1 << (N - 1))) >> (N);
-@@ -276,7 +274,7 @@ public:
-         */
-     template <unsigned Int2, unsigned Frac2>
-     FixedPoint(const FixedPoint<Int2, Frac2> &other)
--    : value(detail::FPAssignWithRound<(Frac2 > FractionalBits)>::template exec<Frac2 - FractionalBits>(other.value))
-+        : value(detail::FPAssignWithRound<(Frac2 > FractionalBits), Frac2 - FractionalBits>::exec(other.value))
-     {
-         VIGRA_STATIC_ASSERT((FixedPoint_overflow_error__More_than_31_bits_requested<(IntBits + FractionalBits)>));
-         VIGRA_STATIC_ASSERT((FixedPoint_assignment_error__Target_object_has_too_few_integer_bits<(IntBits >= Int2)>));
-@@ -321,7 +319,7 @@ public:
-     FixedPoint & operator=(const FixedPoint<Int2, Frac2> &other)
-     {
-         VIGRA_STATIC_ASSERT((FixedPoint_assignment_error__Target_object_has_too_few_integer_bits<(IntBits >= Int2)>));
--        value = detail::FPAssignWithRound<(Frac2 > FractionalBits)>::template exec<Frac2 - FractionalBits>(other.value);
-+        value = detail::FPAssignWithRound<(Frac2 > FractionalBits),Frac2 - FractionalBits>::exec(other.value);
-         return *this;
-     }
- 
-@@ -373,7 +371,7 @@ public:
-     FixedPoint & operator+=(const FixedPoint<Int2, Frac2> &other)
-     {
-         VIGRA_STATIC_ASSERT((FixedPoint_assignment_error__Target_object_has_too_few_integer_bits<(IntBits >= Int2)>));
--        value += detail::FPAssignWithRound<(Frac2 > FractionalBits)>::template exec<Frac2 - FractionalBits>(other.value);
-+        value += detail::FPAssignWithRound<(Frac2 > FractionalBits),Frac2 - FractionalBits>::exec(other.value);
-         return *this;
-     }
- 
-@@ -384,7 +382,7 @@ public:
-     FixedPoint & operator-=(const FixedPoint<Int2, Frac2> &other)
-     {
-         VIGRA_STATIC_ASSERT((FixedPoint_assignment_error__Target_object_has_too_few_integer_bits<(IntBits >= Int2)>));
--        value -= detail::FPAssignWithRound<(Frac2 > FractionalBits)>::template exec<Frac2 - FractionalBits>(other.value);
-+        value -= detail::FPAssignWithRound<(Frac2 > FractionalBits),Frac2 - FractionalBits>::exec(other.value);
-         return *this;
-     }
-     
-@@ -428,12 +426,12 @@ struct FixedPointCast<type> \
-     } \
- };
- 
--VIGRA_FIXED_POINT_CAST(Int8);
--VIGRA_FIXED_POINT_CAST(UInt8);
--VIGRA_FIXED_POINT_CAST(Int16);
--VIGRA_FIXED_POINT_CAST(UInt16);
--VIGRA_FIXED_POINT_CAST(Int32);
--VIGRA_FIXED_POINT_CAST(UInt32);
-+VIGRA_FIXED_POINT_CAST(Int8)
-+VIGRA_FIXED_POINT_CAST(UInt8)
-+VIGRA_FIXED_POINT_CAST(Int16)
-+VIGRA_FIXED_POINT_CAST(UInt16)
-+VIGRA_FIXED_POINT_CAST(Int32)
-+VIGRA_FIXED_POINT_CAST(UInt32)
- 
- #undef VIGRA_FIXED_POINT_CAST
- 
-diff -uprN misc/vigra1.4.0/include/vigra/gaborfilter.hxx misc/build/vigra1.4.0/include/vigra/gaborfilter.hxx
---- misc/vigra1.4.0/include/vigra/gaborfilter.hxx	2005-12-21 05:53:35.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/gaborfilter.hxx	2006-08-31 12:08:15.389636000 +0200
-@@ -289,7 +289,11 @@ inline double angularGaborSigma(int dire
-     Namespace: vigra
- */
- template <class ImageType, 
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       class Alloc = typename ImageType::allocator_type::template rebind<ImageType>::other >
-+#else
-+      class Alloc = std::allocator<ImageType> >
-+#endif
- class GaborFilterFamily 
- : public ImageArray<ImageType, Alloc>
- {
-diff -uprN misc/vigra1.4.0/include/vigra/gaussians.hxx misc/build/vigra1.4.0/include/vigra/gaussians.hxx
---- misc/vigra1.4.0/include/vigra/gaussians.hxx	2005-12-21 05:53:35.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/gaussians.hxx	2006-08-31 12:08:15.409790000 +0200
-@@ -88,26 +88,26 @@ class Gaussian
-             sigma > 0.0
-             \endcode
-         */
--    explicit Gaussian(T sigma = 1.0, unsigned int derivativeOrder = 0)
--    : sigma_(sigma),
--      sigma2_(-0.5 / sigma / sigma),
-+    explicit Gaussian(T s = 1.0, unsigned int derivOrder = 0)
-+    : sigma_(s),
-+      sigma2_(-0.5 / s / s),
-       norm_(0.0),
--      order_(derivativeOrder),
--      hermitePolynomial_(derivativeOrder / 2 + 1)
-+      order_(derivOrder),
-+      hermitePolynomial_(derivOrder / 2 + 1)
-     {
--        vigra_precondition(sigma_ > 0.0,
-+        vigra_precondition(s > 0.0,
-             "Gaussian::Gaussian(): sigma > 0 required.");
-         switch(order_)
-         {
-             case 1:
-             case 2:
--                norm_ = -1.0 / (VIGRA_CSTD::sqrt(2.0 * M_PI) * sq(sigma) * sigma);
-+                norm_ = -1.0 / (VIGRA_CSTD::sqrt(2.0 * M_PI) * sq(s) * s);
-                 break;
-             case 3:
--                norm_ = 1.0 / (VIGRA_CSTD::sqrt(2.0 * M_PI) * sq(sigma) * sq(sigma) * sigma);
-+                norm_ = 1.0 / (VIGRA_CSTD::sqrt(2.0 * M_PI) * sq(s) * sq(s) * s);
-                 break;
-             default:
--                norm_ = 1.0 / VIGRA_CSTD::sqrt(2.0 * M_PI) / sigma;
-+                norm_ = 1.0 / VIGRA_CSTD::sqrt(2.0 * M_PI) / s;
-         }
-         calculateHermitePolynomial();
-     }
-diff -uprN misc/vigra1.4.0/include/vigra/imagecontainer.hxx misc/build/vigra1.4.0/include/vigra/imagecontainer.hxx
---- misc/vigra1.4.0/include/vigra/imagecontainer.hxx	2005-12-21 05:53:36.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/imagecontainer.hxx	2006-08-31 12:08:15.429159000 +0200
-@@ -70,7 +70,11 @@ namespace vigra {
-     Namespace: vigra
- */
- template <class ImageType, 
-+#ifndef VIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
-       class Alloc = typename ImageType::allocator_type::template rebind<ImageType>::other >
-+#else
-+      class Alloc = std::allocator<ImageType> >
-+#endif
- class ImageArray
- {
-     Size2D imageSize_;
-diff -uprN misc/vigra1.4.0/include/vigra/mathutil.hxx misc/build/vigra1.4.0/include/vigra/mathutil.hxx
---- misc/vigra1.4.0/include/vigra/mathutil.hxx	2005-12-21 05:53:39.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/mathutil.hxx	2006-08-31 12:08:15.449199000 +0200
-@@ -73,8 +73,6 @@
- 
- namespace vigra {
- 
--#ifndef __sun 
--
- /** \addtogroup MathFunctions Mathematical Functions
- 
-     Useful mathematical functions and functors.
-@@ -109,18 +107,11 @@ double erf(T x)
-         return ans - 1.0;
- }
- 
--#else
--
--using VIGRA_CSTD::erf;
--
--#endif
--
- // import functions into namespace vigra which VIGRA is going to overload
- 
- using VIGRA_CSTD::pow;  
- using VIGRA_CSTD::floor;  
- using VIGRA_CSTD::ceil;  
--using std::abs;  
- 
- #define VIGRA_DEFINE_UNSIGNED_ABS(T) \
-     inline T abs(T t) { return t; }
-@@ -130,9 +121,39 @@ VIGRA_DEFINE_UNSIGNED_ABS(unsigned char)
- VIGRA_DEFINE_UNSIGNED_ABS(unsigned short)
- VIGRA_DEFINE_UNSIGNED_ABS(unsigned int)
- VIGRA_DEFINE_UNSIGNED_ABS(unsigned long)
-+#ifdef VIGRA_HAS_LONG_LONG
-+VIGRA_DEFINE_UNSIGNED_ABS(unsigned long long)
-+#endif
- 
- #undef VIGRA_DEFINE_UNSIGNED_ABS
- 
-+#define VIGRA_DEFINE_SIGNED_ABS(T) \
-+    inline T abs(T t) { return (T)abs(t); }
-+#define VIGRA_DEFINE_SIGNED_LABS(T) \
-+    inline T abs(T t) { return (T)labs(t); }
-+#define VIGRA_DEFINE_SIGNED_LLABS(T) \
-+    inline T abs(T t) { return (T)llabs(t); }
-+#define VIGRA_DEFINE_FABS(T) \
-+    inline T abs(T t) { return (T)fabs(t); }
-+
-+VIGRA_DEFINE_SIGNED_ABS(signed char)
-+VIGRA_DEFINE_SIGNED_ABS(signed short)
-+VIGRA_DEFINE_SIGNED_ABS(signed int)
-+VIGRA_DEFINE_SIGNED_LABS(signed long)
-+#ifdef VIGRA_HAS_LONG_LONG
-+VIGRA_DEFINE_SIGNED_LLABS(signed long long)
-+#endif
-+VIGRA_DEFINE_FABS(float)
-+VIGRA_DEFINE_FABS(double)
-+#ifdef VIGRA_HAS_LONG_DOUBLE
-+VIGRA_DEFINE_FABS(long double)
-+#endif
-+
-+#undef VIGRA_DEFINE_SIGNED_ABS
-+#undef VIGRA_DEFINE_SIGNED_LABS
-+#undef VIGRA_DEFINE_SIGNED_LLABS
-+#undef VIGRA_DEFINE_FABS
-+
-     /*! The rounding function.
- 
-         Defined for all floating point types. Rounds towards the nearest integer for both 
-@@ -155,12 +176,14 @@ inline double round(double t)
-                : ceil(t - 0.5);
- }
- 
-+#ifdef VIGRA_HAS_LONG_DOUBLE
- inline long double round(long double t)
- {
-     return t >= 0.0
-                ? floor(t + 0.5)
-                : ceil(t - 0.5);
- }
-+#endif
- 
-     /*! The square function.
- 
-@@ -371,9 +394,15 @@ VIGRA_DEFINE_NORM(int)
- VIGRA_DEFINE_NORM(unsigned int)
- VIGRA_DEFINE_NORM(long)
- VIGRA_DEFINE_NORM(unsigned long)
-+#ifdef VIGRA_HAS_LONG_LONG
-+VIGRA_DEFINE_NORM(long long)
-+VIGRA_DEFINE_NORM(unsigned long long)
-+#endif
- VIGRA_DEFINE_NORM(float)
- VIGRA_DEFINE_NORM(double)
-+#ifdef VIGRA_HAS_LONG_DOUBLE
- VIGRA_DEFINE_NORM(long double)
-+#endif
- 
- #undef VIGRA_DEFINE_NORM
- 
-diff -uprN misc/vigra1.4.0/include/vigra/numerictraits.hxx misc/build/vigra1.4.0/include/vigra/numerictraits.hxx
---- misc/vigra1.4.0/include/vigra/numerictraits.hxx	2005-12-21 05:53:41.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/numerictraits.hxx	2006-08-31 12:08:15.474422000 +0200
-@@ -891,6 +891,90 @@ struct NumericTraits<unsigned long>
-     }
- };
- 
-+#ifdef VIGRA_HAS_LONG_LONG
-+template<>
-+struct NumericTraits<long long>
-+{
-+    typedef long long Type;
-+    typedef long long Promote;
-+    typedef double RealPromote;
-+    typedef std::complex<RealPromote> ComplexPromote;
-+    typedef Type ValueType;
-+
-+    typedef VigraTrueType isIntegral;
-+    typedef VigraTrueType isScalar;
-+    typedef VigraTrueType isSigned;
-+    typedef VigraTrueType isOrdered;
-+    typedef VigraFalseType isComplex;
-+    
-+    static long long zero() { return 0; }
-+    static long long one() { return 1; }
-+    static long long nonZero() { return 1; }
-+    static long long min() { return LLONG_MIN; }
-+    static long long max() { return LLONG_MAX; }
-+    
-+#ifdef NO_INLINE_STATIC_CONST_DEFINITION
-+    enum { minConst = LONG_MIN, maxConst = LLONG_MAX };
-+#else
-+    static const long long minConst = LLONG_MIN;
-+    static const long long maxConst = LLONG_MAX;
-+#endif
-+
-+    static Promote toPromote(long long v) { return v; }
-+    static RealPromote toRealPromote(long long v) { return v; }
-+    static long long fromPromote(Promote v) { return v; }
-+    static long long fromRealPromote(RealPromote v) {
-+        return ((v < 0.0) 
-+                 ? ((v < (RealPromote)LLONG_MIN) 
-+                     ? LLONG_MIN 
-+                     : static_cast<long long>(v - 0.5)) 
-+                 : ((v > (RealPromote)LLONG_MAX) 
-+                     ? LLONG_MAX 
-+                     : static_cast<long long>(v + 0.5))); 
-+    }
-+};
-+
-+template<>
-+struct NumericTraits<unsigned long long>
-+{
-+    typedef unsigned long long Type;
-+    typedef unsigned long long Promote;
-+    typedef double RealPromote;
-+    typedef std::complex<RealPromote> ComplexPromote;
-+    typedef Type ValueType;
-+
-+    typedef VigraTrueType isIntegral;
-+    typedef VigraTrueType isScalar;
-+    typedef VigraFalseType isSigned;
-+    typedef VigraTrueType isOrdered;
-+    typedef VigraFalseType isComplex;
-+    
-+    static unsigned long long zero() { return 0; }
-+    static unsigned long long one() { return 1; }
-+    static unsigned long long nonZero() { return 1; }
-+    static unsigned long long min() { return 0; }
-+    static unsigned long long max() { return ULLONG_MAX; }
-+    
-+#ifdef NO_INLINE_STATIC_CONST_DEFINITION
-+    enum { minConst = 0, maxConst = ULLONG_MAX };
-+#else
-+    static const unsigned long long minConst = 0;
-+    static const unsigned long long maxConst = ULLONG_MAX;
-+#endif
-+
-+    static Promote toPromote(unsigned long long v) { return v; }
-+    static RealPromote toRealPromote(unsigned long long v) { return v; }
-+    static unsigned long long fromPromote(Promote v) { return v; }
-+    static unsigned long long fromRealPromote(RealPromote v) {
-+            return ((v < 0.0) 
-+                     ? 0 
-+                     : ((v > (RealPromote)ULLONG_MAX) 
-+                         ? ULLONG_MAX 
-+                         : static_cast<unsigned long long>(v + 0.5)));
-+    }
-+};
-+#endif
-+
- template<>
- struct NumericTraits<float>
- {
-@@ -949,6 +1033,7 @@ struct NumericTraits<double>
-     static double fromRealPromote(RealPromote v) { return v; }
- };
- 
-+#ifdef VIGRA_HAS_LONG_DOUBLE
- template<>
- struct NumericTraits<long double>
- {
-@@ -977,6 +1062,7 @@ struct NumericTraits<long double>
-     static long double fromPromote(Promote v) { return v; }
-     static long double fromRealPromote(RealPromote v) { return v; }
- };
-+#endif
- 
- #ifndef NO_PARTIAL_TEMPLATE_SPECIALIZATION
- 
-@@ -1055,9 +1141,15 @@ VIGRA_DEFINE_NORM_TRAITS(int)
- VIGRA_DEFINE_NORM_TRAITS(unsigned int)
- VIGRA_DEFINE_NORM_TRAITS(long)
- VIGRA_DEFINE_NORM_TRAITS(unsigned long)
-+#ifdef VIGRA_HAS_LONG_LONG
-+VIGRA_DEFINE_NORM_TRAITS(long long)
-+VIGRA_DEFINE_NORM_TRAITS(unsigned long long)
-+#endif
- VIGRA_DEFINE_NORM_TRAITS(float)
- VIGRA_DEFINE_NORM_TRAITS(double)
-+#ifdef VIGRA_HAS_LONG_DOUBLE
- VIGRA_DEFINE_NORM_TRAITS(long double)
-+#endif
- 
- #undef VIGRA_DEFINE_NORM_TRAITS
- 
-diff -uprN misc/vigra1.4.0/include/vigra/orientedtensorfilters.hxx misc/build/vigra1.4.0/include/vigra/orientedtensorfilters.hxx
---- misc/vigra1.4.0/include/vigra/orientedtensorfilters.hxx	2005-12-21 05:53:42.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/orientedtensorfilters.hxx	2006-08-31 12:08:15.503678000 +0200
-@@ -434,7 +434,7 @@ class Sin6RingKernel
-         if(x == 0 && y == 0)
-             return weights_(radius_, radius_);
-         double d = dot(vectors_(x+radius_, y+radius_), v);
--        return VIGRA_CSTD::pow(1.0 - d * d, 3) * weights_(x+radius_, y+radius_);
-+        return VIGRA_CSTD::pow(1.0 - d * d, 3.0) * weights_(x+radius_, y+radius_);
-     }
- };
- 
-@@ -455,7 +455,7 @@ class Sin6Kernel
-         if(x == 0 && y == 0)
-             return weights_(radius_, radius_);
-         double d = dot(vectors_(x+radius_, y+radius_), v);
--        return VIGRA_CSTD::pow(1.0 - d * d, 3) * weights_(x+radius_, y+radius_);
-+        return VIGRA_CSTD::pow(1.0 - d * d, 3.0) * weights_(x+radius_, y+radius_);
-     }
- };
- 
-@@ -476,7 +476,7 @@ class Cos6RingKernel
-         if(x == 0 && y == 0)
-             return weights_(radius_, radius_);
-         double d = dot(vectors_(x+radius_, y+radius_), v);
--        return (1.0 - VIGRA_CSTD::pow(1.0 - d * d, 3)) * weights_(x+radius_, y+radius_);
-+        return (1.0 - VIGRA_CSTD::pow(1.0 - d * d, 3.0)) * weights_(x+radius_, y+radius_);
-     }
- };
- 
-@@ -497,7 +497,7 @@ class Cos6Kernel
-         if(x == 0 && y == 0)
-             return weights_(radius_, radius_);
-         double d = dot(vectors_(x+radius_, y+radius_), v);
--        return (1.0 - VIGRA_CSTD::pow(1.0 - d * d, 3)) * weights_(x+radius_, y+radius_);
-+        return (1.0 - VIGRA_CSTD::pow(1.0 - d * d, 3.0)) * weights_(x+radius_, y+radius_);
-     }
- };
- 
-diff -uprN misc/vigra1.4.0/include/vigra/polynomial.hxx misc/build/vigra1.4.0/include/vigra/polynomial.hxx
---- misc/vigra1.4.0/include/vigra/polynomial.hxx	2005-12-21 05:53:42.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/polynomial.hxx	2006-08-31 12:08:15.526572000 +0200
-@@ -118,10 +118,10 @@ class PolynomialView
-             of subsequent algorithms (especially root finding) performed on the
-             polynomial.
-         */
--    PolynomialView(T * coeffs, unsigned int order, double epsilon = 1.0e-14)
-+    PolynomialView(T * coeffs, unsigned int ord, double eps = 1.0e-14)
-     : coeffs_(coeffs),
--      order_(order),
--      epsilon_(epsilon)
-+      order_(ord),
-+      epsilon_(eps)
-     {}
-     
-         /// Access the coefficient of x^i
-@@ -244,16 +244,16 @@ class PolynomialView
-         { epsilon_ = eps; }
- 
-   protected:
--    PolynomialView(double epsilon = 1e-14)
-+    PolynomialView(double eps = 1e-14)
-     : coeffs_(0),
-       order_(0),
--      epsilon_(epsilon)
-+      epsilon_(eps)
-     {}
-     
--    void setCoeffs(T * coeffs, unsigned int order)
-+    void setCoeffs(T * coeffs, unsigned int ord)
-     {
-         coeffs_ = coeffs;
--        order_ = order;
-+        order_ = ord;
-     }
-   
-     T * coeffs_;
-@@ -396,9 +396,9 @@ PolynomialView<T>::deflateConjugatePair(
-     
- template <class T>
- void 
--PolynomialView<T>::minimizeOrder(double epsilon)
-+PolynomialView<T>::minimizeOrder(double eps)
- {
--    while(std::abs(coeffs_[order_]) <= epsilon && order_ > 0)
-+    while(std::abs(coeffs_[order_]) <= eps && order_ > 0)
-             --order_;
- }
- 
-diff -uprN misc/vigra1.4.0/include/vigra/recursiveconvolution.hxx misc/build/vigra1.4.0/include/vigra/recursiveconvolution.hxx
---- misc/vigra1.4.0/include/vigra/recursiveconvolution.hxx	2005-12-21 05:53:42.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/recursiveconvolution.hxx	2006-08-31 12:08:15.553556000 +0200
-@@ -259,16 +259,16 @@ void recursiveFilterLine(SrcIterator is,
-     {    
-        // correction factors for b
-         double bright = b;
--        double bleft = VIGRA_CSTD::pow(b, w);
-+        double bleft = VIGRA_CSTD::pow(b, (double)w);
- 
-         for(x=w-1; x>=0; --x, --is, --id)
-         {    
-             TempType f = b * old;
-             old = as(is) + f;
--            double norm = (1.0 - b) / (1.0 + b - bleft - bright);
-+            double norm2 = (1.0 - b) / (1.0 + b - bleft - bright);
-             bleft /= b;
-             bright *= b;
--            ad.set(norm * (line[x] + f), id);
-+            ad.set(norm2 * (line[x] + f), id);
-         }
-     }
-     else if(border == BORDER_TREATMENT_AVOID)
-diff -uprN misc/vigra1.4.0/include/vigra/rgbvalue.hxx misc/build/vigra1.4.0/include/vigra/rgbvalue.hxx
---- misc/vigra1.4.0/include/vigra/rgbvalue.hxx	2005-12-21 05:53:43.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/rgbvalue.hxx	2006-08-31 12:31:37.392094000 +0200
-@@ -39,6 +39,10 @@
- #ifndef VIGRA_RGBVALUE_HXX
- #define VIGRA_RGBVALUE_HXX
- 
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #include <cmath>    // abs(double)
- #include <cstdlib>  // abs(int)
- #include "vigra/config.hxx"
-@@ -700,8 +704,6 @@ operator/=(RGBValue<V, RIDX, GIDX, BIDX>
-     return l;
- }
- 
--using VIGRA_CSTD::abs;
--
-     /// component-wise absolute value
- template <class T, unsigned int RIDX, unsigned int GIDX, unsigned int BIDX>
- inline
-diff -uprN misc/vigra1.4.0/include/vigra/separableconvolution.hxx misc/build/vigra1.4.0/include/vigra/separableconvolution.hxx
---- misc/vigra1.4.0/include/vigra/separableconvolution.hxx	2005-12-21 05:53:44.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/separableconvolution.hxx	2006-08-31 12:08:15.610465000 +0200
-@@ -1017,11 +1017,11 @@ class Kernel1D
-         */
-     InitProxy operator=(value_type const & v)
-     {
--        int size = right_ - left_ + 1;
-+        int sz = right_ - left_ + 1;
-         for(unsigned int i=0; i<kernel_.size(); ++i) kernel_[i] = v;
--        norm_ = (double)size*v;
-+        norm_ = (double)sz*v;
- 
--        return InitProxy(kernel_.begin(), size, norm_);
-+        return InitProxy(kernel_.begin(), sz, norm_);
-     }
- 
-         /** Destructor.
-@@ -1235,17 +1235,17 @@ class Kernel1D
-                is 1 or equals the size of the kernel.
-             \endcode
-         */
--    Kernel1D & initExplicitly(int left, int right)
-+    Kernel1D & initExplicitly(int l, int r)
-     {
--        vigra_precondition(left <= 0,
-+        vigra_precondition(l <= 0,
-                      "Kernel1D::initExplicitly(): left border must be <= 0.");
--        vigra_precondition(right >= 0,
-+        vigra_precondition(r >= 0,
-                      "Kernel1D::initExplicitly(): right border must be <= 0.");
- 
--        right_ = right;
--        left_ = left;
-+        right_ = r;
-+        left_ = l;
- 
--        kernel_.resize(right - left + 1);
-+        kernel_.resize(r - l + 1);
- 
-         return *this;
-     }
-@@ -1342,8 +1342,8 @@ class Kernel1D
- };
- 
- template <class ARITHTYPE>
--void Kernel1D<ARITHTYPE>::normalize(value_type norm,
--                          unsigned int derivativeOrder,
-+void Kernel1D<ARITHTYPE>::normalize(value_type normFactor,
-+                          unsigned int derivOrder,
-                           double offset)
- {
-     typedef typename NumericTraits<value_type>::RealPromote TmpType;
-@@ -1352,7 +1352,7 @@ void Kernel1D<ARITHTYPE>::normalize(valu
-     Iterator k = kernel_.begin();
-     TmpType sum = NumericTraits<TmpType>::zero();
- 
--    if(derivativeOrder == 0)
-+    if(derivOrder == 0)
-     {
-         for(; k < kernel_.end(); ++k)
-         {
-@@ -1362,11 +1362,11 @@ void Kernel1D<ARITHTYPE>::normalize(valu
-     else
-     {
-         unsigned int faculty = 1;
--        for(unsigned int i = 2; i <= derivativeOrder; ++i)
-+        for(unsigned int i = 2; i <= derivOrder; ++i)
-             faculty *= i;
-         for(double x = left() + offset; k < kernel_.end(); ++x, ++k)
-         {
--            sum += *k * VIGRA_CSTD::pow(-x, int(derivativeOrder)) / faculty;
-+            sum += *k * VIGRA_CSTD::pow(-x, (double)derivOrder) / faculty;
-         }
-     }
- 
-@@ -1374,21 +1374,21 @@ void Kernel1D<ARITHTYPE>::normalize(valu
-                     "Kernel1D<ARITHTYPE>::normalize(): "
-                     "Cannot normalize a kernel with sum = 0");
-     // normalize
--    sum = norm / sum;
-+    sum = normFactor / sum;
-     k = kernel_.begin();
-     for(; k != kernel_.end(); ++k)
-     {
-         *k = *k * sum;
-     }
- 
--    norm_ = norm;
-+    norm_ = normFactor;
- }
- 
- /***********************************************************************/
- 
- template <class ARITHTYPE>
- void Kernel1D<ARITHTYPE>::initGaussian(double std_dev,
--                                       value_type norm)
-+                                       value_type normFactor)
- {
-     vigra_precondition(std_dev >= 0.0,
-               "Kernel1D::initGaussian(): Standard deviation must be >= 0.");
-@@ -1421,8 +1421,8 @@ void Kernel1D<ARITHTYPE>::initGaussian(d
-         right_ = 0;
-     }
- 
--    if(norm != 0.0)
--        normalize(norm);
-+    if(normFactor != 0.0)
-+        normalize(normFactor);
-     else
-         norm_ = 1.0;
- 
-@@ -1434,7 +1434,7 @@ void Kernel1D<ARITHTYPE>::initGaussian(d
- 
- template <class ARITHTYPE>
- void Kernel1D<ARITHTYPE>::initDiscreteGaussian(double std_dev,
--                                       value_type norm)
-+                                               value_type normFactor)
- {
-     vigra_precondition(std_dev >= 0.0,
-               "Kernel1D::initDiscreteGaussian(): Standard deviation must be >= 0.");
-@@ -1476,7 +1476,7 @@ void Kernel1D<ARITHTYPE>::initDiscreteGa
-             er += warray[i];
-         }
- 
--        double scale = norm / (2*er - warray[0]);
-+        double scale = normFactor / (2*er - warray[0]);
- 
-         initExplicitly(-radius, radius);
-         iterator c = center();
-@@ -1489,12 +1489,12 @@ void Kernel1D<ARITHTYPE>::initDiscreteGa
-     else
-     {
-         kernel_.erase(kernel_.begin(), kernel_.end());
--        kernel_.push_back(norm);
-+        kernel_.push_back(normFactor);
-         left_ = 0;
-         right_ = 0;
-     }
- 
--    norm_ = norm;
-+    norm_ = normFactor;
- 
-     // best border treatment for Gaussians is BORDER_TREATMENT_REFLECT
-     border_treatment_ = BORDER_TREATMENT_REFLECT;
-@@ -1505,15 +1505,15 @@ void Kernel1D<ARITHTYPE>::initDiscreteGa
- template <class ARITHTYPE>
- void
- Kernel1D<ARITHTYPE>::initGaussianDerivative(double std_dev,
--                    int order,
--                    value_type norm)
-+                                            int order,
-+                                            value_type normFactor)
- {
-     vigra_precondition(order >= 0,
-               "Kernel1D::initGaussianDerivative(): Order must be >= 0.");
- 
-     if(order == 0)
-     {
--        initGaussian(std_dev, norm);
-+        initGaussian(std_dev, normFactor);
-         return;
-     }
- 
-@@ -1544,7 +1544,7 @@ Kernel1D<ARITHTYPE>::initGaussianDerivat
- 
-     // remove DC, but only if kernel correction is permitted by a non-zero
-     // value for norm
--    if(norm != 0.0)
-+    if(normFactor != 0.0)
-     {
-         for(unsigned int i=0; i < kernel_.size(); ++i)
-         {
-@@ -1555,8 +1555,8 @@ Kernel1D<ARITHTYPE>::initGaussianDerivat
-     left_ = -radius;
-     right_ = radius;
- 
--    if(norm != 0.0)
--        normalize(norm, order);
-+    if(normFactor != 0.0)
-+        normalize(normFactor, order);
-     else
-         norm_ = 1.0;
- 
-@@ -1570,7 +1570,7 @@ Kernel1D<ARITHTYPE>::initGaussianDerivat
- template <class ARITHTYPE>
- void
- Kernel1D<ARITHTYPE>::initBinomial(int radius,
--                                  value_type norm)
-+                                  value_type normFactor)
- {
-     vigra_precondition(radius > 0,
-               "Kernel1D::initBinomial(): Radius must be > 0.");
-@@ -1600,12 +1600,12 @@ Kernel1D<ARITHTYPE>::initBinomial(int ra
- 
-     for(i=0; i<=radius*2+1; ++i)
-     {
--        kernel_.push_back(kernel[i] * norm);
-+        kernel_.push_back(kernel[i] * normFactor);
-     }
- 
-     left_ = -radius;
-     right_ = radius;
--    norm_ = norm;
-+    norm_ = normFactor;
- 
-     // best border treatment for Binomial is BORDER_TREATMENT_REFLECT
-     border_treatment_ = BORDER_TREATMENT_REFLECT;
-@@ -1615,7 +1615,7 @@ Kernel1D<ARITHTYPE>::initBinomial(int ra
- 
- template <class ARITHTYPE>
- void Kernel1D<ARITHTYPE>::initAveraging(int radius,
--                                        value_type norm)
-+                                        value_type normFactor)
- {
-     vigra_precondition(radius > 0,
-               "Kernel1D::initAveraging(): Radius must be > 0.");
-@@ -1629,12 +1629,12 @@ void Kernel1D<ARITHTYPE>::initAveraging(
- 
-     for(int i=0; i<=radius*2+1; ++i)
-     {
--        kernel_.push_back(scale * norm);
-+        kernel_.push_back(scale * normFactor);
-     }
- 
-     left_ = -radius;
-     right_ = radius;
--    norm_ = norm;
-+    norm_ = normFactor;
- 
-     // best border treatment for Averaging is BORDER_TREATMENT_CLIP
-     border_treatment_ = BORDER_TREATMENT_CLIP;
-@@ -1644,18 +1644,18 @@ void Kernel1D<ARITHTYPE>::initAveraging(
- 
- template <class ARITHTYPE>
- void
--Kernel1D<ARITHTYPE>::initSymmetricGradient(value_type norm)
-+Kernel1D<ARITHTYPE>::initSymmetricGradient(value_type normFactor)
- {
-     kernel_.erase(kernel_.begin(), kernel_.end());
-     kernel_.reserve(3);
- 
--    kernel_.push_back(0.5 * norm);
--    kernel_.push_back(0.0 * norm);
--    kernel_.push_back(-0.5 * norm);
-+    kernel_.push_back(0.5 * normFactor);
-+    kernel_.push_back(0.0 * normFactor);
-+    kernel_.push_back(-0.5 * normFactor);
- 
-     left_ = -1;
-     right_ = 1;
--    norm_ = norm;
-+    norm_ = normFactor;
- 
-     // best border treatment for SymmetricGradient is
-     // BORDER_TREATMENT_REPEAT
-diff -uprN misc/vigra1.4.0/include/vigra/sized_int.hxx misc/build/vigra1.4.0/include/vigra/sized_int.hxx
---- misc/vigra1.4.0/include/vigra/sized_int.hxx	2005-12-21 05:53:44.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/sized_int.hxx	2006-08-31 12:26:31.937797000 +0200
-@@ -73,6 +73,10 @@ struct SelectIntegerType<SIZE, Int_type_
-     typedef Int_type_not_supported_on_this_platform type;
- };
- 
-+#if defined __SUNPRO_CC
-+#pragma disable_warn
-+#endif
-+
- template<class LIST>
- struct SelectBiggestIntegerType
- {
-@@ -86,6 +90,10 @@ struct SelectBiggestIntegerType
-        type;
- };
- 
-+#if defined __SUNPRO_CC
-+#pragma enable_warn
-+#endif
-+
- template<>
- struct SelectBiggestIntegerType<Int_type_not_supported_on_this_platform>
- {
-diff -uprN misc/vigra1.4.0/include/vigra/splines.hxx misc/build/vigra1.4.0/include/vigra/splines.hxx
---- misc/vigra1.4.0/include/vigra/splines.hxx	2005-12-21 05:53:44.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/splines.hxx	2006-08-31 12:08:15.655906000 +0200
-@@ -108,8 +108,8 @@ class BSplineBase
-         /** Create functor for gevine derivative of the spline. The spline's order
-             is specified spline by the template argument <TT>ORDER</tt>. 
-         */
--    explicit BSplineBase(unsigned int derivativeOrder = 0)
--    : s1_(derivativeOrder)
-+    explicit BSplineBase(unsigned int derivOrder = 0)
-+    : s1_(derivOrder)
-     {}
-     
-         /** Unary function call.
-@@ -280,8 +280,8 @@ class BSplineBase<0, T>
-     typedef T            result_type; 
-     enum StaticOrder { order = 0 };
- 
--    explicit BSplineBase(unsigned int derivativeOrder = 0)
--    : derivativeOrder_(derivativeOrder)
-+    explicit BSplineBase(unsigned int derivOrder = 0)
-+    : derivativeOrder_(derivOrder)
-     {}
-     
-     result_type operator()(argument_type x) const
-@@ -357,8 +357,8 @@ class BSpline<1, T>
-     typedef T            result_type; 
-     enum  StaticOrder { order = 1 };
- 
--    explicit BSpline(unsigned int derivativeOrder = 0)
--    : derivativeOrder_(derivativeOrder)
-+    explicit BSpline(unsigned int derivOrder = 0)
-+    : derivativeOrder_(derivOrder)
-     {}
-     
-     result_type operator()(argument_type x) const
-@@ -454,8 +454,8 @@ class BSpline<2, T>
-     typedef T            result_type; 
-     enum StaticOrder { order = 2 };
- 
--    explicit BSpline(unsigned int derivativeOrder = 0)
--    : derivativeOrder_(derivativeOrder)
-+    explicit BSpline(unsigned int derivOrder = 0)
-+    : derivativeOrder_(derivOrder)
-     {}
-     
-     result_type operator()(argument_type x) const
-@@ -580,8 +580,8 @@ class BSpline<3, T>
-     typedef T            result_type; 
-     enum StaticOrder { order = 3 };
- 
--    explicit BSpline(unsigned int derivativeOrder = 0)
--    : derivativeOrder_(derivativeOrder)
-+    explicit BSpline(unsigned int derivOrder = 0)
-+    : derivativeOrder_(derivOrder)
-     {}
-     
-     result_type operator()(argument_type x) const
-@@ -732,8 +732,8 @@ class BSpline<5, T>
-     typedef T            result_type; 
-     enum StaticOrder { order = 5 };
- 
--    explicit BSpline(unsigned int derivativeOrder = 0)
--    : derivativeOrder_(derivativeOrder)
-+    explicit BSpline(unsigned int derivOrder = 0)
-+    : derivativeOrder_(derivOrder)
-     {}
-     
-     result_type operator()(argument_type x) const
-diff -uprN misc/vigra1.4.0/include/vigra/static_assert.hxx misc/build/vigra1.4.0/include/vigra/static_assert.hxx
---- misc/vigra1.4.0/include/vigra/static_assert.hxx	2005-12-21 05:53:45.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/static_assert.hxx	2006-08-31 12:08:15.677548000 +0200
-@@ -115,7 +115,7 @@ assertImpl( void (*)(Predicate), typenam
-     
- TODO: provide more assertion base classes for other (non boolean) types of tests
- */
--#if !defined(__GNUC__) || __GNUC__ > 2
-+#if (!defined(__GNUC__) || __GNUC__ > 2) && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x550)
- #define VIGRA_STATIC_ASSERT(Predicate) \
- enum { \
-     VIGRA_PREPROCESSOR_CONCATENATE(vigra_assertion_in_line_, __LINE__) = sizeof( \
-diff -uprN misc/vigra1.4.0/include/vigra/tinyvector.hxx misc/build/vigra1.4.0/include/vigra/tinyvector.hxx
---- misc/vigra1.4.0/include/vigra/tinyvector.hxx	2005-12-21 05:53:46.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/tinyvector.hxx	2006-08-31 12:31:25.140791000 +0200
-@@ -39,6 +39,10 @@
- #ifndef VIGRA_TINYVECTOR_HXX
- #define VIGRA_TINYVECTOR_HXX
- 
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #include <cmath>    // abs(double)
- #include <cstdlib>  // abs(int)
- #include <iosfwd>   // ostream
-@@ -49,7 +53,6 @@
- 
- namespace vigra {
- 
--using VIGRA_CSTD::abs;
- using VIGRA_CSTD::ceil;
- using VIGRA_CSTD::floor;
- 
-@@ -439,9 +442,9 @@ class TinyVectorBase
-         /** Initialize from another sequence (must have length SIZE!)
-         */
-     template <class Iterator>
--    void init(Iterator i, Iterator end)
-+    void init(Iterator i, Iterator iend)
-     {
--		vigra_precondition(end-i == SIZE,
-+		vigra_precondition(iend-i == SIZE,
-             "TinyVector::init(): Sequence has wrong size.");
-         Loop::assignCast(data_, i);
-     }
-diff -uprN misc/vigra1.4.0/include/vigra/transformimage.hxx misc/build/vigra1.4.0/include/vigra/transformimage.hxx
---- misc/vigra1.4.0/include/vigra/transformimage.hxx	2005-12-21 05:53:46.000000000 +0100
-+++ misc/build/vigra1.4.0/include/vigra/transformimage.hxx	2006-08-31 12:08:15.727415000 +0200
-@@ -986,11 +986,11 @@ class BrightnessContrastFunctor
-     result_type operator()(argument_type const & v) const
-     {
-         promote_type v1 = (v - min_) / diff_;
--        promote_type brighter = pow(v1, b_);
-+        promote_type brighter = pow((promote_type)v1, b_);
-         promote_type v2 = 2.0 * brighter - one_;
-         promote_type contrasted = (v2 < zero_) ?
--                                     -pow(-v2, c_) :
--                                      pow(v2, c_);
-+                                     -pow((promote_type)-v2, c_) :
-+                                      pow((promote_type)v2, c_);
-         return result_type(0.5 * diff_ * (contrasted + one_) + min_);
-     }
- 
-diff -uprN misc/vigra1.4.0/include/vigra/diff2d.hxx misc/build/vigra1.4.0/include/vigra/diff2d.hxx
---- misc/vigra1.4.0/include/vigra/diff2d.hxx	2009-03-02 09:27:34.000000000 +0000
-+++ misc/build/vigra1.4.0/include/vigra/diff2d.hxx	2009-03-02 09:27:57.000000000 +0000
-@@ -1117,7 +1117,7 @@
-     bool contains(Rect2D const &r) const
-     {
-         return r.isEmpty() ||
--            contains(r.upperLeft()) && contains(r.lowerRight()-Diff2D(1,1));
-+            (contains(r.upperLeft()) && contains(r.lowerRight()-Diff2D(1,1)));
-     }
- 
-         /** Return whether this rectangle overlaps with the given
diff --git a/x11_extensions/inc/Xrandr.h b/x11_extensions/inc/Xrandr.h
deleted file mode 100644
index 2f0cb7e..0000000
--- a/x11_extensions/inc/Xrandr.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $
- *
- * Copyright © 2000 Compaq Computer Corporation, Inc.
- * Copyright © 2002 Hewlett-Packard Company, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Compaq not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  HP makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * 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 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Jim Gettys, HP Labs, HP.
- */
-
-#ifndef _XRANDR_H_
-#define _XRANDR_H_
-
-#include <X11/extensions/randr.h>
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-    
-typedef struct {
-    int	width, height;
-    int	mwidth, mheight;
-} XRRScreenSize;
-
-/*
- *  Events.
- */
-
-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 */
-    SizeID size_index;
-    SubpixelOrder subpixel_order;
-    Rotation rotation;
-    int width;
-    int height;
-    int mwidth;
-    int mheight;
-} XRRScreenChangeNotifyEvent;
-
-
-/* internal representation is private to the library */
-typedef struct _XRRScreenConfiguration XRRScreenConfiguration;	
-
-Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep);
-Status XRRQueryVersion (Display *dpy,
-                int     *major_versionp,
-                int     *minor_versionp);
-
-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, 
-               XRRScreenConfiguration *config,
-               Drawable draw,
-               int size_index,
-               Rotation rotation,
-               Time timestamp);
-
-/* added in v1.1, sorry for the lame name */
-Status XRRSetScreenConfigAndRate (Display *dpy, 
-                  XRRScreenConfiguration *config,
-                  Drawable draw,
-                  int size_index,
-                  Rotation rotation,
-                  short rate,
-                  Time timestamp);
-
-
-Rotation XRRConfigRotations(XRRScreenConfiguration *config, Rotation *current_rotation);
-
-Time XRRConfigTimes (XRRScreenConfiguration *config, Time *config_timestamp);
-
-XRRScreenSize *XRRConfigSizes(XRRScreenConfiguration *config, int *nsizes);
-
-short *XRRConfigRates (XRRScreenConfiguration *config, int sizeID, int *nrates);
-
-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
- * to avoid unneeded round trips to the X server.  These are new
- * in protocol version 0.1.
- */
-
-
-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 
- */
-
-
-Rotation XRRRotations(Display *dpy, int screen, Rotation *current_rotation);
-XRRScreenSize *XRRSizes(Display *dpy, int screen, int *nsizes);
-short *XRRRates (Display *dpy, int screen, int sizeID, int *nrates);
-Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
-
-
-/* 
- * intended to take RRScreenChangeNotify,  or 
- * ConfigureNotify (on the root window)
- * returns 1 if it is an event type it understands, 0 if not
- */
-int XRRUpdateConfiguration(XEvent *event);
-
-_XFUNCPROTOEND
-
-#endif /* _XRANDR_H_ */
diff --git a/x11_extensions/inc/Xrender.h b/x11_extensions/inc/Xrender.h
deleted file mode 100644
index 73a654a..0000000
--- a/x11_extensions/inc/Xrender.h
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * 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 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#ifndef _XRENDER_H_
-#define _XRENDER_H_
-
-#include <X11/Xlib.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-#include <X11/Xutil.h>
-
-#include <X11/extensions/render.h>
-
-typedef struct {
-    short   red;
-    short   redMask;
-    short   green;
-    short   greenMask;
-    short   blue;
-    short   blueMask;
-    short   alpha;
-    short   alphaMask;
-} XRenderDirectFormat;
-
-typedef struct {
-    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 PictFormatRedMask   (1 << 4)
-#define PictFormatGreen	    (1 << 5)
-#define PictFormatGreenMask (1 << 6)
-#define PictFormatBlue	    (1 << 7)
-#define PictFormatBlueMask  (1 << 8)
-#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;
-} XRenderPictureAttributes;
-
-typedef struct {
-    unsigned short   red;
-    unsigned short   green;
-    unsigned short   blue;
-    unsigned short   alpha;
-} XRenderColor;
-
-typedef struct _XGlyphInfo {
-    unsigned short  width;
-    unsigned short  height;
-    short	    x;
-    short	    y;
-    short	    xOff;
-    short	    yOff;
-} XGlyphInfo;
-
-typedef struct _XGlyphElt8 {
-    GlyphSet		    glyphset;
-    _Xconst char	    *chars;
-    int			    nchars;
-    int			    xOff;
-    int			    yOff;
-} XGlyphElt8;
-
-typedef struct _XGlyphElt16 {
-    GlyphSet		    glyphset;
-    _Xconst unsigned short  *chars;
-    int			    nchars;
-    int			    xOff;
-    int			    yOff;
-} XGlyphElt16;
-
-typedef struct _XGlyphElt32 {
-    GlyphSet		    glyphset;
-    _Xconst unsigned int    *chars;
-    int			    nchars;
-    int			    xOff;
-    int			    yOff;
-} XGlyphElt32;
-
-typedef double	XDouble;
-
-typedef struct _XPointDouble {
-    XDouble  x, y;
-} XPointDouble;
-
-#define XDoubleToFixed(f)    ((XFixed) ((f) * 65536))
-#define XFixedToDouble(f)    (((XDouble) (f)) / 65536)
-
-typedef int XFixed;
-
-typedef struct _XPointFixed {
-    XFixed  x, y;
-} XPointFixed;
-
-typedef struct _XLineFixed {
-    XPointFixed	p1, p2;
-} XLineFixed;
-
-typedef struct _XTriangle {
-    XPointFixed	p1, p2, p3;
-} XTriangle;
-
-typedef struct _XCircle {
-    XFixed x;
-    XFixed y;
-    XFixed radius;
-} XCircle;
-
-typedef struct _XTrapezoid {
-    XFixed  top, bottom;
-    XLineFixed	left, right;
-} XTrapezoid;
-
-typedef struct _XTransform {
-    XFixed  matrix[3][3];
-} XTransform;
-
-typedef struct _XFilters {
-    int	    nfilter;
-    char    **filter;
-    int	    nalias;
-    short   *alias;
-} XFilters;
-
-typedef struct _XIndexValue {
-    unsigned long    pixel;
-    unsigned short   red, green, blue, alpha;
-} XIndexValue;
-
-typedef struct _XAnimCursor {
-    Cursor	    cursor;
-    unsigned long   delay;
-} XAnimCursor;
-
-typedef struct _XSpanFix {
-    XFixed	    left, right, y;
-} XSpanFix;
-
-typedef struct _XTrap {
-    XSpanFix	    top, bottom;
-} XTrap;
-
-typedef struct _XLinearGradient {
-    XPointFixed p1;
-    XPointFixed p2;
-} XLinearGradient;
-
-typedef struct _XRadialGradient {
-    XCircle inner;
-    XCircle outer;
-} XRadialGradient;
-
-typedef struct _XConicalGradient {
-    XPointFixed center;
-    XFixed angle; /* in degrees */
-} XConicalGradient;
-
-_XFUNCPROTOBEGIN
-
-Bool XRenderQueryExtension (Display *dpy, int *event_basep, int *error_basep);
-
-Status XRenderQueryVersion (Display *dpy,
-                int     *major_versionp,
-                int     *minor_versionp);
-
-Status XRenderQueryFormats (Display *dpy);
-
-int XRenderQuerySubpixelOrder (Display *dpy, int screen);
-
-Bool XRenderSetSubpixelOrder (Display *dpy, int screen, int subpixel);
-
-XRenderPictFormat *
-XRenderFindVisualFormat (Display *dpy, _Xconst Visual *visual);
-
-XRenderPictFormat *
-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
-
-XRenderPictFormat *
-XRenderFindStandardFormat (Display		*dpy,
-               int			format);
-
-XIndexValue *
-XRenderQueryPictIndexValues(Display			*dpy,
-                _Xconst XRenderPictFormat	*format,
-                int				*num);
-
-Picture
-XRenderCreatePicture (Display				*dpy,
-              Drawable				drawable,
-              _Xconst XRenderPictFormat		*format,
-              unsigned long			valuemask,
-              _Xconst XRenderPictureAttributes	*attributes);
-
-void
-XRenderChangePicture (Display				*dpy,
-              Picture				picture,
-              unsigned long			valuemask,
-              _Xconst XRenderPictureAttributes  *attributes);
-
-void
-XRenderSetPictureClipRectangles (Display	    *dpy,
-                 Picture	    picture,
-                 int		    xOrigin,
-                 int		    yOrigin,
-                 _Xconst XRectangle *rects,
-                 int		    n);
-
-void
-XRenderSetPictureClipRegion (Display	    *dpy,
-                 Picture	    picture,
-                 Region	    r);
-
-void
-XRenderSetPictureTransform (Display	    *dpy,
-                Picture	    picture,
-                XTransform	    *transform);
-
-void
-XRenderFreePicture (Display                   *dpy,
-            Picture                   picture);
-
-void
-XRenderComposite (Display   *dpy,
-          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);
-
-GlyphSet
-XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format);
-
-GlyphSet
-XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing);
-
-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);
-
-void
-XRenderFreeGlyphs (Display	    *dpy,
-           GlyphSet	    glyphset,
-           _Xconst Glyph    *gids,
-           int		    nglyphs);
-
-void
-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);
-
-void
-XRenderCompositeString16 (Display		    *dpy,
-              int			    op,
-              Picture		    src,
-              Picture		    dst,
-              _Xconst XRenderPictFormat *maskFormat,
-              GlyphSet		    glyphset,
-              int			    xSrc,
-              int			    ySrc,
-              int			    xDst,
-              int			    yDst,
-              _Xconst unsigned short    *string,
-              int			    nchar);
-
-void
-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);
-
-void
-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);
-
-void
-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);
-
-void
-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);
-
-void
-XRenderFillRectangle (Display		    *dpy,
-              int		    op,
-              Picture		    dst,
-              _Xconst XRenderColor  *color,
-              int		    x,
-              int		    y,
-              unsigned int	    width,
-              unsigned int	    height);
-
-void
-XRenderFillRectangles (Display		    *dpy,
-               int		    op,
-               Picture		    dst,
-               _Xconst XRenderColor *color,
-               _Xconst XRectangle   *rectangles,
-               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);
-
-void
-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);
-
-void
-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,
-                _Xconst XPointDouble    *fpoints,
-                int			    npoints,
-                int			    winding);
-Status
-XRenderParseColor(Display	*dpy, 
-          char		*spec,
-          XRenderColor	*def);
-
-Cursor
-XRenderCreateCursor (Display	    *dpy,
-             Picture	    source,
-             unsigned int   x,
-             unsigned int   y);
-
-XFilters *
-XRenderQueryFilters (Display *dpy, Drawable drawable);
-
-void
-XRenderSetPictureFilter (Display    *dpy,
-             Picture    picture,
-             const char *filter,
-             XFixed	    *params,
-             int	    nparams);
-
-Cursor
-XRenderCreateAnimCursor (Display	*dpy,
-             int		ncursor,
-             XAnimCursor	*cursors);
-
-
-void
-XRenderAddTraps (Display	    *dpy,
-         Picture	    picture,
-         int		    xOff,
-         int		    yOff,
-         _Xconst XTrap	    *traps,
-         int		    ntrap);
-
-Picture XRenderCreateSolidFill (Display *dpy,
-                                const XRenderColor *color);
-
-Picture XRenderCreateLinearGradient (Display *dpy,
-                                     const XLinearGradient *gradient,
-                                     const XFixed *stops,
-                                     const XRenderColor *colors,
-                                     int nstops);
-
-Picture XRenderCreateRadialGradient (Display *dpy,
-                                     const XRadialGradient *gradient,
-                                     const XFixed *stops,
-                                     const XRenderColor *colors,
-                                     int nstops);
-
-Picture XRenderCreateConicalGradient (Display *dpy,
-                                      const XConicalGradient *gradient,
-                                      const XFixed *stops,
-                                      const XRenderColor *colors,
-                                      int nstops);
-
-_XFUNCPROTOEND
-
-#endif /* _XRENDER_H_ */
diff --git a/x11_extensions/inc/randr.h b/x11_extensions/inc/randr.h
deleted file mode 100644
index 864ddd4..0000000
--- a/x11_extensions/inc/randr.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * $XFree86: xc/include/extensions/randr.h,v 1.4 2001/11/24 07:24:58 keithp Exp $
- *
- * Copyright © 2000, Compaq Computer Corporation, 
- * Copyright © 2002, Hewlett Packard, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Compaq or HP not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  HP makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * 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 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
- */
-
-#ifndef _RANDR_H_
-#define _RANDR_H_
-
-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 RRNumberErrors		0
-#define RRNumberEvents		1
-
-#define X_RRQueryVersion	0
-/* we skip 1 to make old clients fail pretty immediately */
-#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
-/* 3 used to be ScreenChangeSelectInput; deprecated */
-#define X_RRSelectInput		4
-#define X_RRGetScreenInfo	5
-
-/* used in XRRSelectInput */
-
-#define RRScreenChangeNotifyMask  (1L << 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
-
-/* new in 1.0 protocol, to allow reflection of screen */
-
-#define RR_Reflect_X		16
-#define RR_Reflect_Y		32
-
-#define RRSetConfigSuccess		0
-#define RRSetConfigInvalidConfigTime	1
-#define RRSetConfigInvalidTime		2
-#define RRSetConfigFailed		3
-
-#endif	/* _RANDR_H_ */
diff --git a/x11_extensions/inc/randrproto.h b/x11_extensions/inc/randrproto.h
deleted file mode 100644
index 04d62fc..0000000
--- a/x11_extensions/inc/randrproto.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * $XFree86: xc/include/extensions/randrproto.h,v 1.6 2002/09/29 23:39:43 keithp Exp $
- *
- * Copyright © 2000 Compaq Computer Corporation
- * Copyright © 2002 Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Compaq or HP not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.  Compaq and HP makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * 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 
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Jim Gettys, Hewlett-Packard Company, Inc.
- */
-
-/* note that RANDR 1.0 is incompatible with version 0.0, or 0.1 */
-/* V1.0 removes depth switching from the protocol */
-#ifndef _XRANDRP_H_
-#define _XRANDRP_H_
-
-#include <X11/extensions/randr.h>
-
-#define Window CARD32
-#define Drawable CARD32
-#define Font CARD32
-#define Pixmap CARD32
-#define Cursor CARD32
-#define Colormap CARD32
-#define GContext CARD32
-#define Atom CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define KeySym CARD32
-
-#define Rotation CARD16
-#define SizeID CARD16
-#define SubpixelOrder CARD16
-
-/*
- * data structures
- */
-
-typedef struct {
-    CARD16 widthInPixels B16;
-    CARD16 heightInPixels B16;
-    CARD16 widthInMillimeters B16;
-    CARD16 heightInMillimeters B16;
-} xScreenSizes;
-#define sz_xScreenSizes 8
-
-/* 
- * requests and replies
- */
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-} xRRQueryVersionReq;
-#define sz_xRRQueryVersionReq   12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xRRQueryVersionReply;
-#define sz_xRRQueryVersionReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-} xRRGetScreenInfoReq;
-#define sz_xRRGetScreenInfoReq   8
-
-/* 
- * the xRRScreenInfoReply structure is followed by:
- *
- * the size information
- */
-
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    setOfRotations;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    Window  root B32;
-    Time    timestamp B32;
-    Time    configTimestamp B32;
-    CARD16  nSizes B16;
-    SizeID  sizeID B16;
-    Rotation  rotation B16;
-    CARD16  rate B16;
-    CARD16  nrateEnts B16;
-    CARD16  pad B16;
-} xRRGetScreenInfoReply;
-#define sz_xRRGetScreenInfoReply	32
-
-typedef struct {
-    CARD8    reqType;
-    CARD8    randrReqType;
-    CARD16   length B16;
-    Drawable drawable B32;
-    Time     timestamp B32;
-    Time     configTimestamp B32;
-    SizeID   sizeID B16;
-    Rotation rotation B16;
-} xRR1_0SetScreenConfigReq;
-#define sz_xRR1_0SetScreenConfigReq   20
-
-typedef struct {
-    CARD8    reqType;
-    CARD8    randrReqType;
-    CARD16   length B16;
-    Drawable drawable B32;
-    Time     timestamp B32;
-    Time     configTimestamp B32;
-    SizeID   sizeID B16;
-    Rotation rotation B16;
-    CARD16   rate B16;
-    CARD16   pad B16;
-} xRRSetScreenConfigReq;
-#define sz_xRRSetScreenConfigReq   24
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    CARD8   status;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    Time    newTimestamp B32;  
-    Time    newConfigTimestamp B32;
-    Window  root;
-    CARD16  subpixelOrder B16;
-    CARD16  pad4 B16;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-} xRRSetScreenConfigReply;
-#define sz_xRRSetScreenConfigReply 32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-    CARD16  enable B16;
-    CARD16  pad2 B16;
-} xRRSelectInputReq;
-#define sz_xRRSelectInputReq   12
-
-#define sz_xRRSelectInputReq   12
-
-/*
- * event
- */
-typedef struct {
-    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 */
-    CARD16 heightInPixels B16;
-    CARD16 widthInMillimeters B16;
-    CARD16 heightInMillimeters B16;
-} xRRScreenChangeNotifyEvent;
-#define sz_xRRScreenChangeNotifyEvent	32
-
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef Atom
-#undef Time
-#undef KeyCode
-#undef KeySym
-#undef Rotation
-#undef SizeID
-#undef SubpixelOrder
-
-#endif /* _XRANDRP_H_ */
diff --git a/x11_extensions/inc/render.h b/x11_extensions/inc/render.h
deleted file mode 100644
index 497af6d..0000000
--- a/x11_extensions/inc/render.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * $XFree86: xc/include/extensions/render.h,v 1.10 2002/11/06 22:47:49 keithp Exp $
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * 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
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#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
-#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
-/* 0.5 */
-#define X_RenderCreateCursor		    27
-/* 0.6 */
-#define X_RenderSetPictureTransform	    28
-#define X_RenderQueryFilters		    29
-#define X_RenderSetPictureFilter	    30
-/* 0.8 */
-#define X_RenderCreateAnimCursor	    31
-/* 0.9 */
-#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
-
-/*
- * 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
-
-/* Filters included in 0.6 */
-#define FilterNearest			    "nearest"
-#define FilterBilinear			    "bilinear"
-/* Filters included in 0.10 */
-#define FilterConvolution		    "convolution"
-
-#define FilterFast			    "fast"
-#define FilterGood			    "good"
-#define FilterBest			    "best"
-
-#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
-
-/* Extended repeat attributes included in 0.10 */
-#define RepeatNone                          0
-#define RepeatNormal                        1
-#define RepeatPad                           2
-#define RepeatReflect                       3
-
-#endif	/* _RENDER_H_ */
diff --git a/x11_extensions/inc/renderproto.h b/x11_extensions/inc/renderproto.h
deleted file mode 100644
index ffe0639..0000000
--- a/x11_extensions/inc/renderproto.h
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * $XFree86: xc/include/extensions/renderproto.h,v 1.12 2002/09/26 02:56:48 keithp Exp $
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * 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
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-#ifndef _XRENDERP_H_
-#define _XRENDERP_H_
-
-#include <X11/Xmd.h>
-#include <X11/extensions/render.h>
-
-#define Window CARD32
-#define Drawable CARD32
-#define Font CARD32
-#define Pixmap CARD32
-#define Cursor CARD32
-#define Colormap CARD32
-#define GContext CARD32
-#define Atom CARD32
-#define VisualID CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define KeySym CARD32
-
-#define Picture	    CARD32
-#define PictFormat  CARD32
-#define Fixed	    INT32
-#define Glyphset    CARD32
-
-/*
- * data structures
- */
-
-typedef struct {
-    CARD16  red B16;
-    CARD16  redMask B16;
-    CARD16  green B16;
-    CARD16  greenMask B16;
-    CARD16  blue B16;
-    CARD16  blueMask B16;
-    CARD16  alpha B16;
-    CARD16  alphaMask B16;
-} xDirectFormat;
-
-#define sz_xDirectFormat    16
-
-typedef struct {
-    PictFormat	id B32;
-    CARD8	type;
-    CARD8	depth;
-    CARD16	pad1 B16;
-    xDirectFormat   direct;
-    Colormap	colormap;
-} xPictFormInfo;
-
-#define sz_xPictFormInfo    28
-
-typedef struct {
-    VisualID	visual;
-    PictFormat	format;
-} xPictVisual;
-
-#define sz_xPictVisual	    8
-
-typedef struct {
-    CARD8	depth;
-    CARD8	pad1;
-    CARD16	nPictVisuals B16;
-    CARD32	pad2 B32;
-} xPictDepth;
-
-#define sz_xPictDepth	8
-
-typedef struct {
-    CARD32	nDepth B32;
-    PictFormat	fallback B32;
-} xPictScreen;
-
-#define sz_xPictScreen	8
-
-typedef struct {
-    CARD32	pixel B32;
-    CARD16	red B16;
-    CARD16	green B16;
-    CARD16	blue B16;
-    CARD16	alpha B16;
-} xIndexValue;
-
-#define sz_xIndexValue	12
-
-typedef struct {
-    CARD16	red B16;
-    CARD16	green B16;
-    CARD16	blue B16;
-    CARD16	alpha B16;
-} xRenderColor;
-
-#define sz_xRenderColor	8
-
-typedef struct {
-    Fixed	x B32;
-    Fixed	y B32;
-} xPointFixed;
-
-#define sz_xPointFixed	8
-
-typedef struct {
-    xPointFixed	p1;
-    xPointFixed p2;
-} xLineFixed;
-
-#define sz_xLineFixed	16
-
-typedef struct {
-    xPointFixed	p1, p2, p3;
-} xTriangle;
-
-#define sz_xTriangle	24
-
-typedef struct {
-    Fixed	top B32;
-    Fixed	bottom B32;
-    xLineFixed	left;
-    xLineFixed	right;
-} xTrapezoid;
-
-#define sz_xTrapezoid	40
-
-typedef struct {
-    CARD16  width B16;
-    CARD16  height B16;
-    INT16   x B16;
-    INT16   y B16;
-    INT16   xOff B16;
-    INT16   yOff B16;
-} xGlyphInfo;
-
-#define sz_xGlyphInfo	12
-
-typedef struct {
-    CARD8   len;
-    CARD8   pad1;
-    CARD16  pad2;
-    INT16   deltax;
-    INT16   deltay;
-} xGlyphElt;
-
-#define sz_xGlyphElt	8
-
-typedef struct {
-    Fixed   l, r, y;
-} xSpanFix;
-
-#define sz_xSpanFix	12
-
-typedef struct {
-    xSpanFix	top, bot;
-} xTrap;
-
-#define sz_xTrap	24
-
-/*
- * requests and replies
- */
-typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-} xRenderQueryVersionReq;
-
-#define sz_xRenderQueryVersionReq   12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xRenderQueryVersionReply;
-
-#define sz_xRenderQueryVersionReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-} xRenderQueryPictFormatsReq;
-
-#define sz_xRenderQueryPictFormatsReq	4
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  numFormats B32;
-    CARD32  numScreens B32;
-    CARD32  numDepths B32;
-    CARD32  numVisuals B32;
-    CARD32  numSubpixel B32;	    /* Version 0.6 */
-    CARD32  pad5 B32;
-} xRenderQueryPictFormatsReply;
-
-#define sz_xRenderQueryPictFormatsReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   renderReqType;
-    CARD16  length B16;
-    PictFormat	format B32;
-} xRenderQueryPictIndexValuesReq;
-
-#define sz_xRenderQueryPictIndexValuesReq   8
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  numIndexValues;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-} xRenderQueryPictIndexValuesReply;
-
-#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;
-} xRenderCreatePictureReq;
-
-#define sz_xRenderCreatePictureReq	    20
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	renderReqType;
-    CARD16	length B16;
-    Picture	picture B32;
-    CARD32	mask B32;
-} xRenderChangePictureReq;
-
-#define sz_xRenderChangePictureReq	    12
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Picture     picture B32;
-    INT16	xOrigin B16;
-    INT16	yOrigin B16;
-} xRenderSetPictureClipRectanglesReq;
-
-#define sz_xRenderSetPictureClipRectanglesReq	    12
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Picture     picture B32;
-} xRenderFreePictureReq;
-
-#define sz_xRenderFreePictureReq	    8
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	src B32;
-    Picture	mask B32;
-    Picture	dst B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-    INT16	xMask B16;
-    INT16	yMask B16;
-    INT16	xDst B16;
-    INT16	yDst B16;
-    CARD16	width B16;
-    CARD16	height B16;
-} xRenderCompositeReq;
-
-#define sz_xRenderCompositeReq		    36
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Picture	src B32;
-    Picture	dst B32;
-    CARD32	colorScale B32;
-    CARD32	alphaScale B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-    INT16	xDst B16;
-    INT16	yDst B16;
-    CARD16	width B16;
-    CARD16	height B16;
-} xRenderScaleReq;
-
-#define sz_xRenderScaleReq			    32
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	src B32;
-    Picture	dst B32;
-    PictFormat	maskFormat B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-} xRenderTrapezoidsReq;
-
-#define sz_xRenderTrapezoidsReq			    24
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	src B32;
-    Picture	dst B32;
-    PictFormat	maskFormat B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-} xRenderTrianglesReq;
-
-#define sz_xRenderTrianglesReq			    24
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	src B32;
-    Picture	dst B32;
-    PictFormat	maskFormat B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-} xRenderTriStripReq;
-
-#define sz_xRenderTriStripReq			    24
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	src B32;
-    Picture	dst B32;
-    PictFormat	maskFormat B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-} xRenderTriFanReq;
-
-#define sz_xRenderTriFanReq			    24
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Glyphset	gsid B32;
-    PictFormat	format B32;
-} xRenderCreateGlyphSetReq;
-
-#define sz_xRenderCreateGlyphSetReq		    12
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Glyphset    gsid B32;
-    Glyphset    existing B32;
-} xRenderReferenceGlyphSetReq;
-
-#define sz_xRenderReferenceGlyphSetReq		    24
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Glyphset    glyphset B32;
-} xRenderFreeGlyphSetReq;
-
-#define sz_xRenderFreeGlyphSetReq		    8
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Glyphset    glyphset B32;
-    CARD32	nglyphs;
-} xRenderAddGlyphsReq;
-
-#define sz_xRenderAddGlyphsReq			    12
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    Glyphset    glyphset B32;
-} xRenderFreeGlyphsReq;
-
-#define sz_xRenderFreeGlyphsReq			    8
-
-typedef struct {
-    CARD8       reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	src B32;
-    Picture	dst B32;
-    PictFormat	maskFormat B32;
-    Glyphset    glyphset B32;
-    INT16	xSrc B16;
-    INT16	ySrc B16;
-} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req,
-xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req;
-
-#define sz_xRenderCompositeGlyphs8Req		    28
-#define sz_xRenderCompositeGlyphs16Req		    28
-#define sz_xRenderCompositeGlyphs32Req		    28
-
-/* 0.1 and higher */
-
-typedef struct {
-    CARD8	reqType;
-    CARD8       renderReqType;
-    CARD16      length B16;
-    CARD8	op;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    Picture	dst B32;
-    xRenderColor    color;
-} xRenderFillRectanglesReq;
-
-#define sz_xRenderFillRectanglesReq		    20
-
-/* 0.5 and higher */
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	renderReqType;
-    CARD16	length B16;
-    Cursor	cid B32;
-    Picture	src B32;
-    CARD16	x B16;
-    CARD16	y B16;
-} xRenderCreateCursorReq;
-
-#define sz_xRenderCreateCursorReq		    16
-
-/* 0.6 and higher */
-
-/*
- * This can't use an array because 32-bit values may be in bitfields
- */
-typedef struct {
-    Fixed	matrix11 B32;
-    Fixed	matrix12 B32;
-    Fixed	matrix13 B32;
-    Fixed	matrix21 B32;
-    Fixed	matrix22 B32;
-    Fixed	matrix23 B32;
-    Fixed	matrix31 B32;
-    Fixed	matrix32 B32;
-    Fixed	matrix33 B32;
-} xRenderTransform;
-
-#define sz_xRenderTransform 36
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		renderReqType;
-    CARD16		length B16;
-    Picture		picture B32;
-    xRenderTransform	transform;
-} xRenderSetPictureTransformReq;
-
-#define sz_xRenderSetPictureTransformReq	    44
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		renderReqType;
-    CARD16		length B16;
-    Drawable		drawable B32;
-} xRenderQueryFiltersReq;
-
-#define sz_xRenderQueryFiltersReq		    8
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  numAliases B32;	/* LISTofCARD16 */
-    CARD32  numFilters B32;	/* LISTofSTRING8 */
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xRenderQueryFiltersReply;
-
-#define sz_xRenderQueryFiltersReply		    32
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		renderReqType;
-    CARD16		length B16;
-    Picture		picture B32;
-    CARD16		nbytes B16; /* number of bytes in name */
-    CARD16		pad B16;
-} xRenderSetPictureFilterReq;
-
-#define sz_xRenderSetPictureFilterReq		    12
-
-/* 0.8 and higher */
-
-typedef struct {
-    Cursor		cursor B32;
-    CARD32		delay B32;
-} xAnimCursorElt;
-
-#define sz_xAnimCursorElt			    8
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		renderReqType;
-    CARD16		length B16;
-    Cursor		cid B32;
-} xRenderCreateAnimCursorReq;
-
-#define sz_xRenderCreateAnimCursorReq		    8
-
-/* 0.9 and higher */
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		renderReqType;
-    CARD16		length B16;
-    Picture		picture;
-    INT16		xOff B16;
-    INT16		yOff B16;
-} xRenderAddTrapsReq;
-
-#define sz_xRenderAddTrapsReq			    12
-
-/* 0.10 and higher */
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	renderReqType;
-    CARD16	length B16;
-    Picture	pid B32;
-    xRenderColor color;
-} xRenderCreateSolidFillReq;
-
-#define sz_xRenderCreateSolidFillReq                 16
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	renderReqType;
-    CARD16	length B16;
-    Picture	pid B32;
-    xPointFixed p1;
-    xPointFixed p2;
-    CARD32      nStops;
-} xRenderCreateLinearGradientReq;
-
-#define sz_xRenderCreateLinearGradientReq                 28
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	renderReqType;
-    CARD16	length B16;
-    Picture	pid B32;
-    xPointFixed inner;
-    xPointFixed outer;
-    Fixed       inner_radius;
-    Fixed       outer_radius;
-    CARD32      nStops;
-} xRenderCreateRadialGradientReq;
-
-#define sz_xRenderCreateRadialGradientReq                 36
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	renderReqType;
-    CARD16	length B16;
-    Picture	pid B32;
-    xPointFixed center;
-    Fixed       angle; /* in degrees */
-    CARD32      nStops;
-} xRenderCreateConicalGradientReq;
-
-#define sz_xRenderCreateConicalGradientReq                 24
-
-#undef Window
-#undef Drawable
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef Atom
-#undef VisualID
-#undef Time
-#undef KeyCode
-#undef KeySym
-
-#undef Picture
-#undef PictFormat
-#undef Fixed
-#undef Glyphset
-
-#endif /* _XRENDERP_H_ */
diff --git a/x11_extensions/inc/shape.h b/x11_extensions/inc/shape.h
deleted file mode 100644
index 7992f7a..0000000
--- a/x11_extensions/inc/shape.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
-/************************************************************
-
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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 THE
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-********************************************************/
-
-/* $Xorg: shape.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _SHAPE_H_
-#define _SHAPE_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/shapeconst.h>
-
-#ifndef _SHAPE_SERVER_
-#include <X11/Xutil.h>
-
-typedef struct {
-    int	type;		    /* of event */
-    unsigned long serial;   /* # of last request processed by server */
-    Bool send_event;	    /* true if this came frome a SendEvent request */
-    Display *display;	    /* Display the event was read from */
-    Window window;	    /* window of event */
-    int kind;		    /* ShapeBounding or ShapeClip */
-    int x, y;		    /* extents of new region */
-    unsigned width, height;
-    Time time;		    /* server timestamp when region changed */
-    Bool shaped;	    /* true if the region exists */
-} XShapeEvent;
-
-_XFUNCPROTOBEGIN
-
-extern Bool XShapeQueryExtension (
-    Display*	/* display */,
-    int*	/* event_base */,
-    int*	/* error_base */
-);
-
-extern Status XShapeQueryVersion (
-    Display*	/* display */,
-    int*	/* major_version */,
-    int*	/* minor_version */
-);
-
-extern void XShapeCombineRegion (
-    Display*	/* display */,
-    Window	/* dest */,
-    int		/* dest_kind */,
-    int		/* x_off */,
-    int		/* y_off */,
-    Region	/* region */,
-    int		/* op */
-);
-
-extern void XShapeCombineRectangles (
-    Display*	/* display */,
-    Window	/* dest */,
-    int		/* dest_kind */,
-    int		/* x_off */,
-    int		/* y_off */,
-    XRectangle*	/* rectangles */,
-    int		/* n_rects */,
-    int		/* op */,
-    int		/* ordering */
-);
-
-extern void XShapeCombineMask (
-    Display*	/* display */,
-    Window	/* dest */,
-    int		/* dest_kind */,
-    int		/* x_off */,
-    int		/* y_off */,
-    Pixmap	/* src */,
-    int		/* op */
-);
-
-extern void XShapeCombineShape (
-    Display*	/* display */,
-    Window	/* dest */,
-    int		/* dest_kind */,
-    int		/* x_off */,
-    int		/* y_off */,
-    Window	/* src */,
-    int		/* src_kind */,
-    int		/* op */
-);
-
-extern void XShapeOffsetShape (
-    Display*	/* display */,
-    Window	/* dest */,
-    int		/* dest_kind */,
-    int		/* x_off */,
-    int		/* y_off */
-);
-
-extern Status XShapeQueryExtents (
-    Display*		/* display */,
-    Window		/* window */,
-    Bool*		/* bounding_shaped */,
-    int*		/* x_bounding */,
-    int*		/* y_bounding */,
-    unsigned int*	/* w_bounding */,
-    unsigned int*	/* h_bounding */,
-    Bool*		/* clip_shaped */,
-    int*		/* x_clip */,
-    int*		/* y_clip */,
-    unsigned int*	/* w_clip */,
-    unsigned int*	/* h_clip */
-);
-
-extern void XShapeSelectInput (
-    Display*		/* display */,
-    Window		/* window */,
-    unsigned long	/* mask */
-);
-
-extern unsigned long XShapeInputSelected (
-    Display*	/* display */,
-    Window	/* window */
-);
-
-extern XRectangle *XShapeGetRectangles (
-    Display*	/* display */,
-    Window	/* window */,
-    int		/* kind */,
-    int*	/* count */,
-    int*	/* ordering */
-);
-
-_XFUNCPROTOEND
-
-#endif /* !_SHAPE_SERVER_ */
-
-#endif /* _SHAPE_H_ */
diff --git a/x11_extensions/inc/shapeconst.h b/x11_extensions/inc/shapeconst.h
deleted file mode 100644
index 9088956..0000000
--- a/x11_extensions/inc/shapeconst.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/************************************************************
-
-Copyright 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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 THE
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-********************************************************/
-
-#ifndef _SHAPECONST_H_
-#define _SHAPECONST_H_
-
-/*
- * Protocol requests constants and alignment values
- * These would really be in SHAPE's X.h and Xproto.h equivalents
- */
-
-#define SHAPENAME "SHAPE"
-
-#define SHAPE_MAJOR_VERSION	1	/* current version numbers */
-#define SHAPE_MINOR_VERSION	1
-
-#define ShapeSet			0
-#define ShapeUnion			1
-#define ShapeIntersect			2
-#define ShapeSubtract			3
-#define ShapeInvert			4
-
-#define ShapeBounding			0
-#define ShapeClip			1
-#define ShapeInput			2
-
-#define ShapeNotifyMask			(1L << 0)
-#define ShapeNotify			0
-
-#define ShapeNumberEvents		(ShapeNotify + 1)
-
-#endif /* _SHAPECONST_H_ */
diff --git a/x11_extensions/prj/build.lst b/x11_extensions/prj/build.lst
deleted file mode 100644
index c4d6b1d..0000000
--- a/x11_extensions/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-x1  x11_extensions : solenv NULL
-x1  x11_extensions                         usr1    -   u     x11_mkout NULL
-
diff --git a/x11_extensions/prj/d.lst b/x11_extensions/prj/d.lst
deleted file mode 100644
index d3c8c6a..0000000
--- a/x11_extensions/prj/d.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\X11
-mkdir: %_DEST%\inc\X11\extensions
-
-..\inc\*.h %_DEST%\inc\X11\extensions\*.h
-
diff --git a/xsltml/README b/xsltml/README
deleted file mode 100755
index b991b22..0000000
--- a/xsltml/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Date: 2009-02-19
-
-This project is used in the Wiki filter that is installed
-with the WikiPublisher extension. The extension is built
-in mudule swext.
-
-Building of the module provides a set of xslt transformation
-related files that are used by the filter to transform
-embedded formula objects into media wiki format.
-
-The archive was downloaded from:
-http://xsltml.sourceforge.net
-on 2009-02-16.
-
diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk
deleted file mode 100755
index 7c1a37c..0000000
--- a/xsltml/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=xsltml
-TARGET=xsltml
-
-.IF "$(ENABLE_MEDIAWIKI)" == "YES"
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=xsltml_2.1.2
-TARFILE_MD5=a7983f859eafb2677d7ff386a023bc40
-PATCH_FILES=$(TARFILE_NAME).patch
-TARFILE_IS_FLAT:=TRUE
-
-CONVERTFILES=\
-    README \
-    entities.xsl \
-    glayout.xsl \
-    mmltex.xsl \
-    cmarkup.xsl \
-    scripts.xsl \
-    tables.xsl \
-    tokens.xsl \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-
-.ELSE
-@all:
-    @echo "MediaWiki Publisher extension disabled."
-.ENDIF
-
diff --git a/xsltml/prj/build.lst b/xsltml/prj/build.lst
deleted file mode 100644
index fe09f17..0000000
--- a/xsltml/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-xm  xsltml :	solenv external NULL
-xm	xsltml		usr1	-	all	xm_mkout    NULL
-xm	xsltml		nmake	-	all	xm_xsltml   NULL
diff --git a/xsltml/prj/d.lst b/xsltml/prj/d.lst
deleted file mode 100644
index ee5b0e2..0000000
--- a/xsltml/prj/d.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\bin\xslt
-mkdir: %_DEST%\bin\xslt\export
-mkdir: %_DEST%\bin\xslt\export\xsltml
-
-..\%__SRC%\misc\build\xsltml_2.1.2\*.xsl %_DEST%\bin\xslt\export\xsltml\*.xsl
-
diff --git a/xsltml/xsltml_2.1.2.patch b/xsltml/xsltml_2.1.2.patch
deleted file mode 100644
index 04de2ea..0000000
--- a/xsltml/xsltml_2.1.2.patch
+++ /dev/null
@@ -1,1747 +0,0 @@
---- misc/xsltml_2.1.2/cmarkup.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/cmarkup.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -5,9 +5,9 @@
- 		version='1.0'>
-                 
- <!-- ====================================================================== -->
--<!-- $Id: cmarkup.xsl,v 1.8 2003/06/10 12:24:04 shade33 Exp $
-+<!-- $Id: cmarkup.xsl 2755 2008-03-07 20:35:56Z hauma $
-      This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
-+     See ./README or http://xsltml.sf.net for
-      copyright and other information                                        -->
- <!-- ====================================================================== -->
- 
-@@ -156,7 +156,7 @@
- 		<xsl:text> &amp; \text{if $</xsl:text>
- 		<xsl:apply-templates select="*[2]"/>
- 		<xsl:text>$}</xsl:text>
--		<xsl:if test="not(position()=last()) or ../m:otherwise"><xsl:text>\\ </xsl:text></xsl:if>
-+		<xsl:if test="not(position()=last()) or ../m:otherwise"><xsl:text>\\ &#13;&#10;</xsl:text></xsl:if>
- </xsl:template>
- 
- <xsl:template match="m:otherwise">
-@@ -223,7 +223,7 @@
- <xsl:template match="m:apply[*[1][self::m:minus] and count(*)=2]">
- 	<xsl:text>-</xsl:text>
- 	<xsl:apply-templates select="*[2]">
--		<xsl:with-param name="p" select="5"/>
-+		<xsl:with-param name="p" select="2"/>
- 	</xsl:apply-templates>
- </xsl:template>
- 
-@@ -234,7 +234,8 @@
- 		<xsl:with-param name="p" select="$p"/>
- 		<xsl:with-param name="this-p" select="2"/>
- 	</xsl:call-template>
--</xsl:template>
-+</xsl:template> 
-+
- 
- <!-- 4.4.3.6  plus-->
- <xsl:template match="m:apply[*[1][self::m:plus]]">
-@@ -585,12 +586,15 @@
- </xsl:template>
- 
- <xsl:template match="m:apply[*[1][self::m:partialdiff]]" priority="1">
--	<xsl:text>\frac{\partial^{</xsl:text>
-+	<xsl:text>\frac{\partial</xsl:text>
- 	<xsl:choose>
- 		<xsl:when test="m:degree">
-+			<xsl:text>^{</xsl:text>	
- 			<xsl:apply-templates select="m:degree/node()"/>
-+			<xsl:text>}</xsl:text>		
- 		</xsl:when>
- 		<xsl:when test="m:bvar/m:degree[string(number(.))='NaN']">
-+			<xsl:text>^{</xsl:text>
- 			<xsl:for-each select="m:bvar/m:degree">
- 				<xsl:apply-templates select="node()"/>
- 				<xsl:if test="position()&lt;last()"><xsl:text>+</xsl:text></xsl:if>
-@@ -599,12 +603,15 @@
- 				<xsl:text>+</xsl:text>
- 				<xsl:value-of select="count(m:bvar[not(m:degree)])"/>
- 			</xsl:if>
-+			<xsl:text>}</xsl:text>			
-+		</xsl:when>
-+		<xsl:when test="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)]) > 1">
-+				<xsl:text>^{</xsl:text>
-+				<xsl:value-of select="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)])"/>
-+				<xsl:text>}</xsl:text>		
- 		</xsl:when>
--		<xsl:otherwise>
--			<xsl:value-of select="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)])"/>
--		</xsl:otherwise>
- 	</xsl:choose>
--	<xsl:text>}</xsl:text>
-+	<xsl:text> </xsl:text>		
- 	<xsl:apply-templates select="*[last()]"/>
- 	<xsl:text>}{</xsl:text>
- 	<xsl:for-each select="m:bvar">
-@@ -943,7 +950,7 @@
- 	<xsl:text>\left(\begin{array}{c}</xsl:text>
- 	<xsl:for-each select="*">
- 		<xsl:apply-templates select="."/>
--		<xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if>
-+		<xsl:if test="position()!=last()"><xsl:text>\\ &#13;&#10;</xsl:text></xsl:if>
- 	</xsl:for-each>
- 	<xsl:text>\end{array}\right)</xsl:text>
- </xsl:template>
-@@ -961,7 +968,7 @@
- 		<xsl:apply-templates select="."/>
- 		<xsl:if test="position()!=last()"><xsl:text> &amp; </xsl:text></xsl:if>
- 	</xsl:for-each>
--	<xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if>
-+	<xsl:if test="position()!=last()"><xsl:text>\\ &#13;&#10;</xsl:text></xsl:if>
- </xsl:template>
- 
- <!-- 4.4.10.4 determinant  -->
-@@ -1103,4 +1110,4 @@
- 	<xsl:if test="$this-p &lt; $p"><xsl:text>)</xsl:text></xsl:if>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
---- misc/xsltml_2.1.2/entities.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/entities.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -4,17 +4,56 @@
-                 version='1.0'>
-                 
- <!-- ====================================================================== -->
--<!-- $Id: entities.xsl,v 1.13 2003/06/10 12:28:03 shade33 Exp $
-+<!-- $Id: entities.xsl 2755 2008-03-07 20:35:56Z hauma $
-      This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
-+     See ./README or http://xsltml.sf.net for
-      copyright and other information                                        -->
- <!-- ====================================================================== -->
-+<xsl:variable name="apos">'</xsl:variable>
-+
-+<!-- 
-+	Missing MathML equivalents for: 
-+
-+	a \leslant b
-+	a \geslant b
-+	
-+	Unsupported in WikiMedia:
-+	
-+	\oiint x
-+	\oiiint x
-+	ƛ
-+	\adots
-+	
-+ -->
- 
- <xsl:template name="replaceEntities">
- 	<xsl:param name="content"/>
- 	<xsl:if test="string-length($content)>0">
- 	<xsl:choose>
- 		<xsl:when test="starts-with($content,' ')"><xsl:value-of select="'\; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ' ')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02009;&#x0200A;&#x0200A;')"><xsl:value-of select="'\; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02009;&#x0200A;&#x0200A;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00023;')"><xsl:value-of select="'\# '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00023;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00024;')"><xsl:value-of select="'\$ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00024;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00025;')"><xsl:value-of select="'\% '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00025;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00026;')"><xsl:value-of select="'\&amp; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00026;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0002A;')"><xsl:value-of select="'\ast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0002A;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0003A;')"><xsl:value-of select="'\colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0003A;')"/></xsl:call-template></xsl:when>
-+		<!-- Note: \less is not supported by WikiMedia. -->
-+		<xsl:when test="starts-with($content,'&#x0003C;')"><xsl:value-of select="'&lt; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0003C;')"/></xsl:call-template></xsl:when>
-+		<!-- Note: \greater is not supported by WikiMedia. -->
-+		<xsl:when test="starts-with($content,'&#x0003E;')"><xsl:value-of select="'&gt; '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0003E;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0005B;')"><xsl:value-of select="'\lbrack '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0005B;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0005C;')"><xsl:value-of select="'\backslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0005C;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0005D;')"><xsl:value-of select="'\rbrack '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0005D;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0005E;')"><xsl:value-of select="'\textasciicircumflex '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0005E;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0005F;')"><xsl:value-of select="'\_ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0005F;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00060;')"><xsl:value-of select="'\textasciigrave '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00060;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0007B;')"><xsl:value-of select="'\lbrace '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0007B;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0007C;')"><xsl:value-of select="'\vert '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0007C;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0007D;')"><xsl:value-of select="'\rbrace '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0007D;')"/></xsl:call-template></xsl:when>
-+		<!-- Note: \textasciitilde is not supported by WikiMedia. -->
-+		<xsl:when test="starts-with($content,'&#x0007E;')"><xsl:value-of select="'\sim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0007E;')"/></xsl:call-template></xsl:when>
-+
- 		<xsl:when test="starts-with($content,'&#x0025B;')"><xsl:value-of select="'\varepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0025B;')"/></xsl:call-template></xsl:when>	<!--/varepsilon -->
- 		<xsl:when test="starts-with($content,'&#x002D9;')"><xsl:value-of select="'\dot{}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D9;')"/></xsl:call-template></xsl:when>		<!--/DiacriticalDot -->
- <!-- ====================================================================== -->
-@@ -22,51 +61,324 @@
- 	C1 Controls and Latin-1 Supplement
- 	Range: 0080-00FF
- 	http://www.unicode.org/charts/PDF/U0080.pdf	                    -->
--<!-- ====================================================================== -->	
-+<!-- ====================================================================== -->
-+		<xsl:when test="starts-with($content,'&#x000A1;')"><xsl:value-of select="'\textexclamdown '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000A2;')"><xsl:value-of select="'\mbox{\textcent}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A2;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000A3;')"><xsl:value-of select="'\pounds '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A3;')"/></xsl:call-template></xsl:when>	<!--pound sign -->
-+		<xsl:when test="starts-with($content,'&#x000A4;')"><xsl:value-of select="'\mbox{\textcurrency}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A4;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000A5;')"><xsl:value-of select="'\yen '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A5;')"/></xsl:call-template></xsl:when>	<!--/yen =yen sign --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x000A7;')"><xsl:value-of select="'\S '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A7;')"/></xsl:call-template></xsl:when>	<!--section sign -->
-+		<xsl:when test="starts-with($content,'&#x000A8;')"><xsl:value-of select="'\textasciidieresis '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A8;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000A9;')"><xsl:value-of select="'\copyright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000A9;')"/></xsl:call-template></xsl:when>	<!--copyright sign -->
-+		<xsl:when test="starts-with($content,'&#x000AA;')"><xsl:value-of select="'\textordfeminine '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000AA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000AB;')"><xsl:value-of select="'\mbox{\guillemotleft}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000AB;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000AC;')"><xsl:value-of select="'\neg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000AC;')"/></xsl:call-template></xsl:when>	<!--/neg /lnot =not sign -->
-+		<xsl:when test="starts-with($content,'&#x000AD;')"><xsl:value-of select="'\- '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000AD;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000AE;')"><xsl:value-of select="'\circledR '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000AE;')"/></xsl:call-template></xsl:when>	<!--/circledR =registered sign --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x000AF;')"><xsl:value-of select="'\textasciimacron '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000AF;')"/></xsl:call-template></xsl:when>
-+		<!-- Note: The degree sign is not supported by WikiMedia. Instead of "^\circ" (as supposed by the WikiMedia TeX help), simply \circ is used, because this is what the OOo math editor displays (bug?).  -->
-+		<xsl:when test="starts-with($content,'&#x000B0;')"><xsl:value-of select="'\circ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B0;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000B1;')"><xsl:value-of select="'\pm '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B1;')"/></xsl:call-template></xsl:when>	<!--/pm B: =plus-or-minus sign -->
--		<xsl:when test="starts-with($content,'&#x000B5;')"><xsl:value-of select="'\mu '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B5;')"/></xsl:call-template></xsl:when>	<!--=micro sign -->
-+		<xsl:when test="starts-with($content,'&#x000B2;')"><xsl:value-of select="'{^2}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000B3;')"><xsl:value-of select="'{^3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000B4;')"><xsl:value-of select="'\textasciiacute '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B4;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000B5;')"><xsl:value-of select="'\mathrm{\mu}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B5;')"/></xsl:call-template></xsl:when>	<!--=micro sign -->
- 		<xsl:when test="starts-with($content,'&#x000B6;')"><xsl:value-of select="'\P '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B6;')"/></xsl:call-template></xsl:when>	<!--pilcrow (paragraph sign) -->
-+		<xsl:when test="starts-with($content,'&#x000B7;')"><xsl:value-of select="'\cdotp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000B8;')"><xsl:value-of select="'\mbox{\c{}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000B9;')"><xsl:value-of select="'{^1}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000B9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000BA;')"><xsl:value-of select="'\textordmasculine '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000BA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000BB;')"><xsl:value-of select="'\mbox{\guillemotright}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000BB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C0;')"><xsl:value-of select="'\grave{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C0;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C1;')"><xsl:value-of select="'\acute{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C2;')"><xsl:value-of select="'\hat{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C3;')"><xsl:value-of select="'\tilde{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C4;')"><xsl:value-of select="'\ddot{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C4;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000C5;')"><xsl:value-of select="'\AA '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C5;')"/></xsl:call-template></xsl:when>	<!--capital A, ring --> <!-- invalid in math mode -->
- 		<xsl:when test="starts-with($content,'&#x000C6;')"><xsl:value-of select="'\AE '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C6;')"/></xsl:call-template></xsl:when>	<!--capital AE diphthong (ligature) --> <!-- invalid in math mode -->
-+		<xsl:when test="starts-with($content,'&#x000C7;')"><xsl:value-of select="'\mbox{\c{C}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C8;')"><xsl:value-of select="'\grave{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000C9;')"><xsl:value-of select="'\acute{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000C9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000CA;')"><xsl:value-of select="'\hat{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000CA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000CB;')"><xsl:value-of select="'\ddot{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000CB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000CC;')"><xsl:value-of select="'\grave{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000CC;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000CD;')"><xsl:value-of select="'\acute{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000CD;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000CE;')"><xsl:value-of select="'\hat{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000CE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000CF;')"><xsl:value-of select="'\ddot{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000CF;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D0;')"><xsl:value-of select="'\DH '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D0;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D1;')"><xsl:value-of select="'\tilde{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D2;')"><xsl:value-of select="'\grave{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D3;')"><xsl:value-of select="'\acute{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D4;')"><xsl:value-of select="'\hat{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D4;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D5;')"><xsl:value-of select="'\tilde{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D5;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D6;')"><xsl:value-of select="'\ddot{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D6;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000D7;')"><xsl:value-of select="'\times '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D7;')"/></xsl:call-template></xsl:when>	<!--/times B: =multiply sign -->
-+		<xsl:when test="starts-with($content,'&#x000D8;')"><xsl:value-of select="'\O '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000D9;')"><xsl:value-of select="'\grave{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000D9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000DA;')"><xsl:value-of select="'\acute{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000DA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000DB;')"><xsl:value-of select="'\hat{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000DB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000DC;')"><xsl:value-of select="'\ddot{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000DC;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000DD;')"><xsl:value-of select="'\acute{Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000DD;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000DE;')"><xsl:value-of select="'\TH '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000DE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000DF;')"><xsl:value-of select="'\ss '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000DF;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E0;')"><xsl:value-of select="'\grave{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E0;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E1;')"><xsl:value-of select="'\acute{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E2;')"><xsl:value-of select="'\hat{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E3;')"><xsl:value-of select="'\tilde{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E4;')"><xsl:value-of select="'\ddot{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E4;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E5;')"><xsl:value-of select="'\aa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E5;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x000E6;')"><xsl:value-of select="'\ae '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E6;')"/></xsl:call-template></xsl:when>	<!--small ae diphthong (ligature) --> <!-- invalid in math mode -->
--
-+		<xsl:when test="starts-with($content,'&#x000E7;')"><xsl:value-of select="'\mbox{\c{c}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E8;')"><xsl:value-of select="'\grave{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000E9;')"><xsl:value-of select="'\acute{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000E9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000EA;')"><xsl:value-of select="'\hat{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000EA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000EB;')"><xsl:value-of select="'\ddot{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000EB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000EC;')"><xsl:value-of select="'\grave{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000EC;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000ED;')"><xsl:value-of select="'\acute{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000ED;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000EE;')"><xsl:value-of select="'\hat{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000EE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000EF;')"><xsl:value-of select="'\ddot{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000EF;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F0;')"><xsl:value-of select="'\eth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F0;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F1;')"><xsl:value-of select="'\tilde{n}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F2;')"><xsl:value-of select="'\grave{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F3;')"><xsl:value-of select="'\acute{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F4;')"><xsl:value-of select="'\hat{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F4;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F5;')"><xsl:value-of select="'\tilde{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F5;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F6;')"><xsl:value-of select="'\ddot{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F6;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F7;')"><xsl:value-of select="'\div '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F8;')"><xsl:value-of select="'\o '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000F9;')"><xsl:value-of select="'\grave{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000F9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000FA;')"><xsl:value-of select="'\acute{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000FA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000FB;')"><xsl:value-of select="'\hat{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000FB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000FC;')"><xsl:value-of select="'\ddot{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000FC;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000FD;')"><xsl:value-of select="'\acute{y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000FD;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000FE;')"><xsl:value-of select="'\th '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000FE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x000FF;')"><xsl:value-of select="'\ddot{y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x000FF;')"/></xsl:call-template></xsl:when>
-+<!-- ====================================================================== -->
-+<!-- 	Unicode 3.2
-+                  -->
-+<!-- ====================================================================== -->
-+<xsl:when test="starts-with($content,'&#x00100;')"><xsl:value-of select="'\bar{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00100;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00101;')"><xsl:value-of select="'\bar{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00101;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00102;')"><xsl:value-of select="'\breve{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00102;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00103;')"><xsl:value-of select="'\u{a}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00103;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00106;')"><xsl:value-of select="'\acute{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00106;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00107;')"><xsl:value-of select="'\acute{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00107;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00108;')"><xsl:value-of select="'\hat{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00108;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00109;')"><xsl:value-of select="'\hat{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00109;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0010A;')"><xsl:value-of select="'\dot{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0010A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0010B;')"><xsl:value-of select="'\dot{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0010B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0010C;')"><xsl:value-of select="'\check{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0010C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0010D;')"><xsl:value-of select="'\check{c}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0010D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0010E;')"><xsl:value-of select="'\check{D}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0010E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0010F;')"><xsl:value-of select="'\check{d}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0010F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00112;')"><xsl:value-of select="'\bar{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00112;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00113;')"><xsl:value-of select="'\bar{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00113;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00114;')"><xsl:value-of select="'\breve{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00114;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00115;')"><xsl:value-of select="'\breve{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00115;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00116;')"><xsl:value-of select="'\dot{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00116;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00117;')"><xsl:value-of select="'\dot{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00117;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00118;')"><xsl:value-of select="'\k{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00118;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0011A;')"><xsl:value-of select="'\check{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0011A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0011B;')"><xsl:value-of select="'\check{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0011B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0011C;')"><xsl:value-of select="'\hat{G}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0011C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0011D;')"><xsl:value-of select="'\hat{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0011D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0011E;')"><xsl:value-of select="'\breve{G}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0011E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0011F;')"><xsl:value-of select="'\breve{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0011F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00120;')"><xsl:value-of select="'\dot{G}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00120;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00121;')"><xsl:value-of select="'\dot{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00121;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00122;')"><xsl:value-of select="'\mbox{\c{G}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00122;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00123;')"><xsl:value-of select="'\mbox{\c{g}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00123;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00124;')"><xsl:value-of select="'\hat{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00124;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00125;')"><xsl:value-of select="'\hat{h}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00125;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00127;')"><xsl:value-of select="'\Elzxh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00127;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00128;')"><xsl:value-of select="'\tilde{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00128;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00129;')"><xsl:value-of select="'\tilde{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00129;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0012A;')"><xsl:value-of select="'\bar{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0012A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0012B;')"><xsl:value-of select="'\bar{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0012B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0012C;')"><xsl:value-of select="'\breve{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0012C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0012D;')"><xsl:value-of select="'\breve{\imath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0012D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00130;')"><xsl:value-of select="'\dot{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00130;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00131;')"><xsl:value-of select="'\imath '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00131;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00134;')"><xsl:value-of select="'\hat{J}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00134;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00135;')"><xsl:value-of select="'\hat{\jmath}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00135;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00136;')"><xsl:value-of select="'\mbox{\c{K}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00136;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00137;')"><xsl:value-of select="'\mbox{\c{k}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00137;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00139;')"><xsl:value-of select="'\acute{L}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00139;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0013A;')"><xsl:value-of select="'\acute{l}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0013A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0013B;')"><xsl:value-of select="'\mbox{\c{L}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0013B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0013C;')"><xsl:value-of select="'\mbox{\c{l}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0013C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0013D;')"><xsl:value-of select="'\check{L}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0013D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0013E;')"><xsl:value-of select="'\check{l}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0013E;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00141;')"><xsl:value-of select="'\L '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00141;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00142;')"><xsl:value-of select="'\l '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00142;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00143;')"><xsl:value-of select="'\acute{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00143;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00144;')"><xsl:value-of select="'\acute{n}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00144;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00145;')"><xsl:value-of select="'\mbox{\c{N}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00145;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00146;')"><xsl:value-of select="'\mbox{\c{n}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00146;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00147;')"><xsl:value-of select="'\check{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00147;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00148;')"><xsl:value-of select="'\check{n}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00148;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0014C;')"><xsl:value-of select="'\bar{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0014C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0014D;')"><xsl:value-of select="'\bar{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0014D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0014E;')"><xsl:value-of select="'\breve{O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0014E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0014F;')"><xsl:value-of select="'\breve{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0014F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00150;')"><xsl:value-of select="'\mbox{\H{O}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00150;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00151;')"><xsl:value-of select="'\mbox{\H{o}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00151;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00152;')"><xsl:value-of select="'\OE '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00152;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x00153;')"><xsl:value-of select="'\oe '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00153;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00154;')"><xsl:value-of select="'\acute{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00154;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00155;')"><xsl:value-of select="'\acute{r}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00155;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00156;')"><xsl:value-of select="'\mbox{\c{R}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00156;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00157;')"><xsl:value-of select="'\mbox{\c{r}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00157;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00158;')"><xsl:value-of select="'\check{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00158;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00159;')"><xsl:value-of select="'\check{r}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00159;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0015A;')"><xsl:value-of select="'\acute{S}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0015A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0015B;')"><xsl:value-of select="'\acute{s}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0015B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0015C;')"><xsl:value-of select="'\hat{S}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0015C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0015D;')"><xsl:value-of select="'\hat{s}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0015D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0015E;')"><xsl:value-of select="'\mbox{\c{S}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0015E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0015F;')"><xsl:value-of select="'\mbox{\c{s}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0015F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00160;')"><xsl:value-of select="'\check{S}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00160;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00161;')"><xsl:value-of select="'\check{s}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00161;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00162;')"><xsl:value-of select="'\mbox{\c{T}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00162;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00163;')"><xsl:value-of select="'\mbox{\c{t}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00163;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00164;')"><xsl:value-of select="'\check{T}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00164;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00165;')"><xsl:value-of select="'\check{t}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00165;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00168;')"><xsl:value-of select="'\tilde{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00168;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00169;')"><xsl:value-of select="'\tilde{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00169;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0016A;')"><xsl:value-of select="'\bar{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0016A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0016B;')"><xsl:value-of select="'\bar{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0016B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0016C;')"><xsl:value-of select="'\breve{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0016C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0016D;')"><xsl:value-of select="'\breve{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0016D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0016E;')"><xsl:value-of select="'\mathring{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0016E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0016F;')"><xsl:value-of select="'\mathring{u}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0016F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00170;')"><xsl:value-of select="'\mbox{\H{U}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00170;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00171;')"><xsl:value-of select="'\mbox{\H{u}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00171;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00172;')"><xsl:value-of select="'\k{U}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00172;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00174;')"><xsl:value-of select="'\hat{W}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00174;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00175;')"><xsl:value-of select="'\hat{w}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00175;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00176;')"><xsl:value-of select="'\hat{Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00176;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00177;')"><xsl:value-of select="'\hat{y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00177;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00178;')"><xsl:value-of select="'\ddot{Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00178;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00179;')"><xsl:value-of select="'\acute{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00179;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0017A;')"><xsl:value-of select="'\acute{z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0017A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0017B;')"><xsl:value-of select="'\dot{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0017B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0017C;')"><xsl:value-of select="'\dot{z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0017C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0017D;')"><xsl:value-of select="'\check{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0017D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0017E;')"><xsl:value-of select="'\check{z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0017E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00192;')"><xsl:value-of select="'f'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00192;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x001AA;')"><xsl:value-of select="'\eth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x001AA;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x001F5;')"><xsl:value-of select="'\acute{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x001F5;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00250;')"><xsl:value-of select="'\Elztrna '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00250;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00252;')"><xsl:value-of select="'\Elztrnsa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00252;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00254;')"><xsl:value-of select="'\Elzopeno '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00254;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00256;')"><xsl:value-of select="'\Elzrtld '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00256;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00259;')"><xsl:value-of select="'\Elzschwa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00259;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0025B;')"><xsl:value-of select="'\varepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0025B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00263;')"><xsl:value-of select="'\Elzpgamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00263;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00264;')"><xsl:value-of select="'\Elzpbgam '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00264;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00265;')"><xsl:value-of select="'\Elztrnh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00265;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0026C;')"><xsl:value-of select="'\Elzbtdl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0026C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0026D;')"><xsl:value-of select="'\Elzrtll '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0026D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0026F;')"><xsl:value-of select="'\Elztrnm '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0026F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00270;')"><xsl:value-of select="'\Elztrnmlr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00270;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00271;')"><xsl:value-of select="'\Elzltlmr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00271;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00273;')"><xsl:value-of select="'\Elzrtln '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00273;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00277;')"><xsl:value-of select="'\Elzclomeg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00277;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00279;')"><xsl:value-of select="'\Elztrnr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00279;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0027A;')"><xsl:value-of select="'\Elztrnrl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0027A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0027B;')"><xsl:value-of select="'\Elzrttrnr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0027B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0027C;')"><xsl:value-of select="'\Elzrl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0027C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0027D;')"><xsl:value-of select="'\Elzrtlr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0027D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0027E;')"><xsl:value-of select="'\Elzfhr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0027E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00282;')"><xsl:value-of select="'\Elzrtls '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00282;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00283;')"><xsl:value-of select="'\Elzesh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00283;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00287;')"><xsl:value-of select="'\Elztrnt '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00287;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00288;')"><xsl:value-of select="'\Elzrtlt '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00288;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0028A;')"><xsl:value-of select="'\Elzpupsil '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0028A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0028B;')"><xsl:value-of select="'\Elzpscrv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0028B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0028C;')"><xsl:value-of select="'\Elzinvv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0028C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0028D;')"><xsl:value-of select="'\Elzinvw '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0028D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0028E;')"><xsl:value-of select="'\Elztrny '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0028E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00290;')"><xsl:value-of select="'\Elzrtlz '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00290;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00292;')"><xsl:value-of select="'\Elzyogh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00292;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00294;')"><xsl:value-of select="'\Elzglst '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00294;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00295;')"><xsl:value-of select="'\Elzreglst '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00295;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00296;')"><xsl:value-of select="'\Elzinglst '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00296;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002A4;')"><xsl:value-of select="'\Elzdyogh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002A4;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002A7;')"><xsl:value-of select="'\Elztesh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002A7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x002BC;')"><xsl:value-of select="'\rasp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002BC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002C8;')"><xsl:value-of select="'\Elzverts '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002C8;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002CC;')"><xsl:value-of select="'\Elzverti '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002CC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D0;')"><xsl:value-of select="'\Elzlmrk '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D0;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D1;')"><xsl:value-of select="'\Elzhlmrk '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D1;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D2;')"><xsl:value-of select="'\Elzsbrhr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D2;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D3;')"><xsl:value-of select="'\Elzsblhr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D3;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D4;')"><xsl:value-of select="'\Elzrais '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D4;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D5;')"><xsl:value-of select="'\Elzlow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D5;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D8;')"><xsl:value-of select="'\u '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D8;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002D9;')"><xsl:value-of select="'\dot{}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002D9;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002DA;')"><xsl:value-of select="'\mathring{}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002DA;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002DB;')"><xsl:value-of select="'\mbox{\k{}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002DB;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x002DD;')"><xsl:value-of select="'\mbox{\H{}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x002DD;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00300;')"><xsl:value-of select="'\grave '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00300;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00301;')"><xsl:value-of select="'\acute '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00301;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00302;')"><xsl:value-of select="'\hat '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00302;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00303;')"><xsl:value-of select="'\tilde '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00303;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00304;')"><xsl:value-of select="'\bar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00304;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00306;')"><xsl:value-of select="'\breve '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00306;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00307;')"><xsl:value-of select="'\dot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00307;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00308;')"><xsl:value-of select="'\ddot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00308;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0030A;')"><xsl:value-of select="'\ocirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0030A;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0030B;')"><xsl:value-of select="'\H '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0030B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0030C;')"><xsl:value-of select="'\check '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0030C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00321;')"><xsl:value-of select="'\Elzpalh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00321;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0032A;')"><xsl:value-of select="'\Elzsbbrg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0032A;')"/></xsl:call-template></xsl:when>
- <!-- ====================================================================== -->
- <!-- 	Unicode 3.2
- 	Greek
- 	Range: 0370-03FF
- 	http://www.unicode.org/charts/PDF/U0370.pdf	                    -->
--<!-- ====================================================================== -->	
--		<xsl:when test="starts-with($content,'&#x00391;')"><xsl:value-of select="'{\rm A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00391;')"/></xsl:call-template></xsl:when>	<!--greek capital letter alpha -->
--		<xsl:when test="starts-with($content,'&#x00392;')"><xsl:value-of select="'{\rm B}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00392;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter beta -->
--		<xsl:when test="starts-with($content,'&#x00393;')"><xsl:value-of select="'\Gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00393;')"/></xsl:call-template></xsl:when>	<!--/Gamma capital Gamma, Greek -->
--		<xsl:when test="starts-with($content,'&#x00394;')"><xsl:value-of select="'\Delta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00394;')"/></xsl:call-template></xsl:when>	<!--/Delta capital Delta, Greek -->
--		<xsl:when test="starts-with($content,'&#x00395;')"><xsl:value-of select="'{\rm E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00395;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter epsilon -->
--		<xsl:when test="starts-with($content,'&#x00396;')"><xsl:value-of select="'{\rm Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00396;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter zeta -->
--		<xsl:when test="starts-with($content,'&#x00397;')"><xsl:value-of select="'{\rm H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00397;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter eta -->
--		<xsl:when test="starts-with($content,'&#x00398;')"><xsl:value-of select="'\Theta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00398;')"/></xsl:call-template></xsl:when>	<!--/Theta capital Theta, Greek -->
--		<xsl:when test="starts-with($content,'&#x00399;')"><xsl:value-of select="'{\rm I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00399;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter iota -->
--		<xsl:when test="starts-with($content,'&#x0039A;')"><xsl:value-of select="'{\rm K}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039A;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter kappa -->
--		<xsl:when test="starts-with($content,'&#x0039B;')"><xsl:value-of select="'\Lambda '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039B;')"/></xsl:call-template></xsl:when>	<!--/Lambda capital Lambda, Greek -->
--		<xsl:when test="starts-with($content,'&#x0039C;')"><xsl:value-of select="'{\rm M}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039C;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter mu -->
--		<xsl:when test="starts-with($content,'&#x0039D;')"><xsl:value-of select="'{\rm N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039D;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter nu -->
--		<xsl:when test="starts-with($content,'&#x0039E;')"><xsl:value-of select="'\Xi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039E;')"/></xsl:call-template></xsl:when>	<!--/Xi capital Xi, Greek -->
--		<xsl:when test="starts-with($content,'&#x0039F;')"><xsl:value-of select="'{\rm O}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039F;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter omicron -->
--		<xsl:when test="starts-with($content,'&#x003A0;')"><xsl:value-of select="'\Pi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A0;')"/></xsl:call-template></xsl:when>	<!--/Pi capital Pi, Greek -->
--		<xsl:when test="starts-with($content,'&#x003A1;')"><xsl:value-of select="'{\rm P}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A1;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter rho -->
--		<xsl:when test="starts-with($content,'&#x003A3;')"><xsl:value-of select="'\Sigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A3;')"/></xsl:call-template></xsl:when>	<!--/Sigma capital Sigma, Greek -->
--		<xsl:when test="starts-with($content,'&#x003A4;')"><xsl:value-of select="'{\rm T}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A4;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter tau -->
--		<xsl:when test="starts-with($content,'&#x003A5;')"><xsl:value-of select="'{\rm Y}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A5;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter upsilon -->
--		<xsl:when test="starts-with($content,'&#x003A6;')"><xsl:value-of select="'\Phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A6;')"/></xsl:call-template></xsl:when>	<!--/Phi capital Phi, Greek -->
--		<xsl:when test="starts-with($content,'&#x003A7;')"><xsl:value-of select="'{\rm X}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A7;')"/></xsl:call-template></xsl:when>	<!-- greek capital letter chi -->
--		<xsl:when test="starts-with($content,'&#x003A8;')"><xsl:value-of select="'\Psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A8;')"/></xsl:call-template></xsl:when>	<!--/Psi capital Psi, Greek -->
--		<xsl:when test="starts-with($content,'&#x003A9;')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A9;')"/></xsl:call-template></xsl:when>	<!--/Omega capital Omega, Greek -->
-+<!-- ====================================================================== -->
-+<xsl:when test="starts-with($content,'&#x00386;')"><xsl:value-of select="'\acute{A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00386;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00388;')"><xsl:value-of select="'\acute{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00388;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00389;')"><xsl:value-of select="'\grave{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00389;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0038A;')"><xsl:value-of select="concat('\mathrm{',$apos,'I}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0038A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0038C;')"><xsl:value-of select="concat('\mathrm{',$apos,'O}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0038C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0038E;')"><xsl:value-of select="concat('\mathrm{',$apos,'Y}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0038E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0038F;')"><xsl:value-of select="concat('\mathrm{',$apos,'\Omega}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0038F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00390;')"><xsl:value-of select="'\acute{\ddot{\iota}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00390;')"/></xsl:call-template></xsl:when>
-+	
-+<xsl:when test="starts-with($content,'&#x00391;')"><xsl:value-of select="'\Alpha '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00391;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00392;')"><xsl:value-of select="'\Beta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00392;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00393;')"><xsl:value-of select="'\Gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00393;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00394;')"><xsl:value-of select="'\Delta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00394;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00395;')"><xsl:value-of select="'\Epsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00395;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00396;')"><xsl:value-of select="'\Zeta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00396;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00397;')"><xsl:value-of select="'\Eta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00397;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00398;')"><xsl:value-of select="'\Theta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00398;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x00399;')"><xsl:value-of select="'\Iota '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00399;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0039A;')"><xsl:value-of select="'\Kappa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0039B;')"><xsl:value-of select="'\Lambda '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0039C;')"><xsl:value-of select="'M'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0039D;')"><xsl:value-of select="'N'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0039E;')"><xsl:value-of select="'\Xi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0039F;')"><xsl:value-of select="'O'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A0;')"><xsl:value-of select="'\Pi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A0;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A1;')"><xsl:value-of select="'\Rho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A1;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A3;')"><xsl:value-of select="'\Sigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A3;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A4;')"><xsl:value-of select="'\Tau '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A4;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A5;')"><xsl:value-of select="'\Upsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A5;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A6;')"><xsl:value-of select="'\Phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A6;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A7;')"><xsl:value-of select="'\Chi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A7;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A8;')"><xsl:value-of select="'\Psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A8;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003A9;')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x003AA;')"><xsl:value-of select="'\mathrm{\ddot{I}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003AA;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003AB;')"><xsl:value-of select="'\mathrm{\ddot{Y}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003AB;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003AC;')"><xsl:value-of select="'\acute{\alpha}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003AC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003AD;')"><xsl:value-of select="'\acute{\epsilon}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003AD;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003AE;')"><xsl:value-of select="'\acute{\eta}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003AE;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003AF;')"><xsl:value-of select="'\acute{\iota}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003AF;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003B0;')"><xsl:value-of select="'\acute{\ddot{\upsilon}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B0;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x003B1;')"><xsl:value-of select="'\alpha '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B1;')"/></xsl:call-template></xsl:when>	<!--/alpha small alpha, Greek -->
- 		<xsl:when test="starts-with($content,'&#x003B2;')"><xsl:value-of select="'\beta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B2;')"/></xsl:call-template></xsl:when>	<!--/beta small beta, Greek -->
- 		<xsl:when test="starts-with($content,'&#x003B3;')"><xsl:value-of select="'\gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B3;')"/></xsl:call-template></xsl:when>	<!--/gamma small gamma, Greek -->
-@@ -92,60 +404,143 @@
- 		<xsl:when test="starts-with($content,'&#x003C7;')"><xsl:value-of select="'\chi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C7;')"/></xsl:call-template></xsl:when>	<!--/chi small chi, Greek -->
- 		<xsl:when test="starts-with($content,'&#x003C8;')"><xsl:value-of select="'\psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C8;')"/></xsl:call-template></xsl:when>	<!--/psi small psi, Greek -->
- 		<xsl:when test="starts-with($content,'&#x003C9;')"><xsl:value-of select="'\omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C9;')"/></xsl:call-template></xsl:when>	<!--/omega small omega, Greek -->
-+		<xsl:when test="starts-with($content,'&#x003CA;')"><xsl:value-of select="'\ddot{\iota}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003CA;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003CB;')"><xsl:value-of select="'\ddot{\upsilon}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003CB;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003CC;')"><xsl:value-of select="'\acute{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003CC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003CD;')"><xsl:value-of select="'\acute{\upsilon}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003CD;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003CE;')"><xsl:value-of select="'\acute{\omega}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003CE;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x003D1;')"><xsl:value-of select="'\vartheta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D1;')"/></xsl:call-template></xsl:when>	<!--/vartheta - curly or open theta -->
- 		<xsl:when test="starts-with($content,'&#x003D2;')"><xsl:value-of select="'\Upsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D2;')"/></xsl:call-template></xsl:when>	<!--/Upsilon capital Upsilon, Greek -->
--		<xsl:when test="starts-with($content,'&#x003D5;')"><xsl:value-of select="'\varphi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D5;')"/></xsl:call-template></xsl:when>	<!--/varphi - curly or open phi -->
-+		<xsl:when test="starts-with($content,'&#x003D5;')"><xsl:value-of select="'\phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D5;')"/></xsl:call-template></xsl:when>	<!--/varphi - curly or open phi -->
- 		<xsl:when test="starts-with($content,'&#x003D6;')"><xsl:value-of select="'\varpi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D6;')"/></xsl:call-template></xsl:when>	<!--/varpi -->
-+<xsl:when test="starts-with($content,'&#x003DA;')"><xsl:value-of select="'\Stigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003DA;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003DC;')"><xsl:value-of select="'\Digamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003DC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003DD;')"><xsl:value-of select="'\digamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003DD;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003DE;')"><xsl:value-of select="'\Koppa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003DE;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003E0;')"><xsl:value-of select="'\Sampi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003E0;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x003F0;')"><xsl:value-of select="'\varkappa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003F0;')"/></xsl:call-template></xsl:when>	<!--/varkappa -->
- 		<xsl:when test="starts-with($content,'&#x003F1;')"><xsl:value-of select="'\varrho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003F1;')"/></xsl:call-template></xsl:when>	<!--/varrho -->
--		
-+<xsl:when test="starts-with($content,'&#x003F5;')"><xsl:value-of select="'\epsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003F5;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x003F6;')"><xsl:value-of select="'\backepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003F6;')"/></xsl:call-template></xsl:when>
- <!-- ====================================================================== -->
- <!-- 	Unicode 3.2
- 	General Punctuation
- 	Range: 2000-206F
- 	http://www.unicode.org/charts/PDF/U2000.pdf	                    -->
- <!-- ====================================================================== -->
--		<xsl:when test="starts-with($content,'&#x02002;')"><xsl:value-of select='"\hspace{0.5em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02002;')"/></xsl:call-template></xsl:when> 	<!-- en space (1/2-em) -->
--		<xsl:when test="starts-with($content,'&#x02003;')"><xsl:value-of select='"\hspace{1em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02003;')"/></xsl:call-template></xsl:when>		<!-- emsp - space of width 1em -->
-+		<xsl:when test="starts-with($content,'&#x02002;')"><xsl:value-of select='"\enspace "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02002;')"/></xsl:call-template></xsl:when> 	<!-- en space (1/2-em) -->
-+		<xsl:when test="starts-with($content,'&#x02003;')"><xsl:value-of select='"\quad "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02003;')"/></xsl:call-template></xsl:when>		<!-- emsp - space of width 1em -->
- 		<xsl:when test="starts-with($content,'&#x02004;')"><xsl:value-of select='"\hspace{0.33em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02004;')"/></xsl:call-template></xsl:when>	<!-- emsp13 - space of width 1/3 em -->
--		<xsl:when test="starts-with($content,'&#x02005;')"><xsl:value-of select='"\hspace{0.25em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02005;')"/></xsl:call-template></xsl:when>	<!-- ThickSpace - space of width 1/4 em -->
--		<xsl:when test="starts-with($content,'&#x02009;')"><xsl:value-of select='"\hspace{0.17em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02009;')"/></xsl:call-template></xsl:when>	<!-- ThinSpace - space of width 3/18 em -->
-+		<xsl:when test="starts-with($content,'&#x02005;')"><xsl:value-of select='"\thickspace "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02005;')"/></xsl:call-template></xsl:when>	<!-- ThickSpace - space of width 1/4 em -->
-+		<xsl:when test="starts-with($content,'&#x02006;')"><xsl:value-of select='"\hspace{0.166em}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02006;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02007;')"><xsl:value-of select='"\hphantom{0}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02007;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02008;')"><xsl:value-of select='"\hphantom{,}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02008;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02009;')"><xsl:value-of select='"\thinspace "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02009;')"/></xsl:call-template></xsl:when>	<!-- ThinSpace - space of width 3/18 em -->
-+		<xsl:when test="starts-with($content,'&#x0200A;')"><xsl:value-of select="'\hspace '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0200A;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0200B;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0200B;')"/></xsl:call-template></xsl:when>	<!--zero width space -->
-+		<xsl:when test="starts-with($content,'&#x02010;')"><xsl:value-of select="'-'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02010;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02013;')"><xsl:value-of select="'\endash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02013;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02014;')"><xsl:value-of select="'\emdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02014;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02016;')"><xsl:value-of select="'\Vert '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02016;')"/></xsl:call-template></xsl:when>	<!--/Vert dbl vertical bar -->
-+		<xsl:when test="starts-with($content,'&#x02018;')"><xsl:value-of select="'\lq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02018;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02019;')"><xsl:value-of select="'\rq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02019;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0201B;')"><xsl:value-of select="'\Elzreapos '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0201B;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0201C;')"><xsl:value-of select="'\textquotedblleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0201C;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0201D;')"><xsl:value-of select="'\textquotedblright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0201D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02020;')"><xsl:value-of select="'\dagger '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02020;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02021;')"><xsl:value-of select="'\ddager '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02021;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02022;')"><xsl:value-of select="'\bullet '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02022;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02026;')"><xsl:value-of select="'\dots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02026;')"/></xsl:call-template></xsl:when>	<!--horizontal ellipsis = three dot leader -->
- 		<xsl:when test="starts-with($content,'&#x02032;')"><xsl:value-of select="'\prime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02032;')"/></xsl:call-template></xsl:when>	<!--/prime prime or minute -->
-+<xsl:when test="starts-with($content,'&#x02033;')"><xsl:value-of select="concat('{',$apos,$apos,'}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02033;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02034;')"><xsl:value-of select="concat('{',$apos,$apos,$apos,'}')" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02034;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02035;')"><xsl:value-of select="'\backprime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02035;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02041;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02041;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02044;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02044;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0204E;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0204E;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02057;')"><xsl:value-of select="concat($apos,$apos,$apos,$apos)" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02057;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0205F;')"><xsl:value-of select="'\mkern4mu '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0205F;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02061;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02061;')"/></xsl:call-template></xsl:when>	<!-- ApplyFunction -->
- 		<xsl:when test="starts-with($content,'&#x02062;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02062;')"/></xsl:call-template></xsl:when>	<!-- InvisibleTimes -->
- 		<xsl:when test="starts-with($content,'&#x02063;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02063;')"/></xsl:call-template></xsl:when>	<!-- InvisibleComma, used as a separator, e.g., in indices -->
- <!-- ====================================================================== -->
- <!-- 	Unicode 3.2
-+	                    -->
-+<!-- ====================================================================== -->
-+<xsl:when test="starts-with($content,'&#x020A7;')"><xsl:value-of select="'\Elzpes'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x020A7;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x020AC;')"><xsl:value-of select="'\mbox{\texteuro}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x020AC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x020DB;')"><xsl:value-of select="'\dddot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x020DB;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x020DC;')"><xsl:value-of select="'\ddddot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x020DC;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x020E7;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x020E7;')"/></xsl:call-template></xsl:when>
-+<!-- ====================================================================== -->
-+<!-- 	Unicode 3.2
- 	Letterlike Symbols
- 	Range: 2100-214F
- 	http://www.unicode.org/charts/PDF/U2100.pdf	                    -->
- <!-- ====================================================================== -->
-+<xsl:when test="starts-with($content,'&#x02102;')"><xsl:value-of select="'\mathbb{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02102;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0210A;')"><xsl:value-of select="'\mathscr{g}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210A;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0210B;')"><xsl:value-of select="'\mathscr{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210B;')"/></xsl:call-template></xsl:when>	<!--H Hamiltonian -->
-+		<xsl:when test="starts-with($content,'&#x0210C;')"><xsl:value-of select="'\mathfrak{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0210D;')"><xsl:value-of select="'\mathbb{H}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0210E;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210E;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0210F;&#x0FE00;')"><xsl:value-of select="'\hbar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210F;&#x0FE00;')"/></xsl:call-template></xsl:when>	<!--/hbar - Planck's over 2pi -->
- 		<xsl:when test="starts-with($content,'&#x0210F;')"><xsl:value-of select="'\hslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210F;')"/></xsl:call-template></xsl:when>	<!--/hslash - variant Planck's over 2pi --> <!-- Required amssymb -->
-+<xsl:when test="starts-with($content,'&#x02110;')"><xsl:value-of select="'\mathscr{I}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02110;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02111;')"><xsl:value-of select="'\Im '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02111;')"/></xsl:call-template></xsl:when>		<!--/Im - imaginary   -->
-+<xsl:when test="starts-with($content,'&#x02112;')"><xsl:value-of select="'\mathscr{L}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02112;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02113;')"><xsl:value-of select="'\ell '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02113;')"/></xsl:call-template></xsl:when>		<!--/ell - cursive small l -->
- 		<xsl:when test="starts-with($content,'&#x02115;')"><xsl:value-of select="'\mathbb{N}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02115;')"/></xsl:call-template></xsl:when>	<!--the semi-ring of natural numbers --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02116;')"><xsl:value-of select="'\textnumero '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02116;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02118;')"><xsl:value-of select="'\wp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02118;')"/></xsl:call-template></xsl:when>		<!--/wp - Weierstrass p -->
- 		<xsl:when test="starts-with($content,'&#x02119;')"><xsl:value-of select="'\mathbb{P}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02119;')"/></xsl:call-template></xsl:when>	<!--the prime natural numbers --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x0211A;')"><xsl:value-of select="'\mathbb{Q}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0211A;')"/></xsl:call-template></xsl:when>	<!--the field of rational numbers --> <!-- Required amssymb -->
-+<xsl:when test="starts-with($content,'&#x0211B;')"><xsl:value-of select="'\mathscr{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0211B;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0211C;')"><xsl:value-of select="'\Re '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0211C;')"/></xsl:call-template></xsl:when>		<!--/Re - real -->
-+		<xsl:when test="starts-with($content,'&#x0211D;')"><xsl:value-of select="'\mathbb{R}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0211D;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0211E;')"><xsl:value-of select="'\Elzxrat '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0211E;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02124;')"><xsl:value-of select="'\mathbb{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02124;')"/></xsl:call-template></xsl:when>	<!--the ring of integers --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02126;')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02126;')"/></xsl:call-template></xsl:when>		<!--ohm sign -->
- 		<xsl:when test="starts-with($content,'&#x02127;')"><xsl:value-of select="'\mho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02127;')"/></xsl:call-template></xsl:when>		<!--/mho - conductance -->
-+<xsl:when test="starts-with($content,'&#x02128;')"><xsl:value-of select="'\mathfrak{Z}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02128;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02129;')"><xsl:value-of select="'\ElsevierGlyph{2129}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02129;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0212B;')"><xsl:value-of select="'\AA'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0212B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0212C;')"><xsl:value-of select="'\mathscr{B}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0212C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0212D;')"><xsl:value-of select="'\mathfrak{C}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0212D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0212F;')"><xsl:value-of select="'\mathscr{e}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0212F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02130;')"><xsl:value-of select="'\mathscr{E}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02130;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02131;')"><xsl:value-of select="'\mathscr{F}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02131;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02133;')"><xsl:value-of select="'\mathscr{M}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02133;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02134;')"><xsl:value-of select="'\mathscr{o}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02134;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02135;')"><xsl:value-of select="'\aleph '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02135;')"/></xsl:call-template></xsl:when>		<!--/aleph aleph, Hebrew -->
- 		<xsl:when test="starts-with($content,'&#x02136;')"><xsl:value-of select="'\beth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02136;')"/></xsl:call-template></xsl:when>		<!--/beth - beth, Hebrew --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02137;')"><xsl:value-of select="'\gimel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02137;')"/></xsl:call-template></xsl:when>		<!--/gimel - gimel, Hebrew --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02138;')"><xsl:value-of select="'\daleth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02138;')"/></xsl:call-template></xsl:when>	<!--/daleth - daleth, Hebrew --> <!-- Required amssymb -->
-+<xsl:when test="starts-with($content,'&#x0213F;')"><xsl:value-of select="'\BbbPi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0213F;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02140;')"><xsl:value-of select="'\bbsum '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02140;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02141;')"><xsl:value-of select="'\Game '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02141;')"/></xsl:call-template></xsl:when>
-+		
- 		<xsl:when test="starts-with($content,'&#x02145;')"><xsl:value-of select="'D'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02145;')"/></xsl:call-template></xsl:when>		<!--D for use in differentials, e.g., within integrals -->
- 		<xsl:when test="starts-with($content,'&#x02146;')"><xsl:value-of select="'d'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02146;')"/></xsl:call-template></xsl:when>		<!--d for use in differentials, e.g., within integrals -->
- 		<xsl:when test="starts-with($content,'&#x02147;')"><xsl:value-of select="'e'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02147;')"/></xsl:call-template></xsl:when>		<!--e use for the exponential base of the natural logarithms -->
- 		<xsl:when test="starts-with($content,'&#x02148;')"><xsl:value-of select="'i'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02148;')"/></xsl:call-template></xsl:when>		<!--i for use as a square root of -1 -->
- 		<xsl:when test="starts-with($content,'&#x02149;')"><xsl:value-of select="'j'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02149;')"/></xsl:call-template></xsl:when>		
--
-+<!-- ====================================================================== -->
-+<!-- 	Unicode 3.2
-+		                    -->
-+<!-- ====================================================================== -->
-+<xsl:when test="starts-with($content,'&#x02153;')"><xsl:value-of select="'\textfrac{1}{3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02153;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02154;')"><xsl:value-of select="'\textfrac{2}{3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02154;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02155;')"><xsl:value-of select="'\textfrac{1}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02155;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02156;')"><xsl:value-of select="'\textfrac{2}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02156;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02157;')"><xsl:value-of select="'\textfrac{3}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02157;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02158;')"><xsl:value-of select="'\textfrac{4}{5}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02158;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x02159;')"><xsl:value-of select="'\textfrac{1}{6}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02159;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0215A;')"><xsl:value-of select="'\textfrac{5}{6}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0215A;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0215B;')"><xsl:value-of select="'\textfrac{1}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0215B;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0215C;')"><xsl:value-of select="'\textfrac{3}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0215C;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0215D;')"><xsl:value-of select="'\textfrac{5}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0215D;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x0215E;')"><xsl:value-of select="'\textfrac{7}{8}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0215E;')"/></xsl:call-template></xsl:when>
- <!-- ====================================================================== -->
- <!-- 	Unicode 3.2
- 	Arrows
-@@ -154,7 +549,7 @@
- <!-- ====================================================================== -->
- 		<xsl:when test="starts-with($content,'&#x02190;')"><xsl:value-of select="'\leftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02190;')"/></xsl:call-template></xsl:when>	<!--/leftarrow /gets A: =leftward arrow -->
- 		<xsl:when test="starts-with($content,'&#x02191;')"><xsl:value-of select="'\uparrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02191;')"/></xsl:call-template></xsl:when>	<!--/uparrow A: =upward arrow -->
--  		<xsl:when test="starts-with($content,'&#x02192;')"><xsl:value-of select="'\to '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02192;')"/></xsl:call-template></xsl:when>		<!--/rightarrow /to A: =rightward arrow -->
-+  		<xsl:when test="starts-with($content,'&#x02192;')"><xsl:value-of select="'\rightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02192;')"/></xsl:call-template></xsl:when>		<!--/rightarrow /to A: =rightward arrow -->
- 		<xsl:when test="starts-with($content,'&#x02193;')"><xsl:value-of select="'\downarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02193;')"/></xsl:call-template></xsl:when>	<!--/downarrow A: =downward arrow -->
- 		<xsl:when test="starts-with($content,'&#x02194;')"><xsl:value-of select="'\leftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02194;')"/></xsl:call-template></xsl:when>	<!--/leftrightarrow A: l&r arrow -->
- 		<xsl:when test="starts-with($content,'&#x02195;')"><xsl:value-of select="'\updownarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02195;')"/></xsl:call-template></xsl:when>	<!--/updownarrow A: up&down arrow -->
-@@ -164,6 +559,7 @@
- 		<xsl:when test="starts-with($content,'&#x02199;')"><xsl:value-of select="'\swarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02199;')"/></xsl:call-template></xsl:when>	<!--/swarrow A: SW pointing arrow -->
- 		<xsl:when test="starts-with($content,'&#x0219A;')"><xsl:value-of select="'\nleftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0219A;')"/></xsl:call-template></xsl:when>	<!--/nleftarrow A: not left arrow --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x0219B;')"><xsl:value-of select="'\nrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0219B;')"/></xsl:call-template></xsl:when>	<!--/nrightarrow A: not right arrow --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x0219C;')"><xsl:value-of select="'\leftsquigarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0219C;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0219D;')"><xsl:value-of select="'\rightsquigarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0219D;')"/></xsl:call-template></xsl:when>	<!--/rightsquigarrow A: rt arrow-wavy --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x0219E;')"><xsl:value-of select="'\twoheadleftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0219E;')"/></xsl:call-template></xsl:when>	<!--/twoheadleftarrow A: --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021A0;')"><xsl:value-of select="'\twoheadrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021A0;')"/></xsl:call-template></xsl:when>	<!--/twoheadrightarrow A: --> <!-- Required amssymb -->
-@@ -178,6 +574,7 @@
- 		<xsl:when test="starts-with($content,'&#x021AE;')"><xsl:value-of select="'\nleftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021AE;')"/></xsl:call-template></xsl:when>	<!--/nleftrightarrow A: not l&r arrow --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021B0;')"><xsl:value-of select="'\Lsh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021B0;')"/></xsl:call-template></xsl:when>	<!--/Lsh A: --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021B1;')"><xsl:value-of select="'\Rsh '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021B1;')"/></xsl:call-template></xsl:when>	<!--/Rsh A: --> <!-- Required amssymb -->
-+<xsl:when test="starts-with($content,'&#x021B3;')"><xsl:value-of select="'\ElsevierGlyph{21B3}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021B3;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x021B6;')"><xsl:value-of select="'\curvearrowleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021B6;')"/></xsl:call-template></xsl:when>	<!--/curvearrowleft A: left curved arrow --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021B7;')"><xsl:value-of select="'\curvearrowright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021B7;')"/></xsl:call-template></xsl:when>	<!--/curvearrowright A: rt curved arrow --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021BA;')"><xsl:value-of select="'\circlearrowleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021BA;')"/></xsl:call-template></xsl:when>	<!--/circlearrowleft A: l arr in circle --> <!-- Required amssymb -->
-@@ -191,6 +588,7 @@
- 		<xsl:when test="starts-with($content,'&#x021C2;')"><xsl:value-of select="'\downharpoonright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C2;')"/></xsl:call-template></xsl:when>	<!--/downharpoonright A: down harpoon-rt --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021C3;')"><xsl:value-of select="'\downharpoonleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C3;')"/></xsl:call-template></xsl:when>	<!--/downharpoonleft A: dn harpoon-left --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021C4;')"><xsl:value-of select="'\rightleftarrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C4;')"/></xsl:call-template></xsl:when>	<!--/rightleftarrows A: r arr over l arr --> <!-- Required amssymb -->
-+<xsl:when test="starts-with($content,'&#x021C5;')"><xsl:value-of select="'\dblarrowupdown '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C5;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x021C6;')"><xsl:value-of select="'\leftrightarrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C6;')"/></xsl:call-template></xsl:when>	<!--/leftrightarrows A: l arr over r arr --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021C7;')"><xsl:value-of select="'\leftleftarrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C7;')"/></xsl:call-template></xsl:when>	<!--/leftleftarrows A: two left arrows --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021C8;')"><xsl:value-of select="'\upuparrows '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021C8;')"/></xsl:call-template></xsl:when>	<!--/upuparrows A: two up arrows --> <!-- Required amssymb -->
-@@ -205,12 +603,16 @@
- 		<xsl:when test="starts-with($content,'&#x021D1;')"><xsl:value-of select="'\Uparrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D1;')"/></xsl:call-template></xsl:when>	<!--/Uparrow A: up dbl arrow -->
- 		<xsl:when test="starts-with($content,'&#x021D2;')"><xsl:value-of select="'\Rightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D2;')"/></xsl:call-template></xsl:when>	<!--/Rightarrow A: implies -->
- 		<xsl:when test="starts-with($content,'&#x021D3;')"><xsl:value-of select="'\Downarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D3;')"/></xsl:call-template></xsl:when>	<!--/Downarrow A: down dbl arrow -->
--<!--		<xsl:when test="starts-with($content,'&#x021D4;')"><xsl:value-of select="'\Leftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D4;')"/></xsl:call-template></xsl:when>	/Leftrightarrow A: l&r dbl arrow -->
--		<xsl:when test="starts-with($content,'&#x021D4;')"><xsl:value-of select="'\iff '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D4;')"/></xsl:call-template></xsl:when>	<!--/iff if and only if	-->
-+		<xsl:when test="starts-with($content,'&#x021D4;')"><xsl:value-of select="'\Leftrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D4;')"/></xsl:call-template></xsl:when>	<!--/Leftrightarrow A: l&r dbl arrow -->
-+<!--		<xsl:when test="starts-with($content,'&#x021D4;')"><xsl:value-of select="'\iff '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D4;')"/></xsl:call-template></xsl:when>	/iff if and only if	-->
- 		<xsl:when test="starts-with($content,'&#x021D5;')"><xsl:value-of select="'\Updownarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021D5;')"/></xsl:call-template></xsl:when>	<!--/Updownarrow A: up&down dbl arrow -->
- 		<xsl:when test="starts-with($content,'&#x021DA;')"><xsl:value-of select="'\Lleftarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021DA;')"/></xsl:call-template></xsl:when>	<!--/Lleftarrow A: left triple arrow --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x021DB;')"><xsl:value-of select="'\Rrightarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021DB;')"/></xsl:call-template></xsl:when>	<!--/Rrightarrow A: right triple arrow --> <!-- Required amssymb -->
--		
-+<xsl:when test="starts-with($content,'&#x021DD;')"><xsl:value-of select="'\rightsquigarrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021DD;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x021F5;')"><xsl:value-of select="'\DownArrowUpArrow '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021F5;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x021FD;')"><xsl:value-of select="'\leftarrowtriangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021FD;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x021FE;')"><xsl:value-of select="'\rightarrowtriangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021FE;')"/></xsl:call-template></xsl:when>
-+<xsl:when test="starts-with($content,'&#x021FF;')"><xsl:value-of select="'\leftrightarrowtria* '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x021FF;')"/></xsl:call-template></xsl:when>
- <!-- ====================================================================== -->
- <!-- 	Unicode 3.2
- 	Mathematical Operators
-@@ -224,7 +626,6 @@
- 		<xsl:when test="starts-with($content,'&#x02204;')"><xsl:value-of select="'\nexists '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02204;')"/></xsl:call-template></xsl:when>	<!--/nexists - negated exists --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02205;&#x0FE00;')"><xsl:value-of select="'\emptyset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02205;&#x0FE00;')"/></xsl:call-template></xsl:when>	<!--/emptyset - zero, slash -->
- 		<xsl:when test="starts-with($content,'&#x02205;')"><xsl:value-of select="'\varnothing '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02205;')"/></xsl:call-template></xsl:when>	<!--/varnothing - circle, slash --> <!-- Required amssymb -->
--<!--		<xsl:when test="starts-with($content,'&#x02206;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02206;')"/></xsl:call-template></xsl:when>-->
- 		<xsl:when test="starts-with($content,'&#x02207;')"><xsl:value-of select="'\nabla '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02207;')"/></xsl:call-template></xsl:when>		<!--/nabla del, Hamilton operator -->
- 		<xsl:when test="starts-with($content,'&#x02208;')"><xsl:value-of select="'\in '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02208;')"/></xsl:call-template></xsl:when>		<!--/in R: set membership  -->
- 		<xsl:when test="starts-with($content,'&#x02209;')"><xsl:value-of select="'\notin '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02209;')"/></xsl:call-template></xsl:when>		<!--/notin N: negated set membership -->
-@@ -236,7 +637,6 @@
- 		<xsl:when test="starts-with($content,'&#x02212;')"><xsl:value-of select="'-'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02212;')"/></xsl:call-template></xsl:when>		<!--B: minus sign -->		
- 		<xsl:when test="starts-with($content,'&#x02213;')"><xsl:value-of select="'\mp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02213;')"/></xsl:call-template></xsl:when>		<!--/mp B: minus-or-plus sign -->
- 		<xsl:when test="starts-with($content,'&#x02214;')"><xsl:value-of select="'\dotplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02214;')"/></xsl:call-template></xsl:when>	<!--/dotplus B: plus sign, dot above --> <!-- Required amssymb -->
--<!--		<xsl:when test="starts-with($content,'&#x02215;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02215;')"/></xsl:call-template></xsl:when>-->
- 		<xsl:when test="starts-with($content,'&#x02216;')"><xsl:value-of select="'\setminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02216;')"/></xsl:call-template></xsl:when>	<!--/setminus B: reverse solidus -->
- 		<xsl:when test="starts-with($content,'&#x02217;')"><xsl:value-of select="'\ast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02217;')"/></xsl:call-template></xsl:when>		<!--low asterisk -->
- 		<xsl:when test="starts-with($content,'&#x02218;')"><xsl:value-of select="'\circ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02218;')"/></xsl:call-template></xsl:when>		<!--/circ B: composite function (small circle) -->
-@@ -244,11 +644,11 @@
- 		<xsl:when test="starts-with($content,'&#x0221A;')"><xsl:value-of select="'\surd '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221A;')"/></xsl:call-template></xsl:when>		<!--/surd radical -->
- 		<xsl:when test="starts-with($content,'&#x0221D;')"><xsl:value-of select="'\propto '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221D;')"/></xsl:call-template></xsl:when>	<!--/propto R: is proportional to -->
- 		<xsl:when test="starts-with($content,'&#x0221E;')"><xsl:value-of select="'\infty '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221E;')"/></xsl:call-template></xsl:when>		<!--/infty infinity -->
--<!--		<xsl:when test="starts-with($content,'&#x0221F;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221F;')"/></xsl:call-template></xsl:when>		right (90 degree) angle -->
-+		<xsl:when test="starts-with($content,'&#x0221F;')"><xsl:value-of select="'\rightangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221F;')"/></xsl:call-template></xsl:when>		<!--/right (90 degree) angle -->
- 		<xsl:when test="starts-with($content,'&#x02220;')"><xsl:value-of select="'\angle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02220;')"/></xsl:call-template></xsl:when>		<!--/angle - angle -->
- 		<xsl:when test="starts-with($content,'&#x02221;')"><xsl:value-of select="'\measuredangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02221;')"/></xsl:call-template></xsl:when>	<!--/measuredangle - angle-measured -->	<!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02222;')"><xsl:value-of select="'\sphericalangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02222;')"/></xsl:call-template></xsl:when><!--/sphericalangle angle-spherical -->	<!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02223;')"><xsl:value-of select="'\mid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02223;')"/></xsl:call-template></xsl:when>		<!--/mid R: -->
-+		<xsl:when test="starts-with($content,'&#x02223;')"><xsl:value-of select="'|'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02223;')"/></xsl:call-template></xsl:when>		<!--/mid R: -->
- 		<xsl:when test="starts-with($content,'&#x02224;&#x0FE00;')"><xsl:value-of select="'\nshortmid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02224;&#x0FE00;')"/></xsl:call-template></xsl:when>	<!--/nshortmid --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02224;')"><xsl:value-of select="'\nmid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02224;')"/></xsl:call-template></xsl:when>		<!--/nmid --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02225;')"><xsl:value-of select="'\parallel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02225;')"/></xsl:call-template></xsl:when>	<!--/parallel R: parallel -->
-@@ -262,95 +662,104 @@
- 		<xsl:when test="starts-with($content,'&#x0222C;')"><xsl:value-of select="'\iint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222C;')"/></xsl:call-template></xsl:when>		<!--double integral operator --> <!-- Required amsmath -->
- 		<xsl:when test="starts-with($content,'&#x0222D;')"><xsl:value-of select="'\iiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222D;')"/></xsl:call-template></xsl:when>		<!--/iiint triple integral operator -->	<!-- Required amsmath -->
- 		<xsl:when test="starts-with($content,'&#x0222E;')"><xsl:value-of select="'\oint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222E;')"/></xsl:call-template></xsl:when>		<!--/oint L: contour integral operator -->
--<!--		<xsl:when test="starts-with($content,'&#x0222F;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222F;')"/></xsl:call-template></xsl:when>-->
--<!--		<xsl:when test="starts-with($content,'&#x02230;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02230;')"/></xsl:call-template></xsl:when>-->
--<!--		<xsl:when test="starts-with($content,'&#x02231;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02231;')"/></xsl:call-template></xsl:when>-->
--<!--		<xsl:when test="starts-with($content,'&#x02232;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02232;')"/></xsl:call-template></xsl:when>-->
--<!--		<xsl:when test="starts-with($content,'&#x02233;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02233;')"/></xsl:call-template></xsl:when>-->
-+		<xsl:when test="starts-with($content,'&#x0222F;')"><xsl:value-of select="'\backslash oiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222F;')"/></xsl:call-template></xsl:when>        <!-- \surfintegral -->
-+		<xsl:when test="starts-with($content,'&#x02230;')"><xsl:value-of select="'\backslash oiiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02230;')"/></xsl:call-template></xsl:when>			<!-- \volintegral -->
-+		<xsl:when test="starts-with($content,'&#x02231;')"><xsl:value-of select="'\clwintegral '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02231;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02232;')"><xsl:value-of select="'\ElsevierGlyph{2232}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02232;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02233;')"><xsl:value-of select="'\ElsevierGlyph{2233}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02233;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02234;')"><xsl:value-of select="'\therefore '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02234;')"/></xsl:call-template></xsl:when>	<!--/therefore R: therefore --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02235;')"><xsl:value-of select="'\because '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02235;')"/></xsl:call-template></xsl:when>	<!--/because R: because --> <!-- Required amssymb -->
- <!-- ? -->	<xsl:when test="starts-with($content,'&#x02236;')"><xsl:value-of select="':'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02236;')"/></xsl:call-template></xsl:when>		<!--/ratio -->
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x02237;')"><xsl:value-of select="'\colon\colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02237;')"/></xsl:call-template></xsl:when>	<!--/Colon, two colons -->
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x02238;')"><xsl:value-of select="'\dot{-}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02238;')"/></xsl:call-template></xsl:when>		<!--/dotminus B: minus sign, dot above -->
-+		<xsl:when test="starts-with($content,'&#x02237;')"><xsl:value-of select="'\Colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02237;')"/></xsl:call-template></xsl:when>	<!--/Colon, two colons -->
-+		<xsl:when test="starts-with($content,'&#x02238;')"><xsl:value-of select="'\dotminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02238;')"/></xsl:call-template></xsl:when>		<!--/dotminus B: minus sign, dot above -->
- <!--		<xsl:when test="starts-with($content,'&#x02239;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02239;')"/></xsl:call-template></xsl:when>		-->
--<!--		<xsl:when test="starts-with($content,'&#x0223A;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223A;')"/></xsl:call-template></xsl:when>		minus with four dots, geometric properties -->		
--<!--		<xsl:when test="starts-with($content,'&#x0223B;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223B;')"/></xsl:call-template></xsl:when>		homothetic -->
-+		<xsl:when test="starts-with($content,'&#x0223A;')"><xsl:value-of select="'\mathbin{{:}\!\!{-}\!\!{:}}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223A;')"/></xsl:call-template></xsl:when> <!-- minus with four dots, geometric properties -->		
-+		<xsl:when test="starts-with($content,'&#x0223B;')"><xsl:value-of select="'\kernelcontraction '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223B;')"/></xsl:call-template></xsl:when>			<!-- homothetic -->
- 		<xsl:when test="starts-with($content,'&#x0223C;')"><xsl:value-of select="'\sim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223C;')"/></xsl:call-template></xsl:when>		<!--/sim R: similar -->
- 		<xsl:when test="starts-with($content,'&#x0223D;')"><xsl:value-of select="'\backsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223D;')"/></xsl:call-template></xsl:when>	<!--/backsim R: reverse similar --> <!-- Required amssymb -->
--<!--		<xsl:when test="starts-with($content,'&#x0223E;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223E;')"/></xsl:call-template></xsl:when>		most positive -->
-+		<xsl:when test="starts-with($content,'&#x0223E;')"><xsl:value-of select="'\lazysinv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223E;')"/></xsl:call-template></xsl:when>			<!-- most positive -->
- <!--		<xsl:when test="starts-with($content,'&#x0223F;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223F;')"/></xsl:call-template></xsl:when>		ac current -->
- 		<xsl:when test="starts-with($content,'&#x02240;')"><xsl:value-of select="'\wr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02240;')"/></xsl:call-template></xsl:when>		<!--/wr B: wreath product -->
- 		<xsl:when test="starts-with($content,'&#x02241;')"><xsl:value-of select="'\nsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02241;')"/></xsl:call-template></xsl:when>		<!--/nsim N: not similar --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02242;&#x00338;')"><xsl:value-of select="'\neqsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02242;&#x00338;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02242;')"><xsl:value-of select="'\eqsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02242;')"/></xsl:call-template></xsl:when>		<!--/esim R: equals, similar --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02243;')"><xsl:value-of select="'\simeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02243;')"/></xsl:call-template></xsl:when>		<!--/simeq R: similar, equals -->
--		<xsl:when test="starts-with($content,'&#x02244;')"><xsl:value-of select="'\not\simeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02244;')"/></xsl:call-template></xsl:when>	<!--/nsimeq N: not similar, equals -->
-+		<xsl:when test="starts-with($content,'&#x02244;')"><xsl:value-of select="'\nsime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02244;')"/></xsl:call-template></xsl:when>		<!--/nsimeq N: not similar, equals -->
- 		<xsl:when test="starts-with($content,'&#x02245;')"><xsl:value-of select="'\cong '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02245;')"/></xsl:call-template></xsl:when>		<!--/cong R: congruent with -->
--<!--		<xsl:when test="starts-with($content,'&#x02246;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02246;')"/></xsl:call-template></xsl:when>		similar, not equals -->
-+		<xsl:when test="starts-with($content,'&#x02246;')"><xsl:value-of select="'\approxnotequal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02246;')"/></xsl:call-template></xsl:when><!--	similar, not equals -->
- 		<xsl:when test="starts-with($content,'&#x02247;')"><xsl:value-of select="'\ncong '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02247;')"/></xsl:call-template></xsl:when>		<!--/ncong N: not congruent with --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02248;')"><xsl:value-of select="'\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02248;')"/></xsl:call-template></xsl:when>	<!--/approx R: approximate -->
-+		<xsl:when test="starts-with($content,'&#x02248;')"><xsl:value-of select="'\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02248;')"/></xsl:call-template></xsl:when>		<!--/approx R: approximate -->
- <!--		<xsl:when test="starts-with($content,'&#x02249;&#x00338;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02249;&#x00338;')"/></xsl:call-template></xsl:when>	not, vert, approximate -->
--		<xsl:when test="starts-with($content,'&#x02249;')"><xsl:value-of select="'\not\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02249;')"/></xsl:call-template></xsl:when>	<!--/napprox N: not approximate -->
-+		<xsl:when test="starts-with($content,'&#x02249;')"><xsl:value-of select="'\napprox '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02249;')"/></xsl:call-template></xsl:when>	<!--/napprox N: not approximate -->
- 		<xsl:when test="starts-with($content,'&#x0224A;')"><xsl:value-of select="'\approxeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224A;')"/></xsl:call-template></xsl:when>	<!--/approxeq R: approximate, equals --> <!-- Required amssymb -->
--<!--		<xsl:when test="starts-with($content,'&#x0224B;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224B;')"/></xsl:call-template></xsl:when>		approximately identical to -->
--<!--		<xsl:when test="starts-with($content,'&#x0224C;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224C;')"/></xsl:call-template></xsl:when>		/backcong R: reverse congruent -->
-+		<xsl:when test="starts-with($content,'&#x0224B;&#x00338;')"><xsl:value-of select="'\not\apid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224B;&#x00338;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0224B;')"><xsl:value-of select="'\tildetrpl '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224B;')"/></xsl:call-template></xsl:when>	<!--	approximately identical to -->
-+		<xsl:when test="starts-with($content,'&#x0224C;')"><xsl:value-of select="'\allequal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224C;')"/></xsl:call-template></xsl:when>	<!-- /backcong R: reverse congruent -->
- 		<xsl:when test="starts-with($content,'&#x0224D;')"><xsl:value-of select="'\asymp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224D;')"/></xsl:call-template></xsl:when>		<!--/asymp R: asymptotically equal to -->
--		<xsl:when test="starts-with($content,'&#x0224E;')"><xsl:value-of select="'\Bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224E;')"/></xsl:call-template></xsl:when>	<!--/Bumpeq R: bumpy equals --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x0224F;')"><xsl:value-of select="'\bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224F;')"/></xsl:call-template></xsl:when>	<!--/bumpeq R: bumpy equals, equals --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x0224E;&#x00338;')"><xsl:value-of select="'\nBumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224E;&#x00338;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0224E;')"><xsl:value-of select="'\Bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224E;')"/></xsl:call-template></xsl:when>		<!--/Bumpeq R: bumpy equals --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x0224F;&#x00338;')"><xsl:value-of select="'\nbumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224F;&#x00338;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0224F;')"><xsl:value-of select="'\bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224F;')"/></xsl:call-template></xsl:when>		<!--/bumpeq R: bumpy equals, equals --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02250;&#x00338;')"><xsl:value-of select="'\not\doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02250;&#x00338;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02250;')"><xsl:value-of select="'\doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02250;')"/></xsl:call-template></xsl:when>		<!--/doteq R: equals, single dot above -->
--		<xsl:when test="starts-with($content,'&#x02251;')"><xsl:value-of select="'\doteqdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02251;')"/></xsl:call-template></xsl:when>	<!--/doteqdot /Doteq R: eq, even dots --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02252;')"><xsl:value-of select="'\fallingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02252;')"/></xsl:call-template></xsl:when>	<!--/fallingdotseq R: eq, falling dots --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02251;')"><xsl:value-of select="'\Doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02251;')"/></xsl:call-template></xsl:when>	<!--/doteqdot /Doteq R: eq, even dots --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02252;')"><xsl:value-of select="'\fallingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02252;')"/></xsl:call-template></xsl:when><!--/fallingdotseq R: eq, falling dots --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02253;')"><xsl:value-of select="'\risingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02253;')"/></xsl:call-template></xsl:when>	<!--/risingdotseq R: eq, rising dots --> <!-- Required amssymb -->
--<!--		<xsl:when test="starts-with($content,'&#x02254;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02254;')"/></xsl:call-template></xsl:when>		/coloneq R: colon, equals -->
--<!--		<xsl:when test="starts-with($content,'&#x02255;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02255;')"/></xsl:call-template></xsl:when>		/eqcolon R: equals, colon -->
--		<xsl:when test="starts-with($content,'&#x02256;')"><xsl:value-of select="'\eqcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02256;')"/></xsl:call-template></xsl:when>	<!--/eqcirc R: circle on equals sign --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02257;')"><xsl:value-of select="'\circeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02257;')"/></xsl:call-template></xsl:when>	<!--/circeq R: circle, equals --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02254;')"><xsl:value-of select="'\coloneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02254;')"/></xsl:call-template></xsl:when>	<!--/coloneq R: colon, equals -->
-+		<xsl:when test="starts-with($content,'&#x02255;')"><xsl:value-of select="'\eqcolon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02255;')"/></xsl:call-template></xsl:when>	<!--/eqcolon R: equals, colon -->
-+		<xsl:when test="starts-with($content,'&#x02256;')"><xsl:value-of select="'\eqcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02256;')"/></xsl:call-template></xsl:when>		<!--/eqcirc R: circle on equals sign --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02257;')"><xsl:value-of select="'\circeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02257;')"/></xsl:call-template></xsl:when>		<!--/circeq R: circle, equals --> <!-- Required amssymb -->
- <!-- ? -->	<xsl:when test="starts-with($content,'&#x02258;')"><xsl:value-of select="'\stackrel{\frown}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02258;')"/></xsl:call-template></xsl:when>
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x02259;')"><xsl:value-of select="'\stackrel{\wedge}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02259;')"/></xsl:call-template></xsl:when>	<!--/wedgeq R: corresponds to (wedge, equals) -->
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x0225A;')"><xsl:value-of select="'\stackrel{\vee}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225A;')"/></xsl:call-template></xsl:when>	<!--logical or, equals -->
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x0225B;')"><xsl:value-of select="'\stackrel{\star}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225B;')"/></xsl:call-template></xsl:when>	<!--equal, asterisk above -->
-+		<xsl:when test="starts-with($content,'&#x02259;')"><xsl:value-of select="'\wedgeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02259;')"/></xsl:call-template></xsl:when>	<!--/wedgeq R: corresponds to (wedge, equals) -->
-+		<xsl:when test="starts-with($content,'&#x0225A;')"><xsl:value-of select="'\ElsevierGlyph{225A}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225A;')"/></xsl:call-template></xsl:when>	<!--logical or, equals -->
-+		<xsl:when test="starts-with($content,'&#x0225B;')"><xsl:value-of select="'\starequal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225B;')"/></xsl:call-template></xsl:when>	<!--equal, asterisk above -->
- 		<xsl:when test="starts-with($content,'&#x0225C;')"><xsl:value-of select="'\triangleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225C;')"/></xsl:call-template></xsl:when>	<!--/triangleq R: triangle, equals --> <!-- Required amssymb -->
- <!-- ? -->	<xsl:when test="starts-with($content,'&#x0225D;')"><xsl:value-of select="'\stackrel{\scriptscriptstyle\mathrm{def}}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225D;')"/></xsl:call-template></xsl:when>
- <!-- ? -->	<xsl:when test="starts-with($content,'&#x0225E;')"><xsl:value-of select="'\stackrel{\scriptscriptstyle\mathrm{m}}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225E;')"/></xsl:call-template></xsl:when>	
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x0225F;')"><xsl:value-of select="'\stackrel{?}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225F;')"/></xsl:call-template></xsl:when>	<!--/questeq R: equal with questionmark -->
-+		<xsl:when test="starts-with($content,'&#x0225F;')"><xsl:value-of select="'\questeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225F;')"/></xsl:call-template></xsl:when>	<!--/questeq R: equal with questionmark -->
- <!--		<xsl:when test="starts-with($content,'&#x02260;&#x0FE00;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02260;&#x0FE00;')"/></xsl:call-template></xsl:when>	not equal, dot -->
- 		<xsl:when test="starts-with($content,'&#x02260;')"><xsl:value-of select="'\ne '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02260;')"/></xsl:call-template></xsl:when>		<!--/ne /neq R: not equal -->
- <!--		<xsl:when test="starts-with($content,'&#x02261;&#x020E5;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02261;&#x020E5;')"/></xsl:call-template></xsl:when>	reverse not equivalent -->
- 		<xsl:when test="starts-with($content,'&#x02261;')"><xsl:value-of select="'\equiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02261;')"/></xsl:call-template></xsl:when>		<!--/equiv R: identical with -->
--		<xsl:when test="starts-with($content,'&#x02262;')"><xsl:value-of select="'\not\equiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02262;')"/></xsl:call-template></xsl:when>	<!--/nequiv N: not identical with -->
-+		<xsl:when test="starts-with($content,'&#x02262;')"><xsl:value-of select="'\nequiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02262;')"/></xsl:call-template></xsl:when>	<!--/nequiv N: not identical with -->
- <!--		<xsl:when test="starts-with($content,'&#x02263;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02263;')"/></xsl:call-template></xsl:when>		-->
- 		<xsl:when test="starts-with($content,'&#x02264;')"><xsl:value-of select="'\le '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02264;')"/></xsl:call-template></xsl:when>		<!--/leq /le R: less-than-or-equal -->
- 		<xsl:when test="starts-with($content,'&#x02265;')"><xsl:value-of select="'\ge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02265;')"/></xsl:call-template></xsl:when>		<!--/geq /ge R: greater-than-or-equal -->
- 		<xsl:when test="starts-with($content,'&#x02266;')"><xsl:value-of select="'\leqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02266;')"/></xsl:call-template></xsl:when>		<!--/leqq R: less, double equals --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02267;')"><xsl:value-of select="'\geqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02267;')"/></xsl:call-template></xsl:when>		<!--/geqq R: greater, double equals --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02268;&#x0FE00;')"><xsl:value-of select="'\lvertneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02268;&#x0FE00;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02268;')"><xsl:value-of select="'\lneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02268;')"/></xsl:call-template></xsl:when>		<!--/lneqq N: less, not double equals --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02269;&#x0FE00;')"><xsl:value-of select="'\gvertneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02269;&#x0FE00;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02269;')"><xsl:value-of select="'\gneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02269;')"/></xsl:call-template></xsl:when>		<!--/gneqq N: greater, not dbl equals --> <!-- Required amssymb -->
- <!--		<xsl:when test="starts-with($content,'&#x0226A;&#x00338;&#x0FE00;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;&#x00338;&#x0FE00;')"/></xsl:call-template></xsl:when>	not much less than, variant -->
--<!--		<xsl:when test="starts-with($content,'&#x0226A;&#x00338;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;&#x00338;')"/></xsl:call-template></xsl:when>	not, vert, much less than -->
-+		<xsl:when test="starts-with($content,'&#x0226A;&#x00338;')"><xsl:value-of select="'\NotLessLess '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;&#x00338;')"/></xsl:call-template></xsl:when>	<!-- not, vert, much less than -->
- 		<xsl:when test="starts-with($content,'&#x0226A;')"><xsl:value-of select="'\ll '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;')"/></xsl:call-template></xsl:when>		<!--/ll R: double less-than sign -->
- <!--		<xsl:when test="starts-with($content,'&#x0226B;&#x00338;&#x0FE00;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;&#x00338;&#x0FE00;')"/></xsl:call-template></xsl:when>	not much greater than, variant -->
--<!--		<xsl:when test="starts-with($content,'&#x0226B;&#x00338;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;&#x00338;')"/></xsl:call-template></xsl:when>	not, vert, much greater than -->
-+		<xsl:when test="starts-with($content,'&#x0226B;&#x00338;')"><xsl:value-of select="'\NotGreaterGreater '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;&#x00338;')"/></xsl:call-template></xsl:when>	<!-- not, vert, much greater than -->
- 		<xsl:when test="starts-with($content,'&#x0226B;')"><xsl:value-of select="'\gg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;')"/></xsl:call-template></xsl:when>		<!--/gg R: dbl greater-than sign -->
- 		<xsl:when test="starts-with($content,'&#x0226C;')"><xsl:value-of select="'\between '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226C;')"/></xsl:call-template></xsl:when>	<!--/between R: between --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x0226D;')"><xsl:value-of select="'\not\asymp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226D;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0226D;')"><xsl:value-of select="'\not\kern-0.3em\times '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226D;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0226E;')"><xsl:value-of select="'\nless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226E;')"/></xsl:call-template></xsl:when>		<!--/nless N: not less-than --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x0226F;')"><xsl:value-of select="'\ngtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226F;')"/></xsl:call-template></xsl:when>		<!--/ngtr N: not greater-than --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02270;&#x020E5;')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02270;&#x020E5;')"/></xsl:call-template></xsl:when>	<!--/nleq N: not less-than-or-equal --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02270;')"><xsl:value-of select="'\nleqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02270;')"/></xsl:call-template></xsl:when>		<!--/nleqq N: not less, dbl equals --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02271;&#x020E5;')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02271;&#x020E5;')"/></xsl:call-template></xsl:when>	<!--/ngeq N: not greater-than-or-equal --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02271;')"><xsl:value-of select="'\ngeqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02271;')"/></xsl:call-template></xsl:when>		<!--/ngeqq N: not greater, dbl equals --> <!-- Required amssymb -->
-+<!--		<xsl:when test="starts-with($content,'&#x02270;&#x020E5;')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02270;&#x020E5;')"/></xsl:call-template></xsl:when>	/nleq N: not less-than-or-equal --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02270;')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02270;')"/></xsl:call-template></xsl:when>		<!--/nleqq N: not less, dbl equals --> <!-- Required amssymb -->
-+<!--		<xsl:when test="starts-with($content,'&#x02271;&#x020E5;')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02271;&#x020E5;')"/></xsl:call-template></xsl:when> /ngeq N: not greater-than-or-equal --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02271;')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02271;')"/></xsl:call-template></xsl:when>		<!--/ngeqq N: not greater, dbl equals --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02272;')"><xsl:value-of select="'\lesssim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02272;')"/></xsl:call-template></xsl:when>	<!--/lesssim R: less, similar --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02273;')"><xsl:value-of select="'\gtrsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02273;')"/></xsl:call-template></xsl:when>	<!--/gtrsim R: greater, similar --> <!-- Required amssymb -->		
--		<xsl:when test="starts-with($content,'&#x02274;')"><xsl:value-of select="'\not\lesssim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02274;')"/></xsl:call-template></xsl:when>	<!--not less, similar --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02275;')"><xsl:value-of select="'\not\gtrsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02275;')"/></xsl:call-template></xsl:when>	<!--not greater, similar --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02274;')"><xsl:value-of select="'\ElsevierGlyph{2274} '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02274;')"/></xsl:call-template></xsl:when>	<!--not less, similar --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02275;')"><xsl:value-of select="'\ElsevierGlyph{2275} '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02275;')"/></xsl:call-template></xsl:when>	<!--not greater, similar --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02276;')"><xsl:value-of select="'\lessgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02276;')"/></xsl:call-template></xsl:when>	<!--/lessgtr R: less, greater --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02277;')"><xsl:value-of select="'\gtrless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02277;')"/></xsl:call-template></xsl:when>	<!--/gtrless R: greater, less --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02278;')"><xsl:value-of select="'\not\lessgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02278;')"/></xsl:call-template></xsl:when>	<!--not less, greater --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x02279;')"><xsl:value-of select="'\not\gtrless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02279;')"/></xsl:call-template></xsl:when>	<!--not greater, less --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02278;')"><xsl:value-of select="'\notlessgreater '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02278;')"/></xsl:call-template></xsl:when>	<!--not less, greater --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x02279;')"><xsl:value-of select="'\notgreaterless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02279;')"/></xsl:call-template></xsl:when>	<!--not greater, less --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x0227A;')"><xsl:value-of select="'\prec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227A;')"/></xsl:call-template></xsl:when>		<!--/prec R: precedes -->
- 		<xsl:when test="starts-with($content,'&#x0227B;')"><xsl:value-of select="'\succ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227B;')"/></xsl:call-template></xsl:when>		<!--/succ R: succeeds -->
- 		<xsl:when test="starts-with($content,'&#x0227C;')"><xsl:value-of select="'\preccurlyeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227C;')"/></xsl:call-template></xsl:when>	<!--/preccurlyeq R: precedes, curly eq --> <!-- Required amssymb -->		
- 		<xsl:when test="starts-with($content,'&#x0227D;')"><xsl:value-of select="'\succcurlyeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227D;')"/></xsl:call-template></xsl:when>	<!--/succcurlyeq R: succeeds, curly eq --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x0227E;&#x00338;')"><xsl:value-of select="'\nprecsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227E;&#x00338;')"/></xsl:call-template></xsl:when>	
- 		<xsl:when test="starts-with($content,'&#x0227E;')"><xsl:value-of select="'\precsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227E;')"/></xsl:call-template></xsl:when>	<!--/precsim R: precedes, similar --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x0227F;&#x00338;')"><xsl:value-of select="'\nsuccsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227F;&#x00338;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0227F;')"><xsl:value-of select="'\succsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227F;')"/></xsl:call-template></xsl:when>	<!--/succsim R: succeeds, similar --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02280;')"><xsl:value-of select="'\nprec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02280;')"/></xsl:call-template></xsl:when>		<!--/nprec N: not precedes --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x02281;')"><xsl:value-of select="'\nsucc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02281;')"/></xsl:call-template></xsl:when>		<!--/nsucc N: not succeeds --> <!-- Required amssymb -->
-@@ -360,21 +769,59 @@
- 		<xsl:when test="starts-with($content,'&#x02285;')"><xsl:value-of select="'\not\supset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02285;')"/></xsl:call-template></xsl:when>	<!--not superset -->
- 		<xsl:when test="starts-with($content,'&#x02286;')"><xsl:value-of select="'\subseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02286;')"/></xsl:call-template></xsl:when>	<!--/subseteq R: subset, equals -->
- 		<xsl:when test="starts-with($content,'&#x02287;')"><xsl:value-of select="'\supseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02287;')"/></xsl:call-template></xsl:when>	<!--/supseteq R: superset, equals -->
-+		<xsl:when test="starts-with($content,'&#x02288;')"><xsl:value-of select="'\nsubseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02288;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02289;')"><xsl:value-of select="'\nsupseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02289;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0228A;&#x0FE00;')"><xsl:value-of select="'\varsubsetneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228A;&#x0FE00;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0228A;')"><xsl:value-of select="'\subsetneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228A;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0228B;&#x0FE00;')"><xsl:value-of select="'\varsupsetneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228B;&#x0FE00;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0228B;')"><xsl:value-of select="'\supsetneq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228B;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0228D;')"><xsl:value-of select="'\cupdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228D;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0228E;')"><xsl:value-of select="'\uplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228E;')"/></xsl:call-template></xsl:when>		<!--/uplus B: plus sign in union -->
-+		<xsl:when test="starts-with($content,'&#x0228F;&#x00338;')"><xsl:value-of select="'\NotSquareSubset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228F;&#x00338;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0228F;')"><xsl:value-of select="'\sqsubset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228F;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02290;&#x00338;')"><xsl:value-of select="'\NotSquareSuperset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02290;&#x00338;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02290;')"><xsl:value-of select="'\sqsupset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02290;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x02291;')"><xsl:value-of select="'\sqsubseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02291;')"/></xsl:call-template></xsl:when>		
-+		<xsl:when test="starts-with($content,'&#x02292;')"><xsl:value-of select="'\sqsupseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02292;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x02293;')"><xsl:value-of select="'\sqcap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02293;')"/></xsl:call-template></xsl:when>		<!--/sqcap B: square intersection -->
--		<xsl:when test="starts-with($content,'&#x02294;')"><xsl:value-of select="'\bigsqcup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02294;')"/></xsl:call-template></xsl:when>		<!--/sqcup B: square union -->
-+		<xsl:when test="starts-with($content,'&#x02294;')"><xsl:value-of select="'\sqcup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02294;')"/></xsl:call-template></xsl:when>		<!--/sqcup B: square union -->
- 		<xsl:when test="starts-with($content,'&#x02295;')"><xsl:value-of select="'\oplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02295;')"/></xsl:call-template></xsl:when>		<!--/oplus B: plus sign in circle -->
- 		<xsl:when test="starts-with($content,'&#x02296;')"><xsl:value-of select="'\ominus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02296;')"/></xsl:call-template></xsl:when>	<!--/ominus B: minus sign in circle -->
- 		<xsl:when test="starts-with($content,'&#x02297;')"><xsl:value-of select="'\otimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02297;')"/></xsl:call-template></xsl:when>	<!--/otimes B: multiply sign in circle -->
- 		<xsl:when test="starts-with($content,'&#x02298;')"><xsl:value-of select="'\oslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02298;')"/></xsl:call-template></xsl:when>	<!--/oslash B: solidus in circle -->
--<!-- ? -->	<xsl:when test="starts-with($content,'&#x02299;')"><xsl:value-of select="'\odot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02299;')"/></xsl:call-template></xsl:when>		<!--/odot B: middle dot in circle --> <!--/bigodot L: circle dot operator -->
-+		<xsl:when test="starts-with($content,'&#x02299;')"><xsl:value-of select="'\odot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02299;')"/></xsl:call-template></xsl:when>		<!--/odot B: middle dot in circle --> <!--/bigodot L: circle dot operator -->
-+		<xsl:when test="starts-with($content,'&#x0229A;')"><xsl:value-of select="'\circledcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0229A;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0229B;')"><xsl:value-of select="'\circledast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0229B;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0229D;')"><xsl:value-of select="'\circleddash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0229D;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x0229E;')"><xsl:value-of select="'\boxplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0229E;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x0229F;')"><xsl:value-of select="'\boxminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0229F;')"/></xsl:call-template></xsl:when>	<!--/boxminus B: minus sign in box --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x022A0;')"><xsl:value-of select="'\boxtimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A0;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022A1;')"><xsl:value-of select="'\boxdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022A2;')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022A3;')"><xsl:value-of select="'\dashv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A3;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x022A4;')"><xsl:value-of select="'\top '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A4;')"/></xsl:call-template></xsl:when>		<!--/top top -->
- 		<xsl:when test="starts-with($content,'&#x022A5;')"><xsl:value-of select="'\perp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A5;')"/></xsl:call-template></xsl:when>		<!--/perp R: perpendicular --><!--/bot bottom -->
--		<xsl:when test="starts-with($content,'&#x022A6;')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A6;')"/></xsl:call-template></xsl:when>		<!--/vdash R: vertical, dash -->
--		<xsl:when test="starts-with($content,'&#x022A7;')"><xsl:value-of select="'\vDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A7;')"/></xsl:call-template></xsl:when>		<!--/vDash R: vertical, dbl dash --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x022A8;')"><xsl:value-of select="'\models '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A8;')"/></xsl:call-template></xsl:when>	<!--/models R: -->
-+<!--		<xsl:when test="starts-with($content,'&#x022A6;')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A6;')"/></xsl:call-template></xsl:when> /vdash R: vertical, dash -->
-+		<xsl:when test="starts-with($content,'&#x022A7;')"><xsl:value-of select="'\models '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A7;')"/></xsl:call-template></xsl:when>		<!--/vDash R: vertical, dbl dash --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x022A8;')"><xsl:value-of select="'\vDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A8;')"/></xsl:call-template></xsl:when>	<!--/models R: -->
-+		<xsl:when test="starts-with($content,'&#x022A9;')"><xsl:value-of select="'\Vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A9;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x022AA;')"><xsl:value-of select="'\Vvdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AA;')"/></xsl:call-template></xsl:when>	<!--/Vvdash R: triple vertical, dash --> <!-- Required amssymb -->
-+		<xsl:when test="starts-with($content,'&#x022AB;')"><xsl:value-of select="'\VDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022AC;')"><xsl:value-of select="'\nvdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AC;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022AD;')"><xsl:value-of select="'\nvDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AD;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022AE;')"><xsl:value-of select="'\nVdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022AF;')"><xsl:value-of select="'\nVDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AF;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B2;')"><xsl:value-of select="'\vartriangleleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B3;')"><xsl:value-of select="'\vartriangleright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B4;')"><xsl:value-of select="'\trianglelefteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B4;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B5;')"><xsl:value-of select="'\trianglerighteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B5;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B6;')"><xsl:value-of select="'\original '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B6;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B7;')"><xsl:value-of select="'\image '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B8;')"><xsl:value-of select="'\multimap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022B9;')"><xsl:value-of select="'\hermitconjmatrix '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022B9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022BA;')"><xsl:value-of select="'\intercal '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022BA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022BB;')"><xsl:value-of select="'\veebar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022BB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022BE;')"><xsl:value-of select="'\rightanglearc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022BE;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x022C0;')"><xsl:value-of select="'\bigwedge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C0;')"/></xsl:call-template></xsl:when>	<!--/bigwedge L: logical or operator -->
- 		<xsl:when test="starts-with($content,'&#x022C1;')"><xsl:value-of select="'\bigvee '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C1;')"/></xsl:call-template></xsl:when>	<!--/bigcap L: intersection operator -->
- 		<xsl:when test="starts-with($content,'&#x022C2;')"><xsl:value-of select="'\bigcap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C2;')"/></xsl:call-template></xsl:when>	<!--/bigvee L: logical and operator -->
-@@ -384,11 +831,41 @@
- 		<xsl:when test="starts-with($content,'&#x022C6;')"><xsl:value-of select="'\star '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C6;')"/></xsl:call-template></xsl:when>		<!--/star B: small star, filled -->
- 		<xsl:when test="starts-with($content,'&#x022C7;')"><xsl:value-of select="'\divideontimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C7;')"/></xsl:call-template></xsl:when>	<!--/divideontimes B: division on times --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x022C8;')"><xsl:value-of select="'\bowtie '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C8;')"/></xsl:call-template></xsl:when>	<!--/bowtie R: -->
-+		<xsl:when test="starts-with($content,'&#x022C9;')"><xsl:value-of select="'\ltimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022CA;')"><xsl:value-of select="'\rtimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022CB;')"><xsl:value-of select="'\leftthreetimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022CC;')"><xsl:value-of select="'\rightthreetimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CC;')"/></xsl:call-template></xsl:when>
- 		<xsl:when test="starts-with($content,'&#x022CD;')"><xsl:value-of select="'\backsimeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CD;')"/></xsl:call-template></xsl:when>	<!--/backsimeq R: reverse similar, eq --> <!-- Required amssymb -->
--		<xsl:when test="starts-with($content,'&#x022EF;')"><xsl:value-of select="'\cdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EF;')"/></xsl:call-template></xsl:when>		<!--/cdots, three dots, centered -->
--<!--		<xsl:when test="starts-with($content,'&#x022F0;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022F0;')"/></xsl:call-template></xsl:when>		three dots, ascending -->
--		<xsl:when test="starts-with($content,'&#x022F1;')"><xsl:value-of select="'\ddots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022F1;')"/></xsl:call-template></xsl:when>		<!--/ddots, three dots, descending -->
--
-+		<xsl:when test="starts-with($content,'&#x022CE;')"><xsl:value-of select="'\curlyvee '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022CF;')"><xsl:value-of select="'\curlywedge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CF;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D0;')"><xsl:value-of select="'\Subset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D0;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D1;')"><xsl:value-of select="'\Supset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D1;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D2;')"><xsl:value-of select="'\Cap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D3;')"><xsl:value-of select="'\Cup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D4;')"><xsl:value-of select="'\pitchfork '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D4;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D6;')"><xsl:value-of select="'\lessdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D6;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D7;')"><xsl:value-of select="'\gtrdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D8;')"><xsl:value-of select="'\verymuchless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022D9;')"><xsl:value-of select="'\ggg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022D9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022DA;')"><xsl:value-of select="'\lesseqgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022DA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022DB;')"><xsl:value-of select="'\gtreqless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022DB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022DE;')"><xsl:value-of select="'\curlyeqprec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022DE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022DF;')"><xsl:value-of select="'\curlyeqsucc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022DF;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E2;')"><xsl:value-of select="'\not\sqsubseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E2;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E3;')"><xsl:value-of select="'\not\sqsupseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E3;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E5;')"><xsl:value-of select="'\Elzsqspne '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E5;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E6;')"><xsl:value-of select="'\lnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E6;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E7;')"><xsl:value-of select="'\gnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E7;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E8;')"><xsl:value-of select="'\precnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E8;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022E9;')"><xsl:value-of select="'\succnsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022E9;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022EA;')"><xsl:value-of select="'\ntriangleleft '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EA;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022EB;')"><xsl:value-of select="'\ntriangleright '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EB;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022EC;')"><xsl:value-of select="'\ntrianglelefteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EC;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022ED;')"><xsl:value-of select="'\ntrianglerighteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022ED;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022EE;')"><xsl:value-of select="'\vdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EE;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test="starts-with($content,'&#x022EF;')"><xsl:value-of select="'\cdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EF;')"/></xsl:call-template></xsl:when>	<!--/cdots, three dots, centered -->
-+		<xsl:when test="starts-with($content,'&#x022F0;')"><xsl:value-of select="'\backslash adots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022F0;')"/></xsl:call-template></xsl:when>	<!-- three dots, ascending -->
-+		<xsl:when test="starts-with($content,'&#x022F1;')"><xsl:value-of select="'\ddots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022F1;')"/></xsl:call-template></xsl:when>	<!--/ddots, three dots, descending -->
- <!-- ====================================================================== -->
- <!-- 	Unicode 3.2
- 	Miscellaneous Technical
-@@ -404,20 +881,22 @@
- <!-- ====================================================================== -->		
- 		<xsl:when test="starts-with($content,'&#x025A1;')"><xsl:value-of select="'\square '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x025A1;')"/></xsl:call-template></xsl:when>	<!--/square, square --> <!-- Required amssymb -->
- 		<xsl:when test="starts-with($content,'&#x025AA;')"><xsl:value-of select="'\blacksquare '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x025AA;')"/></xsl:call-template></xsl:when>	<!--/blacksquare, square, filled  --> <!-- Required amssymb -->
-+
-+		<xsl:when test='starts-with($content,"&#x19b;")'><xsl:value-of select='"\lambda\!\!\!{}^{-}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x19b;')"/></xsl:call-template></xsl:when>
-+
-+<!-- Double brackets (only supported as workaround in MediaWiki). -->
-+		<xsl:when test='starts-with($content,"&#x301a;")'><xsl:value-of select='"[\!["' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x301a;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test='starts-with($content,"&#x301b;")'><xsl:value-of select='"]\!]"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x301b;')"/></xsl:call-template></xsl:when>
-+
-+<!-- Entities undefined in Unicode, but used by OOo for parenteses. -->
-+		<xsl:when test='starts-with($content,"&#xe09e;")'><xsl:value-of select='"("' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#xe09e;')"/></xsl:call-template></xsl:when>
-+		<xsl:when test='starts-with($content,"&#xe09f;")'><xsl:value-of select='")"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#xe09f;')"/></xsl:call-template></xsl:when>
- 		
- 		<xsl:when test='starts-with($content,"&apos;")'><xsl:value-of select='"\text{&apos;}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select='substring-after($content, "&apos;")'/></xsl:call-template></xsl:when><!-- \text required amslatex -->
- 
- 		<xsl:when test='starts-with($content,"{")'><xsl:value-of select='"\{"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '{')"/></xsl:call-template></xsl:when>
- 		<xsl:when test='starts-with($content,"}")'><xsl:value-of select='"\}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '}')"/></xsl:call-template></xsl:when>
--
--<!--- special characters -->
--		<xsl:when test='starts-with($content,"$")'><xsl:value-of select='"\$"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '$')"/></xsl:call-template></xsl:when>
--		<xsl:when test='starts-with($content,"#")'><xsl:value-of select='"\#"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '#')"/></xsl:call-template></xsl:when>
--		<xsl:when test='starts-with($content,"&amp;")'><xsl:value-of select='"\&amp;"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&amp;')"/></xsl:call-template></xsl:when>
--		<xsl:when test='starts-with($content,"%")'><xsl:value-of select='"\%"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '%')"/></xsl:call-template></xsl:when>
--		<xsl:when test='starts-with($content,"_")'><xsl:value-of select='"\_"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '_')"/></xsl:call-template></xsl:when>
--		<xsl:when test='starts-with($content,"\")'><xsl:value-of select='"\backslash "' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when>
--
-+
- 		<xsl:otherwise>
- 			<xsl:value-of select="substring($content,1,1)"/>
- 			<xsl:call-template name="replaceEntities">
-@@ -445,7 +924,12 @@
- 			<xsl:when test='starts-with($content,"&amp;")'><xsl:value-of select='"\&amp;"' /><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '&amp;')"/></xsl:call-template></xsl:when>
- 			<xsl:when test='starts-with($content,"%")'><xsl:value-of select='"\%"' /><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '%')"/></xsl:call-template></xsl:when>
- 			<xsl:when test='starts-with($content,"_")'><xsl:value-of select='"\_"' /><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '_')"/></xsl:call-template></xsl:when>
--			<xsl:when test='starts-with($content,"\")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when>
-+			<xsl:when test='starts-with($content,"\")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '\')"/></xsl:call-template></xsl:when>
-+			
-+			<!-- Ignore "lower than" and "greater than" symbols, which break the MediaWiki parser in text mode. -->
-+			<xsl:when test='starts-with($content,"&gt;")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '&gt;')"/></xsl:call-template></xsl:when>
-+			<xsl:when test='starts-with($content,"&lt;")'><xsl:call-template name="replaceMtextEntities"><xsl:with-param name="content" select="substring-after($content, '&lt;')"/></xsl:call-template></xsl:when>
-+			
- 			<xsl:otherwise>
- 				<xsl:value-of select="substring($content,1,1)"/>
- 				<xsl:call-template name="replaceMtextEntities">
---- misc/xsltml_2.1.2/glayout.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/glayout.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -1,12 +1,13 @@
- <?xml version='1.0' encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
--		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+		xmlns:oomath="http://www.w3.org/1998/Math/MathML"
-                 version='1.0'>
- 
- <!-- ====================================================================== -->
--<!-- $Id: glayout.xsl,v 1.5 2003/06/10 12:24:04 shade33 Exp $
-+<!-- $Id: glayout.xsl 2755 2008-03-07 20:35:56Z hauma $
-      This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
-+     See ./README or http://xsltml.sf.net for
-      copyright and other information                                        -->
- <!-- ====================================================================== -->
- 
-@@ -92,17 +93,16 @@
- 
- <xsl:template match="m:mfenced">
- 	<xsl:choose>
--		<xsl:when test="@open">
--			<xsl:if test="translate(@open,'{}[]()|','{{{{{{{')='{'">
-+		<xsl:when test="@oomath:open">
-+			<xsl:if test="translate(@oomath:open,'{}[]()&#xe09e;&#xe09f;|&#x02223;','{{{{{{{{{{')='{'">
- 				<xsl:text>\left</xsl:text>
- 			</xsl:if>
--			<xsl:if test="@open='{' or @open='}'">
--				<xsl:text>\</xsl:text>
--			</xsl:if>
--			<xsl:if test="translate(@open,'{}[]()|','{{{{{{{')!='{' and (translate(@close,'{}[]()|','{{{{{{{')='{' or not(@close))">
-+			<xsl:if test="translate(@oomath:open,'{}[]()&#xe09e;&#xe09f;|&#x02223;','{{{{{{{{{{')!='{' and (translate(@oomath:close,'{}[]()&#xe09e;&#xe09f;|&#x02223;','{{{{{{{{{{')='{' or not(@oomath:close))">
- 				<xsl:text>\left.</xsl:text>
--			</xsl:if>
--			<xsl:value-of select="@open"/>
-+			</xsl:if>
-+			<xsl:call-template name="replaceEntities">
-+				<xsl:with-param name="content" select="@oomath:open"/>
-+			</xsl:call-template>
- 		</xsl:when>
- 		<xsl:otherwise><xsl:text>\left(</xsl:text></xsl:otherwise>
- 	</xsl:choose>
-@@ -128,26 +128,30 @@
- 				</xsl:if>
- 			</xsl:for-each>
- 	<xsl:choose>
--		<xsl:when test="@close">
--			<xsl:if test="translate(@close,'{}[]()|','{{{{{{{')='{'">
-+		<xsl:when test="@oomath:close">
-+			<xsl:if test="translate(@oomath:close,'{}[]()&#xe09e;&#xe09f;|&#x02223;','{{{{{{{{{{')='{'">
- 				<xsl:text>\right</xsl:text>
- 			</xsl:if>
--			<xsl:if test="@close='{' or @close='}'">
--				<xsl:text>\</xsl:text>
--			</xsl:if>
--			<xsl:if test="translate(@close,'{}[]()|','{{{{{{{')!='{' and (translate(@open,'{}[]()|','{{{{{{{')='{' or not(@open))">
-+			<xsl:if test="translate(@oomath:close,'{}[]()&#xe09e;&#xe09f;|&#x02223;','{{{{{{{{{{')!='{' and (translate(@oomath:open,'{}[]()&#xe09e;&#xe09f;|&#x02223;','{{{{{{{{{{')='{' or not(@oomath:open))">
- 				<xsl:text>\right.</xsl:text>
- 			</xsl:if>
--			<xsl:value-of select="@close"/>
-+			<xsl:call-template name="replaceEntities">
-+				<xsl:with-param name="content" select="@oomath:close"/>
-+			</xsl:call-template>
- 		</xsl:when>
- 		<xsl:otherwise><xsl:text>\right)</xsl:text></xsl:otherwise>
- 	</xsl:choose>	
- </xsl:template>
- 
- <xsl:template match="m:mphantom">
--	<xsl:text>\phantom{</xsl:text>
--	<xsl:apply-templates/>
-+<!-- Not supported by MediaWiki. -->
-+<!-- 
-+ 	<xsl:text>\phantom{</xsl:text>
-+ -->
-+	<xsl:apply-templates/>
-+<!-- 
- 	<xsl:text>}</xsl:text>
-+ -->
- </xsl:template>
- 
- <xsl:template match="m:menclose">
-@@ -193,15 +197,21 @@
- 		</xsl:call-template>
- 		<xsl:text>}{$</xsl:text>
- 	</xsl:if>
--	<xsl:if test="@color[not(@mathcolor)] or @mathcolor">
-+	<xsl:if test="@color or @mathcolor">
-+		<xsl:variable name="color">
-+			<xsl:choose>
-+				<xsl:when test="@mathcolor"><xsl:value-of select="@mathcolor"/></xsl:when>
-+				<xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when>
-+			</xsl:choose>
-+		</xsl:variable>
- 		<xsl:text>\textcolor[rgb]{</xsl:text>
- 		<xsl:call-template name="color">
--			<xsl:with-param name="color" select="@color|@mathcolor"/>
-+			<xsl:with-param name="color" select="$color"/>
- 		</xsl:call-template>
- 		<xsl:text>}{</xsl:text>
- 	</xsl:if>
- 	<xsl:apply-templates/>
--	<xsl:if test="@color[not(@mathcolor)] or @mathcolor">
-+	<xsl:if test="@color or @mathcolor">
- 		<xsl:text>}</xsl:text>
- 	</xsl:if>
- 	<xsl:if test="@background">
-@@ -219,4 +229,4 @@
- 	<xsl:apply-templates/>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
---- misc/xsltml_2.1.2/mmltex.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/mmltex.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -6,9 +6,9 @@
- <xsl:output method="text" indent="no" encoding="UTF-8"/>
- 
- <!-- ====================================================================== -->
--<!-- $Id: mmltex.xsl,v 1.7 2003/06/10 12:24:04 shade33 Exp $
-+<!-- $Id: mmltex.xsl 2755 2008-03-07 20:35:56Z hauma $
-      This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
-+     See ./README or http://xsltml.sf.net for
-      copyright and other information                                        -->
- <!-- ====================================================================== -->
- 
-@@ -33,4 +33,4 @@
- 	<xsl:text>&#xA;\]</xsl:text>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
---- misc/xsltml_2.1.2/scripts.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/scripts.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -1,12 +1,13 @@
- <?xml version='1.0' encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
--		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+		xmlns:oomath="http://www.w3.org/1998/Math/MathML"
-                 version='1.0'>
-                 
- <!-- ====================================================================== -->
--<!-- $Id: scripts.xsl,v 1.4 2003/06/10 12:24:04 shade33 Exp $
-+<!-- $Id: scripts.xsl 2755 2008-03-07 20:35:56Z hauma $
-      This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
-+     See ./README or http://xsltml.sf.net for
-      copyright and other information                                        -->
- <!-- ====================================================================== -->
- 
-@@ -23,7 +24,7 @@
- 			</xsl:call-template>
- 			<xsl:text>}</xsl:text>
- 		</xsl:when>
--		<xsl:when test="$over='&#x0FE37;'">	<!-- OverBrace - over brace -->
-+		<xsl:when test="$over='&#x0FE37;' or $over='&#xf612;'">	<!-- OverBrace - over brace -->
- 			<xsl:text>\overbrace{</xsl:text>
- 			<xsl:call-template name="munder">
- 				<xsl:with-param name="base" select="$base"/>
-@@ -64,7 +65,7 @@
- 			</xsl:call-template>
- 			<xsl:text>}</xsl:text>
- 		</xsl:when>
--		<xsl:when test="$under='&#x0FE38;'">	<!-- UnderBrace - under brace -->
-+		<xsl:when test="$under='&#x0FE38;' or $under='&#xf613;'">	<!-- UnderBrace - under brace -->
- 			<xsl:text>\underbrace{</xsl:text>
- 			<xsl:call-template name="mover">
- 				<xsl:with-param name="base" select="$base"/>
-@@ -153,7 +154,7 @@
- 			<xsl:apply-templates select="./*[1]"/>
- 			<xsl:text>}</xsl:text>
- 		</xsl:when>
--		<xsl:when test="$over='&#x0FE37;'">	<!-- OverBrace - over brace -->
-+		<xsl:when test="$over='&#x0FE37;' or $over='&#xf612;'">	<!-- OverBrace - over brace -->
- 			<xsl:text>\overbrace{</xsl:text>
- 			<xsl:apply-templates select="./*[1]"/>
- 			<xsl:text>}</xsl:text>
-@@ -192,10 +193,46 @@
- 			<xsl:text>\ddot{</xsl:text>
-  			<xsl:apply-templates select="./*[1]"/>
-  			<xsl:text>}</xsl:text>
-- 		</xsl:when>
--		<xsl:when test="$over='&#x00302;' or $over='&#x0005E;'"> <!-- Hat or circ - circumflex accent -->
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#xb4;'"> <!-- Acute accent "´" -->
-+			<xsl:text>\acute{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+ 			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#x60;'"> <!-- Grave accent "`" -->
-+			<xsl:text>\grave{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+ 			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#x2c7;'"> <!-- Caron (Mandarin Chinese third tone) "ˇ" -->
-+			<xsl:text>\check{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+ 			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#x2d8;'"> <!-- Breve accent "˘" -->
-+			<xsl:text>\breve{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+ 			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#x2da;'"> <!-- ring above "˚" -->
-+			<xsl:text>\overset{\circ}{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#x2c9;'"> <!-- modifier letter Macron (Mandarin Chinese first tone) "ˉ" -->
-+			<xsl:text>\bar{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+ 			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		<xsl:when test="$over='&#xa8;'"> <!--  Diaeresis "¨" -->
-+			<xsl:text>\ddot{</xsl:text>
-+ 			<xsl:apply-templates select="./*[1]"/>
-+ 			<xsl:text>}</xsl:text>
-+ 		</xsl:when>
-+ 		
-+ 		<xsl:when test="$over='&#x00302;' or $over='&#x0005E;' or $over='&#x2c6;'"> <!-- Hat or circ - circumflex accent -->
- 			<xsl:choose>
--				<xsl:when test="@accent='true'">
-+				<xsl:when test="@oomath:accent='true'">
- 					<xsl:text>\widehat{</xsl:text>
- 				</xsl:when>
- 				<xsl:otherwise>
-@@ -244,7 +281,7 @@
- 			<xsl:apply-templates select="./*[1]"/>
- 			<xsl:text>}</xsl:text>
- 		</xsl:when>
--		<xsl:when test="$under='&#x0FE38;'">	<!-- UnderBrace - under brace -->
-+		<xsl:when test="$under='&#x0FE38;' or $under='&#xf613;'">	<!-- UnderBrace - under brace -->
- 			<xsl:text>\underbrace{</xsl:text>
- 			<xsl:apply-templates select="./*[1]"/>
- 			<xsl:text>}</xsl:text>
-@@ -372,4 +409,4 @@
- 	</xsl:choose>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
---- misc/xsltml_2.1.2/tables.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/tables.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -1,130 +1,218 @@
--<?xml version='1.0' encoding="UTF-8"?>
--<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
--		xmlns:m="http://www.w3.org/1998/Math/MathML"
--                version='1.0'>
--                
--<!-- ====================================================================== -->
--<!-- $id: tables.xsl, 2002/17/05 Exp $
--     This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
--     copyright and other information                                        -->
--<!-- ====================================================================== -->
--
--<xsl:template match="m:mtd[@columnspan]">
--	<xsl:text>\multicolumn{</xsl:text>
--	<xsl:value-of select="@columnspan"/>
--	<xsl:text>}{c}{</xsl:text>
--	<xsl:apply-templates/>
--	<xsl:text>}</xsl:text>
--	<xsl:if test="count(following-sibling::*)>0">
--		<xsl:text>&amp; </xsl:text>
--	</xsl:if>
--</xsl:template>
--
--
--<xsl:template match="m:mtd">
--	<xsl:if test="@columnalign='right' or @columnalign='center'">
--		<xsl:text>\hfill </xsl:text>
--	</xsl:if>
--	<xsl:apply-templates/>
--	<xsl:if test="@columnalign='left' or @columnalign='center'">
--		<xsl:text>\hfill </xsl:text>
--	</xsl:if>
--	<xsl:if test="count(following-sibling::*)>0">
--<!--    this test valid for Sablotron, another form - test="not(position()=last())".
--	Also for m:mtd[@columnspan] and m:mtr  -->
--		<xsl:text>&amp; </xsl:text>
--	</xsl:if>
--</xsl:template>
--
--<xsl:template match="m:mtr">
--	<xsl:apply-templates/>
--	<xsl:if test="count(following-sibling::*)>0">
--		<xsl:text>\\ </xsl:text>
--	</xsl:if>
--</xsl:template>
--
--<xsl:template match="m:mtable">
--	<xsl:text>\begin{array}{</xsl:text>
--	<xsl:if test="@frame='solid'">
--		<xsl:text>|</xsl:text>
--	</xsl:if>
--	<xsl:variable name="numbercols" select="count(./m:mtr[1]/m:mtd[not(@columnspan)])+sum(./m:mtr[1]/m:mtd/@columnspan)"/>
--	<xsl:choose>
--		<xsl:when test="@columnalign">
--			<xsl:variable name="colalign">
--				<xsl:call-template name="colalign">
--					<xsl:with-param name="colalign" select="@columnalign"/>
--				</xsl:call-template>
--			</xsl:variable>
--			<xsl:choose>
--				<xsl:when test="string-length($colalign) > $numbercols">
--					<xsl:value-of select="substring($colalign,1,$numbercols)"/>
--				</xsl:when>
--				<xsl:when test="string-length($colalign) &lt; $numbercols">
--					<xsl:value-of select="$colalign"/>
--					<xsl:call-template name="generate-string">
--						<xsl:with-param name="text" select="substring($colalign,string-length($colalign))"/>
--						<xsl:with-param name="count" select="$numbercols - string-length($colalign)"/>
--					</xsl:call-template>
--				</xsl:when>
--				<xsl:otherwise>
--					<xsl:value-of select="$colalign"/>
--				</xsl:otherwise>
--			</xsl:choose>
--		</xsl:when>
--		<xsl:otherwise>
--			<xsl:call-template name="generate-string">
--				<xsl:with-param name="text" select="'c'"/>
--				<xsl:with-param name="count" select="$numbercols"/>
--			</xsl:call-template>
--		</xsl:otherwise>
--	</xsl:choose>
--	<xsl:if test="@frame='solid'">
--		<xsl:text>|</xsl:text>
--	</xsl:if>
--	<xsl:text>}</xsl:text>
--	<xsl:if test="@frame='solid'">
--		<xsl:text>\hline </xsl:text>
--	</xsl:if>
--	<xsl:apply-templates/>
--	<xsl:if test="@frame='solid'">
--		<xsl:text>\\ \hline</xsl:text>
--	</xsl:if>
--	<xsl:text>\end{array}</xsl:text>
--</xsl:template>
--
--<xsl:template name="colalign">
--	<xsl:param name="colalign"/>
--	<xsl:choose>
--		<xsl:when test="contains($colalign,' ')">
--			<xsl:value-of select="substring($colalign,1,1)"/>
--			<xsl:call-template name="colalign">
--				<xsl:with-param name="colalign" select="substring-after($colalign,' ')"/>
--			</xsl:call-template>
--		</xsl:when>
--		<xsl:otherwise>
--			<xsl:value-of select="substring($colalign,1,1)"/>
--		</xsl:otherwise>
--	</xsl:choose>
--</xsl:template>
--
--<xsl:template name="generate-string">
--<!-- template from XSLT Standard Library v1.1 -->
--    <xsl:param name="text"/>
--    <xsl:param name="count"/>
--
--    <xsl:choose>
--      <xsl:when test="string-length($text) = 0 or $count &lt;= 0"/>
--
--      <xsl:otherwise>
--	<xsl:value-of select="$text"/>
--	<xsl:call-template name="generate-string">
--	  <xsl:with-param name="text" select="$text"/>
--	  <xsl:with-param name="count" select="$count - 1"/>
--	</xsl:call-template>
--      </xsl:otherwise>
--    </xsl:choose>
--</xsl:template>
--
--</xsl:stylesheet>
-+<?xml version='1.0' encoding="UTF-8"?>
-+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+                version='1.0'>
-+                
-+<!-- ====================================================================== -->
-+<!-- $Id: tables.xsl 2755 2008-03-07 20:35:56Z hauma $
-+     This file is part of the XSLT MathML Library distribution.
-+     See ./README or http://xsltml.sf.net for
-+     copyright and other information                                        -->
-+<!-- ====================================================================== -->
-+
-+<xsl:template match="m:mtd[@columnspan]">
-+	<xsl:text>\multicolumn{</xsl:text>
-+	<xsl:value-of select="@columnspan"/>
-+	<xsl:text>}{c}{</xsl:text>
-+	<xsl:apply-templates/>
-+	<xsl:text>}</xsl:text>
-+	<xsl:if test="count(following-sibling::*)>0">
-+		<xsl:text>&amp; </xsl:text>
-+	</xsl:if>
-+</xsl:template>
-+
-+
-+<xsl:template match="m:mtd">
-+	<xsl:if test="@columnalign='right' or @columnalign='center'">
-+		<xsl:text>\hfill </xsl:text>
-+	</xsl:if>
-+	<xsl:apply-templates/>
-+	<xsl:if test="@columnalign='left' or @columnalign='center'">
-+		<xsl:text>\hfill </xsl:text>
-+	</xsl:if>
-+</xsl:template>
-+
-+<xsl:template match="m:mtr">
-+	<xsl:for-each select="*">
-+		<xsl:apply-templates select="current()"/>
-+		<xsl:if test="not(position()=last())">
-+			<xsl:text>&amp; 	</xsl:text>
-+		</xsl:if>
-+	</xsl:for-each>
-+	<xsl:if test="not(position()=last())">
-+		<xsl:text>\\ &#13;&#10;</xsl:text>
-+		<xsl:if test="../@rowlines">
-+			<xsl:variable name="line">
-+				<xsl:call-template name="getToken">
-+					<xsl:with-param name="text" select="../@rowlines"/>
-+					<xsl:with-param name="position" select="position()"/>
-+				</xsl:call-template>
-+			</xsl:variable>
-+			<xsl:if test="$line='solid'">
-+				<xsl:text>\hline </xsl:text>
-+			</xsl:if>
-+		</xsl:if>
-+	</xsl:if>
-+</xsl:template>
-+
-+<xsl:template match="m:mtable">
-+	<xsl:text>\begin{array}{</xsl:text>
-+	<xsl:if test="@frame='solid'">
-+		<xsl:text>|</xsl:text>
-+	</xsl:if>
-+	<xsl:variable name="numbercols" select="count(./m:mtr[1]/*[not(@columnspan)])+sum(./m:mtr[1]/m:mtd/@columnspan)"/>
-+	<xsl:choose>
-+		<xsl:when test="@columnalign and @columnlines">
-+			<xsl:call-template name="generateAlignString">
-+				<xsl:with-param name="columnalignstring" select="@columnalign"/>
-+				<xsl:with-param name="columnlinestring" select="@columnlines"/>
-+				<xsl:with-param name="count" select="$numbercols"/>
-+			</xsl:call-template>
-+		</xsl:when>
-+		<xsl:when test="@columnlines">
-+			<xsl:call-template name="generateAlignString">
-+				<xsl:with-param name="columnlinestring" select="@columnlines"/>
-+				<xsl:with-param name="count" select="$numbercols"/>
-+			</xsl:call-template>
-+		</xsl:when>
-+		<xsl:when test="@columnalign">
-+			<xsl:call-template name="generateAlignString">
-+				<xsl:with-param name="columnalignstring" select="@columnalign"/>
-+				<xsl:with-param name="count" select="$numbercols"/>
-+			</xsl:call-template>
-+		</xsl:when>
-+		<xsl:otherwise>
-+			<xsl:call-template name="generateAlignString">
-+				<xsl:with-param name="count" select="$numbercols"/>
-+				</xsl:call-template>
-+		</xsl:otherwise>
-+	</xsl:choose>
-+	<xsl:if test="@frame='solid'">
-+		<xsl:text>|</xsl:text>
-+	</xsl:if>
-+	<xsl:text>}</xsl:text>
-+	<xsl:if test="@frame='solid'">
-+		<xsl:text>\hline </xsl:text>
-+	</xsl:if>
-+	<xsl:apply-templates/>
-+	<xsl:if test="@frame='solid'">
-+		<xsl:text>\\ \hline&#13;&#10;</xsl:text>
-+	</xsl:if>
-+	<xsl:text>\end{array}</xsl:text>
-+</xsl:template>
-+
-+<xsl:template name="colalign">
-+	<xsl:param name="colalign"/>
-+	<xsl:choose>
-+		<xsl:when test="contains($colalign,' ')">
-+			<xsl:value-of select="substring($colalign,1,1)"/>
-+			<xsl:call-template name="colalign">
-+				<xsl:with-param name="colalign" select="substring-after($colalign,' ')"/>
-+			</xsl:call-template>
-+		</xsl:when>
-+		<xsl:otherwise>
-+			<xsl:value-of select="substring($colalign,1,1)"/>
-+		</xsl:otherwise>
-+	</xsl:choose>
-+</xsl:template>
-+
-+<xsl:template name="generate-string">
-+<!-- template from XSLT Standard Library v1.1 -->
-+    <xsl:param name="text"/>
-+    <xsl:param name="count"/>
-+
-+    <xsl:choose>
-+      <xsl:when test="string-length($text) = 0 or $count &lt;= 0"/>
-+
-+      <xsl:otherwise>
-+	<xsl:value-of select="$text"/>
-+	<xsl:call-template name="generate-string">
-+	  <xsl:with-param name="text" select="$text"/>
-+	  <xsl:with-param name="count" select="$count - 1"/>
-+	</xsl:call-template>
-+      </xsl:otherwise>
-+    </xsl:choose>
-+</xsl:template>
-+
-+<xsl:template name="generateAlignString">
-+	<xsl:param name="columnalignstring">center</xsl:param>
-+	<xsl:param name="columnlinestring"/>
-+	<xsl:param name="count"/>
-+	<xsl:choose>
-+		<xsl:when test="$count &lt;= 0"/>
-+		<xsl:otherwise>
-+			<xsl:variable name="columnalign">
-+				<xsl:call-template name="getToken">
-+					<xsl:with-param name="text" select="$columnalignstring"/>
-+					<xsl:with-param name="position" select="1"/>
-+				</xsl:call-template>
-+			</xsl:variable>
-+			<xsl:variable name="columnline">
-+				<xsl:call-template name="getToken">
-+					<xsl:with-param name="text" select="$columnlinestring"/>
-+					<xsl:with-param name="position" select="1"/>
-+				</xsl:call-template>
-+			</xsl:variable>
-+      	<xsl:value-of select="substring($columnalign,1,1)"/>
-+      	<xsl:if test="$columnline='solid' and $count>1"><xsl:text>|</xsl:text></xsl:if>
-+      	<xsl:variable name="leftPartOrLastTokenA">
-+      		<xsl:choose>
-+      			<xsl:when test="substring-after($columnalignstring,' ')">
-+						<xsl:value-of select="substring-after($columnalignstring,' ')"/>
-+					</xsl:when>
-+					<xsl:otherwise>
-+						<xsl:value-of select="$columnalignstring"/>
-+					</xsl:otherwise>
-+				</xsl:choose>
-+      	</xsl:variable>
-+      	<xsl:variable name="leftPartOrLastTokenB">
-+      		<xsl:choose>
-+      			<xsl:when test="substring-after($columnlinestring,' ')">
-+						<xsl:value-of select="substring-after($columnlinestring,' ')"/>
-+					</xsl:when>
-+					<xsl:otherwise>
-+						<xsl:value-of select="$columnlinestring"/>
-+					</xsl:otherwise>
-+				</xsl:choose>
-+      	</xsl:variable>
-+			<xsl:call-template name="generateAlignString">
-+	  			<xsl:with-param name="columnalignstring" select="$leftPartOrLastTokenA"/>
-+	  			<xsl:with-param name="columnlinestring" select="$leftPartOrLastTokenB"/>
-+	  			<xsl:with-param name="count" select="$count - 1"/>
-+			</xsl:call-template>
-+      </xsl:otherwise>
-+    </xsl:choose>
-+</xsl:template>
-+
-+
-+<xsl:template name="getToken">
-+    <xsl:param name="text"/>
-+    <xsl:param name="char" select="string(' ')"/>
-+    <xsl:param name="position"/>
-+    <xsl:choose>
-+      <xsl:when test="$position = 1 or not(contains($text ,$char))">
-+        <xsl:choose>
-+          <xsl:when test="contains($text ,$char)">
-+            <xsl:value-of select="substring-before($text,$char)"/>
-+          </xsl:when>
-+          <xsl:otherwise>
-+            <xsl:value-of select="$text"/>
-+          </xsl:otherwise>
-+        </xsl:choose>
-+      </xsl:when>
-+      <xsl:when test="contains($text ,$char) and $position &gt; 1">
-+        <xsl:variable name="last" select="substring-after($text,$char)"/>
-+        <xsl:choose>
-+          <xsl:when test="$position &gt; 1">
-+            <xsl:call-template name="getToken">
-+              <xsl:with-param name="text" select="$last"/>
-+              <xsl:with-param name="char" select="$char"/>
-+              <xsl:with-param name="position" select="$position - 1"/>
-+            </xsl:call-template>
-+          </xsl:when>
-+        </xsl:choose>
-+      </xsl:when>
-+    </xsl:choose>
-+  </xsl:template>
-+
-+</xsl:stylesheet>
-\ No newline at end of file
---- misc/xsltml_2.1.2/tokens.xsl	2009-03-27 08:11:02.000000000 +0100
-+++ misc/build/xsltml_2.1.2/tokens.xsl	2008-03-07 21:36:34.000000000 +0100
-@@ -1,12 +1,13 @@
- <?xml version='1.0' encoding="UTF-8"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
--		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+		xmlns:m="http://www.w3.org/1998/Math/MathML"
-+		xmlns:oomath="http://www.w3.org/1998/Math/MathML"
-                 version='1.0'>
-                 
- <!-- ====================================================================== -->
--<!-- $Id: tokens.xsl,v 1.7 2003/06/10 12:24:05 shade33 Exp $
-+<!-- $Id: tokens.xsl 2755 2008-03-07 20:35:56Z hauma $
-      This file is part of the XSLT MathML Library distribution.
--     See ./README or http://www.raleigh.ru/MathML/mmltex for
-+     See ./README or http://xsltml.sf.net for
-      copyright and other information                                        -->
- <!-- ====================================================================== -->
- 
-@@ -22,7 +23,15 @@
- </xsl:template>
- 
- <xsl:template name="mi">
-+	<xsl:variable name="op">
-+		<xsl:value-of select="concat(' ',normalize-space(.),' ')"/>
-+	</xsl:variable>
- 	<xsl:choose>
-+		<xsl:when test="contains(' arccos cos csc exp ker limsup min sinh arcsin cosh deg gcd lg ln Pr sup arctan cot det hom lim log sec tan arg coth dim inf liminf max sin tanh ',$op)">
-+			<xsl:text>\</xsl:text>
-+				<xsl:value-of select="normalize-space(.)"/>
-+			<xsl:text> </xsl:text>
-+		</xsl:when>	
- 		<xsl:when test="string-length(normalize-space(.))>1 and not(@mathvariant)">
- 			<xsl:text>\mathrm{</xsl:text>
- 				<xsl:apply-templates/>
-@@ -51,10 +60,10 @@
- <xsl:template name="mo">
- <xsl:if test="translate(normalize-space(.),'()[]}|','{{{{{{')='{'">
- 		<xsl:choose>
--	<xsl:when test="not(@stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=0 and following-sibling::m:mo[1][not(@stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']">
-+	<xsl:when test="not(@oomath:stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=0 and following-sibling::m:mo[1][not(@oomath:stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']">
- 			<xsl:text>\left</xsl:text>
- 		</xsl:when>
--		<xsl:when test="not(@stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=1 and preceding-sibling::m:mo[1][not(@stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']">
-+		<xsl:when test="not(@oomath:stretchy='false') and count(preceding-sibling::m:mo[translate(normalize-space(.),'()[]}|','{{{{{{')='{'])mod 2=1 and preceding-sibling::m:mo[1][not(@oomath:stretchy='false')][translate(normalize-space(.),'()[]}|','{{{{{{')='{']">
- 			<xsl:text>\right</xsl:text>
- 		</xsl:when>
- 	</xsl:choose>
-@@ -67,10 +76,13 @@
- 		<xsl:call-template name="replaceMtextEntities">
- 			<xsl:with-param name="content" select="normalize-space(.)"/>
- 		</xsl:call-template>
--	</xsl:variable>
--	<xsl:text>\text{</xsl:text>
--	<xsl:value-of select="$content"/>
--	<xsl:text>}</xsl:text>
-+	</xsl:variable>
-+	<!-- Empty text content breaks the MediaWiki parser. -->
-+	<xsl:if test="string-length($content) &gt; 0">
-+		<xsl:text>\text{</xsl:text>
-+		<xsl:value-of select="$content"/>
-+		<xsl:text>}</xsl:text>
-+	</xsl:if>
- </xsl:template>
- 
- <xsl:template match="m:mspace">
-@@ -111,10 +123,16 @@
- 		</xsl:call-template>
- 		<xsl:text>}{$</xsl:text>
- 	</xsl:if>
--	<xsl:if test="@color[not(@mathcolor)] or @mathcolor"> <!-- Note: @color is deprecated in MathML 2.0 -->
-+	<xsl:if test="@color or @mathcolor"> <!-- Note: @color is deprecated in MathML 2.0 -->
-+		<xsl:variable name="color">
-+		<xsl:choose>
-+			<xsl:when test="@mathcolor"><xsl:value-of select="@mathcolor"/></xsl:when>
-+			<xsl:when test="@color"><xsl:value-of select="@color"/></xsl:when>
-+		</xsl:choose>
-+		</xsl:variable>
- 		<xsl:text>\textcolor[rgb]{</xsl:text>
- 		<xsl:call-template name="color">
--			<xsl:with-param name="color" select="@color|@mathcolor"/>
-+			<xsl:with-param name="color" select="$color"/>
- 		</xsl:call-template>
- 		<xsl:text>}{</xsl:text>
- 	</xsl:if>
-@@ -325,4 +343,4 @@
- 	</xsl:call-template>
- </xsl:template>
- 
--</xsl:stylesheet>
-+</xsl:stylesheet>
-\ No newline at end of file
author	Michael Stahl <mstahl@redhat.com>	2012-01-28 20:55:43 +0100
committer	Michael Stahl <mstahl@redhat.com>	2012-01-28 20:55:43 +0100
commit	4217d797c07ce2d4cc2f8de9a539b7e75d98245f (patch)
tree	9e9f67205cd5b72f1031721273e1534a3a1e5b0f
parent	6cdd564f90f3765a451e982611b2b583e310af19 (diff)